Google Git
Sign in
chromium / chromium / src / 33a7a547b9..0e44c5e141 / .
diff --git a/AUTHORS b/AUTHORS
index 7d172b41..5265a6c 100644
--- a/AUTHORS
+++ b/AUTHORS

@@ -45,6 +45,7 @@
 Ali Vathi <ali.akbar@gmail.com>
 Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
 Ambarish Rapte <ambarish.r@samsung.com>
+Amey Jahagirdar <jahagird@amazon.com>
 Amit Sarkar <amit.srkr@samsung.com>
 Amogh Bihani <amogh.bihani@samsung.com>
 Amos Lim <amoseui@gmail.com>
@@ -829,3 +830,4 @@
 ARM Holdings <*@arm.com>
 Macadamian <*@macadamian.com>
 IBM Inc. <*@*.ibm.com>
+Akamai Inc. <*@akamai.com>

diff --git a/DEPS b/DEPS
index 308a11b..cb0b98e 100644
--- a/DEPS
+++ b/DEPS

@@ -40,11 +40,11 @@
   # 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': '875218ebd816eb8931c64c5018ce2dc9bc8fd695',
+  'skia_revision': 'a07741a75aa694c0e7c00c2301c9de2daf9b5f9e',
   # 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': '1539c3a15a256290a6a2f1afcb6afc9d226ceda3',
+  'v8_revision': 'eda659cc5e307f20ac1ad542ba12ab32eaf4c7ef',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
@@ -64,7 +64,7 @@
   # 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': '40e0a819100b6b2cf63070c1a91393cf42820c69',
+  'pdfium_revision': 'f2225817ddbe05e2caa751da23c4a6d44c5160bd',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling openmax_dl
   # and whatever else without interference from each other.
@@ -96,7 +96,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': '794fff6c814784ad5f9a2b33b52d74cf1148d91f',
+  'catapult_revision': '47b98570f6e86ab98d28a572c4111fa15b22c3eb',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -232,7 +232,7 @@
     Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '44c51851dbdaeb2cab8be7348ecf89cb72c13510', # commit position 16820
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '6b8565b1b28e8d4106d34a51914b35f36e4ab8cc', # commit position 16846
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
@@ -241,7 +241,7 @@
     Var('chromium_git') + '/external/github.com/open-source-parsers/jsoncpp.git' + '@' + 'f572e8e42e22cfcf5ab0aea26574f408943edfa4', # from svn 248
 
   'src/third_party/libyuv':
-    Var('chromium_git') + '/libyuv/libyuv.git' + '@' + 'b18fd21d3c27fce69b5c1ed44b89131dedc87284',  # from r1637
+    Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '45b176d153c61732d81b2df0109bd292e67d2b6b',  # from r1645
 
   'src/third_party/smhasher/src':
     Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f',
@@ -363,7 +363,7 @@
       Var('chromium_git') + '/external/github.com/swisspol/GCDWebServer.git' + '@' + '43555c66627f6ed44817855a0f6d465f559d30e0',
 
     'src/ios/third_party/material_components_ios/src':
-      Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '2fe5887b69b53ebf78966cc764aadd39c750f453',
+      Var('chromium_git') + '/external/github.com/material-components/material-components-ios.git' + '@' + '6752ec5219edd41b625a39f58793df3663cc5861',
 
     'src/ios/third_party/material_font_disk_loader_ios/src':
       Var('chromium_git') + '/external/github.com/material-foundation/material-font-disk-loader-ios.git' + '@' + '8e30188777b016182658fbaa0a4a020a48183224',

diff --git a/android_webview/browser/aw_metrics_service_client.h b/android_webview/browser/aw_metrics_service_client.h
index 82ac198f..e45fb128 100644
--- a/android_webview/browser/aw_metrics_service_client.h
+++ b/android_webview/browser/aw_metrics_service_client.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_
-#define ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_H_
+#define ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_H_
 
 #include "components/metrics/enabled_state_provider.h"
 #include "components/metrics/metrics_service_client.h"
@@ -38,4 +38,4 @@
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_IMPL_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_AW_METRICS_SERVICE_CLIENT_H_

diff --git a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java
index b30562b..9cb710c 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java

@@ -4,6 +4,7 @@
 
 package org.chromium.android_webview;
 
+import android.content.Context;
 import android.graphics.Color;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +16,7 @@
 import org.chromium.components.autofill.AutofillSuggestion;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.ui.DropdownItem;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Java counterpart to the AwAutofillClient. This class is owned by AwContents and has
@@ -49,21 +51,23 @@
         if (mContentViewCore == null) return;
 
         if (mAutofillPopup == null) {
-            mAutofillPopup = new AutofillPopup(
-                mContentViewCore.getContext(),
-                anchorView,
-                new AutofillDelegate() {
-                    @Override
-                    public void dismissed() {
-                        nativeDismissed(mNativeAwAutofillClient);
-                    }
-                    @Override
-                    public void suggestionSelected(int listIndex) {
-                        nativeSuggestionSelected(mNativeAwAutofillClient, listIndex);
-                    }
-                    @Override
-                    public void deleteSuggestion(int listIndex) { }
-                });
+            Context context = mContentViewCore.getContext();
+            if (WindowAndroid.activityFromContext(context) == null) {
+                nativeDismissed(mNativeAwAutofillClient);
+                return;
+            }
+            mAutofillPopup = new AutofillPopup(context, anchorView, new AutofillDelegate() {
+                @Override
+                public void dismissed() {
+                    nativeDismissed(mNativeAwAutofillClient);
+                }
+                @Override
+                public void suggestionSelected(int listIndex) {
+                    nativeSuggestionSelected(mNativeAwAutofillClient, listIndex);
+                }
+                @Override
+                public void deleteSuggestion(int listIndex) {}
+            });
         }
         mAutofillPopup.filterAndShow(suggestions, isRtl, Color.TRANSPARENT /* backgroundColor */,
                 Color.TRANSPARENT /* dividerColor */, 0 /* dropdownItemHeight */, 0 /* margin */);

diff --git a/android_webview/native/aw_metrics_service_client_impl.h b/android_webview/native/aw_metrics_service_client_impl.h
index 1d5ca2f..6d42f1d 100644
--- a/android_webview/native/aw_metrics_service_client_impl.h
+++ b/android_webview/native/aw_metrics_service_client_impl.h

@@ -79,4 +79,4 @@
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_NATIVE_AW_METRICS_SWITCH_
+#endif  // ANDROID_WEBVIEW_NATIVE_AW_METRICS_SERVICE_CLIENT_IMPL_

diff --git a/ash/common/ash_switches.cc b/ash/common/ash_switches.cc
index e4cd626..757a4a56 100644
--- a/ash/common/ash_switches.cc
+++ b/ash/common/ash_switches.cc

@@ -76,6 +76,15 @@
 const char kAshHideNotificationsForFactory[] =
     "ash-hide-notifications-for-factory";
 
+// Enables the shelf color to be derived from the wallpaper.
+const char kAshShelfColor[] = "ash-shelf-color";
+const char kAshShelfColorLightMuted[] = "light_muted";
+const char kAshShelfColorLightVibrant[] = "light_vibrant";
+const char kAshShelfColorNormalMuted[] = "normal_muted";
+const char kAshShelfColorNormalVibrant[] = "normal_vibrant";
+const char kAshShelfColorDarkMuted[] = "dark_muted";
+const char kAshShelfColorDarkVibrant[] = "dark_vibrant";
+
 // Enables the heads-up display for tracking touch points.
 const char kAshTouchHud[] = "ash-touch-hud";
 

diff --git a/ash/common/ash_switches.h b/ash/common/ash_switches.h
index 6295e5e..ea6b432d 100644
--- a/ash/common/ash_switches.h
+++ b/ash/common/ash_switches.h

@@ -32,6 +32,13 @@
 ASH_EXPORT extern const char kAshEnableMirroredScreen[];
 ASH_EXPORT extern const char kAshForceEnablePalette[];
 ASH_EXPORT extern const char kAshHideNotificationsForFactory[];
+ASH_EXPORT extern const char kAshShelfColor[];
+ASH_EXPORT extern const char kAshShelfColorLightMuted[];
+ASH_EXPORT extern const char kAshShelfColorLightVibrant[];
+ASH_EXPORT extern const char kAshShelfColorNormalMuted[];
+ASH_EXPORT extern const char kAshShelfColorNormalVibrant[];
+ASH_EXPORT extern const char kAshShelfColorDarkMuted[];
+ASH_EXPORT extern const char kAshShelfColorDarkVibrant[];
 ASH_EXPORT extern const char kAshTouchHud[];
 ASH_EXPORT extern const char kAuraLegacyPowerButton[];
 

diff --git a/ash/common/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc
index 0f96da5a..a2c9227 100644
--- a/ash/common/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc

@@ -38,7 +38,7 @@
     : views::ImageButton(nullptr),
       is_showing_app_list_(false),
       draw_background_as_active_(false),
-      background_alpha_(0),
+      background_color_(kShelfDefaultBaseColor),
       listener_(listener),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf) {
@@ -78,8 +78,8 @@
   wm_shelf_->UpdateAutoHideState();
 }
 
-void AppListButton::SetBackgroundAlpha(int alpha) {
-  background_alpha_ = alpha;
+void AppListButton::UpdateShelfItemBackground(SkColor color) {
+  background_color_ = color;
   SchedulePaint();
 }
 
@@ -165,7 +165,7 @@
 
   // Paint the circular background.
   cc::PaintFlags bg_flags;
-  bg_flags.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
+  bg_flags.setColor(background_color_);
   bg_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
   bg_flags.setStyle(cc::PaintFlags::kFill_Style);
   canvas->DrawCircle(circle_center, kAppListButtonRadius, bg_flags);

diff --git a/ash/common/shelf/app_list_button.h b/ash/common/shelf/app_list_button.h
index 79460cc..e6d55bf1 100644
--- a/ash/common/shelf/app_list_button.h
+++ b/ash/common/shelf/app_list_button.h

@@ -7,6 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
@@ -29,8 +30,8 @@
 
   bool draw_background_as_active() const { return draw_background_as_active_; }
 
-  // Sets alpha value of the background and schedules a paint.
-  void SetBackgroundAlpha(int alpha);
+  // Updates background and schedules a paint.
+  void UpdateShelfItemBackground(SkColor color);
 
  protected:
   // views::ImageButton overrides:
@@ -73,8 +74,8 @@
   // the application list.
   bool draw_background_as_active_;
 
-  // Alpha value used to paint the background.
-  int background_alpha_;
+  // Color used to paint the background.
+  SkColor background_color_;
 
   InkDropButtonListener* listener_;
   ShelfView* shelf_view_;

diff --git a/ash/common/shelf/overflow_bubble_view.cc b/ash/common/shelf/overflow_bubble_view.cc
index a198d09..19aa369 100644
--- a/ash/common/shelf/overflow_bubble_view.cc
+++ b/ash/common/shelf/overflow_bubble_view.cc

@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_lookup.h"
@@ -50,10 +49,7 @@
   set_arrow(GetBubbleArrow());
   set_mirror_arrow_in_rtl(false);
   set_background(NULL);
-  SkColor color = MaterialDesignController::IsShelfMaterial()
-                      ? kShelfBaseColor
-                      : SkColorSetA(kShelfBaseColor, kShelfTranslucentAlpha);
-  set_color(color);
+  set_color(kShelfDefaultBaseColor);
   set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
   // Overflow bubble should not get focus. If it get focus when it is shown,
   // active state item is changed to running state.

diff --git a/ash/common/shelf/overflow_button.cc b/ash/common/shelf/overflow_button.cc
index 50eac54..3d57ca0 100644
--- a/ash/common/shelf/overflow_button.cc
+++ b/ash/common/shelf/overflow_button.cc

@@ -35,7 +35,7 @@
       bottom_image_(nullptr),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf),
-      background_alpha_(0) {
+      background_color_(kShelfDefaultBaseColor) {
   DCHECK(shelf_view_);
   if (MaterialDesignController::IsShelfMaterial()) {
     SetInkDropMode(InkDropMode::ON);
@@ -71,8 +71,8 @@
     SchedulePaint();
 }
 
-void OverflowButton::SetBackgroundAlpha(int alpha) {
-  background_alpha_ = alpha;
+void OverflowButton::UpdateShelfItemBackground(SkColor color) {
+  background_color_ = color;
   SchedulePaint();
 }
 
@@ -121,7 +121,7 @@
   if (MaterialDesignController::IsShelfMaterial()) {
     cc::PaintFlags flags;
     flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    flags.setColor(SkColorSetA(kShelfBaseColor, background_alpha_));
+    flags.setColor(background_color_);
     canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius, flags);
   } else {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();

diff --git a/ash/common/shelf/overflow_button.h b/ash/common/shelf/overflow_button.h
index 0e1617a..503811de 100644
--- a/ash/common/shelf/overflow_button.h
+++ b/ash/common/shelf/overflow_button.h

@@ -24,8 +24,8 @@
   void OnOverflowBubbleShown();
   void OnOverflowBubbleHidden();
 
-  // Sets alpha value of the background and schedules a paint.
-  void SetBackgroundAlpha(int alpha);
+  // Updates background and schedules a paint.
+  void UpdateShelfItemBackground(SkColor color);
 
  private:
   // views::CustomButton:
@@ -66,8 +66,8 @@
   ShelfView* shelf_view_;
   WmShelf* wm_shelf_;
 
-  // Alpha value used to paint the background.
-  int background_alpha_;
+  // Color used to paint the background.
+  SkColor background_color_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowButton);
 };

diff --git a/ash/common/shelf/shelf_background_animator.cc b/ash/common/shelf/shelf_background_animator.cc
index ddacd05..ad0311e 100644
--- a/ash/common/shelf/shelf_background_animator.cc
+++ b/ash/common/shelf/shelf_background_animator.cc

@@ -10,7 +10,9 @@
 #include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
 #include "ui/gfx/animation/slide_animation.h"
+#include "ui/gfx/color_utils.h"
 
 namespace ash {
 
@@ -19,35 +21,39 @@
 ShelfBackgroundAnimator::AnimationValues::~AnimationValues() {}
 
 void ShelfBackgroundAnimator::AnimationValues::UpdateCurrentValues(double t) {
-  current_alpha_ =
-      gfx::Tween::IntValueBetween(t, initial_alpha_, target_alpha_);
+  current_color_ =
+      gfx::Tween::ColorValueBetween(t, initial_color_, target_color_);
 }
 
 void ShelfBackgroundAnimator::AnimationValues::SetTargetValues(
-    int target_alpha) {
-  DCHECK_LE(target_alpha, kMaxAlpha);
-  DCHECK_GE(target_alpha, 0);
-  initial_alpha_ = current_alpha_;
-  target_alpha_ = target_alpha;
+    SkColor target_color) {
+  initial_color_ = current_color_;
+  target_color_ = target_color;
 }
 
 bool ShelfBackgroundAnimator::AnimationValues::InitialValuesEqualTargetValuesOf(
     const AnimationValues& other) const {
-  return initial_alpha_ == other.target_alpha_;
+  return initial_color_ == other.target_color_;
 }
 
 ShelfBackgroundAnimator::ShelfBackgroundAnimator(
     ShelfBackgroundType background_type,
-    WmShelf* wm_shelf)
-    : wm_shelf_(wm_shelf) {
+    WmShelf* wm_shelf,
+    WallpaperController* wallpaper_controller)
+    : wm_shelf_(wm_shelf), wallpaper_controller_(wallpaper_controller) {
+  if (wallpaper_controller_)
+    wallpaper_controller_->AddObserver(this);
   if (wm_shelf_)
     wm_shelf_->AddObserver(this);
+
   // Initialize animators so that adding observers get notified with consistent
   // values.
   AnimateBackground(background_type, AnimationChangeType::IMMEDIATE);
 }
 
 ShelfBackgroundAnimator::~ShelfBackgroundAnimator() {
+  if (wallpaper_controller_)
+    wallpaper_controller_->RemoveObserver(this);
   if (wm_shelf_)
     wm_shelf_->RemoveObserver(this);
 }
@@ -65,8 +71,8 @@
 
 void ShelfBackgroundAnimator::NotifyObserver(
     ShelfBackgroundAnimatorObserver* observer) {
-  observer->UpdateShelfBackground(shelf_background_values_.current_alpha());
-  observer->UpdateShelfItemBackground(item_background_values_.current_alpha());
+  observer->UpdateShelfBackground(shelf_background_values_.current_color());
+  observer->UpdateShelfItemBackground(item_background_values_.current_color());
 }
 
 void ShelfBackgroundAnimator::PaintBackground(
@@ -100,6 +106,12 @@
   // destroy the |animator_| because it may be re-used immediately.
 }
 
+void ShelfBackgroundAnimator::OnWallpaperDataChanged() {}
+
+void ShelfBackgroundAnimator::OnWallpaperColorsChanged() {
+  AnimateBackground(target_background_type_, AnimationChangeType::ANIMATE);
+}
+
 void ShelfBackgroundAnimator::OnBackgroundTypeChanged(
     ShelfBackgroundType background_type,
     AnimationChangeType change_type) {
@@ -191,25 +203,35 @@
     ShelfBackgroundType background_type,
     AnimationValues* shelf_background_values,
     AnimationValues* item_background_values) const {
-  int target_shelf_background = 0;
-  int target_shelf_item_background = 0;
+  int target_shelf_background_alpha = 0;
+  int target_shelf_item_background_alpha = 0;
 
   switch (background_type) {
     case SHELF_BACKGROUND_DEFAULT:
-      target_shelf_background = 0;
-      target_shelf_item_background = kShelfTranslucentAlpha;
+      target_shelf_background_alpha = 0;
+      target_shelf_item_background_alpha = kShelfTranslucentAlpha;
       break;
     case SHELF_BACKGROUND_OVERLAP:
-      target_shelf_background = kShelfTranslucentAlpha;
-      target_shelf_item_background = 0;
+      target_shelf_background_alpha = kShelfTranslucentAlpha;
+      target_shelf_item_background_alpha = 0;
       break;
     case SHELF_BACKGROUND_MAXIMIZED:
-      target_shelf_background = kMaxAlpha;
-      target_shelf_item_background = 0;
+      target_shelf_background_alpha = kMaxAlpha;
+      target_shelf_item_background_alpha = 0;
       break;
   }
-  shelf_background_values->SetTargetValues(target_shelf_background);
-  item_background_values->SetTargetValues(target_shelf_item_background);
+
+  SkColor target_color = wallpaper_controller_
+                             ? wallpaper_controller_->prominent_color()
+                             : kShelfDefaultBaseColor;
+
+  if (target_color == SK_ColorTRANSPARENT)
+    target_color = kShelfDefaultBaseColor;
+
+  shelf_background_values->SetTargetValues(
+      SkColorSetA(target_color, target_shelf_background_alpha));
+  item_background_values->SetTargetValues(
+      SkColorSetA(target_color, target_shelf_item_background_alpha));
 }
 
 void ShelfBackgroundAnimator::SetAnimationValues(double t) {

diff --git a/ash/common/shelf/shelf_background_animator.h b/ash/common/shelf/shelf_background_animator.h
index a74adf9..72747494 100644
--- a/ash/common/shelf/shelf_background_animator.h
+++ b/ash/common/shelf/shelf_background_animator.h

@@ -10,9 +10,11 @@
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
+#include "ash/common/wallpaper/wallpaper_controller_observer.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
 
 namespace gfx {
@@ -24,6 +26,7 @@
 enum class AnimationChangeType;
 class ShelfBackgroundAnimatorObserver;
 class ShelfBackgroundAnimatorTestApi;
+class WallpaperController;
 class WmShelf;
 
 // Central controller for the Shelf and Dock opacity animations.
@@ -38,12 +41,18 @@
 //    2. Overlay for the SHELF_BACKGROUND_OVERLAP and SHELF_BACKGROUND_MAXIMIZED
 //       states.
 class ASH_EXPORT ShelfBackgroundAnimator : public WmShelfObserver,
-                                           public gfx::AnimationDelegate {
+                                           public gfx::AnimationDelegate,
+                                           public WallpaperControllerObserver {
  public:
+  // The maximum alpha value that can be used.
+  static const int kMaxAlpha = SK_AlphaOPAQUE;
+
   // Initializes this with the given |background_type|. This will observe the
-  // |wm_shelf| for background type changes if |wm_shelf| is not null.
+  // |wm_shelf| for background type changes and the |wallpaper_controller| for
+  // wallpaper changes if not null.
   ShelfBackgroundAnimator(ShelfBackgroundType background_type,
-                          WmShelf* wm_shelf);
+                          WmShelf* wm_shelf,
+                          WallpaperController* wallpaper_controller);
   ~ShelfBackgroundAnimator() override;
 
   ShelfBackgroundType target_background_type() const {
@@ -58,7 +67,7 @@
   void NotifyObserver(ShelfBackgroundAnimatorObserver* observer);
 
   // Conditionally animates the background to the specified |background_type|
-  // and notifies observers of the new background parameters (e.g. alpha).
+  // and notifies observers of the new background parameters (e.g. color).
   // If |change_type| is BACKGROUND_CHANGE_IMMEDIATE then the
   // observers will only receive one notification with the final background
   // state, otherwise the observers will be notified multiple times in order to
@@ -80,6 +89,10 @@
   void OnBackgroundTypeChanged(ShelfBackgroundType background_type,
                                AnimationChangeType change_type) override;
 
+  // WallpaperControllerObserver:
+  void OnWallpaperDataChanged() override;
+  void OnWallpaperColorsChanged() override;
+
  private:
   friend class ShelfBackgroundAnimatorTestApi;
 
@@ -90,30 +103,27 @@
     AnimationValues();
     ~AnimationValues();
 
-    int current_alpha() const { return current_alpha_; }
+    SkColor current_color() const { return current_color_; }
+    SkColor target_color() const { return target_color_; }
 
-    // Updates the current values based on |t| value between 0 and 1.
+    // Updates the |current_color_| based on |t| value between 0 and 1.
     void UpdateCurrentValues(double t);
 
-    // Set the target values and assign the current values to the initial
-    // values.
-    void SetTargetValues(int target_alpha);
+    // Set the target color and assign the current color to the initial color.
+    void SetTargetValues(SkColor target_color);
 
     // Returns true if the initial values of |this| equal the target values of
     // |other|.
     bool InitialValuesEqualTargetValuesOf(const AnimationValues& other) const;
 
    private:
-    int initial_alpha_ = 0;
-    int current_alpha_ = 0;
-    int target_alpha_ = 0;
+    SkColor initial_color_ = SK_ColorTRANSPARENT;
+    SkColor current_color_ = SK_ColorTRANSPARENT;
+    SkColor target_color_ = SK_ColorTRANSPARENT;
 
     DISALLOW_COPY_AND_ASSIGN(AnimationValues);
   };
 
-  // The maximum alpha value that can be used.
-  static const int kMaxAlpha = 255;
-
   // Helper function used by PaintBackground() to animate the background.
   void AnimateBackground(ShelfBackgroundType background_type,
                          AnimationChangeType change_type);
@@ -149,6 +159,9 @@
   // The shelf to observe for changes to the shelf background type, can be null.
   WmShelf* wm_shelf_;
 
+  // The wallpaper controller to observe for changes and to extract colors from.
+  WallpaperController* wallpaper_controller_;
+
   // The background type that this is animating towards or has reached.
   ShelfBackgroundType target_background_type_ = SHELF_BACKGROUND_DEFAULT;
 

diff --git a/ash/common/shelf/shelf_background_animator_observer.h b/ash/common/shelf/shelf_background_animator_observer.h
index a2a021d..bf8ca105 100644
--- a/ash/common/shelf/shelf_background_animator_observer.h
+++ b/ash/common/shelf/shelf_background_animator_observer.h

@@ -6,6 +6,7 @@
 #define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
 
 #include "ash/ash_export.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace ash {
 
@@ -13,10 +14,10 @@
 class ASH_EXPORT ShelfBackgroundAnimatorObserver {
  public:
   // Called when the Shelf's background should be updated.
-  virtual void UpdateShelfBackground(int alpha) {}
+  virtual void UpdateShelfBackground(SkColor color) {}
 
   // Called when the Shelf item (aka button) backgrounds should be updated.
-  virtual void UpdateShelfItemBackground(int alpha) {}
+  virtual void UpdateShelfItemBackground(SkColor color) {}
 
  protected:
   virtual ~ShelfBackgroundAnimatorObserver() {}

diff --git a/ash/common/shelf/shelf_background_animator_unittest.cc b/ash/common/shelf/shelf_background_animator_unittest.cc
index e5206a32..9a3784c 100644
--- a/ash/common/shelf/shelf_background_animator_unittest.cc
+++ b/ash/common/shelf/shelf_background_animator_unittest.cc

@@ -9,6 +9,8 @@
 #include "ash/animation/animation_change_type.h"
 #include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/test/test_mock_time_task_runner.h"
@@ -19,39 +21,53 @@
 namespace ash {
 namespace {
 
-const int kMaxAlpha = 255;
+static auto kMaxAlpha = ShelfBackgroundAnimator::kMaxAlpha;
 
-// A valid alpha value that is distinct from any final animation state values.
-// Used to check if alpha values are changed during animations.
-const int kDummyAlpha = 111;
+// A valid color value that is distinct from any final animation state values.
+// Used to check if color values are changed during animations.
+const SkColor kDummyColor = SK_ColorBLUE;
 
-// Observer that caches alpha values for the last observation.
+// Observer that caches color values for the last observation.
 class TestShelfBackgroundObserver : public ShelfBackgroundAnimatorObserver {
  public:
   TestShelfBackgroundObserver() {}
   ~TestShelfBackgroundObserver() override {}
 
-  int background_alpha() const { return background_alpha_; }
+  SkColor background_color() const { return background_color_; }
 
-  int item_background_alpha() const { return item_background_alpha_; }
+  // Convenience function to get the alpha value from |background_color_|.
+  int GetBackgroundAlpha() const;
+
+  SkColor item_background_color() const { return item_background_color_; }
+
+  // Convenience function to get the alpha value from |item_background_color_|.
+  int GetItemBackgroundAlpha() const;
 
   // ShelfBackgroundObserver:
-  void UpdateShelfBackground(int alpha) override;
-  void UpdateShelfItemBackground(int alpha) override;
+  void UpdateShelfBackground(SkColor color) override;
+  void UpdateShelfItemBackground(SkColor color) override;
 
  private:
-  int background_alpha_ = 0;
-  int item_background_alpha_ = 0;
+  int background_color_ = SK_ColorTRANSPARENT;
+  int item_background_color_ = SK_ColorTRANSPARENT;
 
   DISALLOW_COPY_AND_ASSIGN(TestShelfBackgroundObserver);
 };
 
-void TestShelfBackgroundObserver::UpdateShelfBackground(int alpha) {
-  background_alpha_ = alpha;
+int TestShelfBackgroundObserver::GetBackgroundAlpha() const {
+  return SkColorGetA(background_color_);
 }
 
-void TestShelfBackgroundObserver::UpdateShelfItemBackground(int alpha) {
-  item_background_alpha_ = alpha;
+int TestShelfBackgroundObserver::GetItemBackgroundAlpha() const {
+  return SkColorGetA(item_background_color_);
+}
+
+void TestShelfBackgroundObserver::UpdateShelfBackground(SkColor color) {
+  background_color_ = color;
+}
+
+void TestShelfBackgroundObserver::UpdateShelfItemBackground(SkColor color) {
+  item_background_color_ = color;
 }
 
 }  // namespace
@@ -91,8 +107,8 @@
       ShelfBackgroundType background_type,
       AnimationChangeType change_type = AnimationChangeType::IMMEDIATE);
 
-  // Set all of the alpha values for the |observer_|.
-  void SetAlphaValuesOnObserver(int alpha);
+  // Set all of the color values for the |observer_|.
+  void SetColorValuesOnObserver(SkColor color);
 
   // Completes all the animations.
   void CompleteAnimations();
@@ -119,7 +135,7 @@
   task_runner_handle_.reset(new base::ThreadTaskRunnerHandle(task_runner_));
 
   animator_.reset(
-      new ShelfBackgroundAnimator(SHELF_BACKGROUND_DEFAULT, nullptr));
+      new ShelfBackgroundAnimator(SHELF_BACKGROUND_DEFAULT, nullptr, nullptr));
   animator_->AddObserver(&observer_);
 
   test_api_.reset(new ShelfBackgroundAnimatorTestApi(animator_.get()));
@@ -131,9 +147,9 @@
   animator_->PaintBackground(background_type, change_type);
 }
 
-void ShelfBackgroundAnimatorTest::SetAlphaValuesOnObserver(int alpha) {
-  observer_.UpdateShelfBackground(alpha);
-  observer_.UpdateShelfItemBackground(alpha);
+void ShelfBackgroundAnimatorTest::SetColorValuesOnObserver(SkColor color) {
+  observer_.UpdateShelfBackground(color);
+  observer_.UpdateShelfItemBackground(color);
 }
 
 void ShelfBackgroundAnimatorTest::CompleteAnimations() {
@@ -160,32 +176,32 @@
 TEST_F(ShelfBackgroundAnimatorTest,
        MultipleAnimateCallsToSameTargetAreIgnored) {
   PaintBackground(SHELF_BACKGROUND_MAXIMIZED);
-  SetAlphaValuesOnObserver(kDummyAlpha);
+  SetColorValuesOnObserver(kDummyColor);
   animator_->PaintBackground(SHELF_BACKGROUND_DEFAULT,
                              AnimationChangeType::ANIMATE);
   CompleteAnimations();
 
-  EXPECT_NE(observer_.background_alpha(), kDummyAlpha);
-  EXPECT_NE(observer_.item_background_alpha(), kDummyAlpha);
+  EXPECT_NE(observer_.background_color(), kDummyColor);
+  EXPECT_NE(observer_.item_background_color(), kDummyColor);
 
-  SetAlphaValuesOnObserver(kDummyAlpha);
+  SetColorValuesOnObserver(kDummyColor);
   animator_->PaintBackground(SHELF_BACKGROUND_DEFAULT,
                              AnimationChangeType::ANIMATE);
   CompleteAnimations();
 
-  EXPECT_EQ(observer_.background_alpha(), kDummyAlpha);
-  EXPECT_EQ(observer_.item_background_alpha(), kDummyAlpha);
+  EXPECT_EQ(observer_.background_color(), kDummyColor);
+  EXPECT_EQ(observer_.item_background_color(), kDummyColor);
 }
 
 // Verify observers are updated with the current values when they are added.
 TEST_F(ShelfBackgroundAnimatorTest, ObserversUpdatedWhenAdded) {
   animator_->RemoveObserver(&observer_);
-  SetAlphaValuesOnObserver(kDummyAlpha);
+  SetColorValuesOnObserver(kDummyColor);
 
   animator_->AddObserver(&observer_);
 
-  EXPECT_NE(observer_.background_alpha(), kDummyAlpha);
-  EXPECT_NE(observer_.item_background_alpha(), kDummyAlpha);
+  EXPECT_NE(observer_.background_color(), kDummyColor);
+  EXPECT_NE(observer_.item_background_color(), kDummyColor);
 }
 
 // Verify the alpha values for the SHELF_BACKGROUND_DEFAULT state.
@@ -193,8 +209,8 @@
   PaintBackground(SHELF_BACKGROUND_DEFAULT);
 
   EXPECT_EQ(SHELF_BACKGROUND_DEFAULT, animator_->target_background_type());
-  EXPECT_EQ(0, observer_.background_alpha());
-  EXPECT_EQ(kShelfTranslucentAlpha, observer_.item_background_alpha());
+  EXPECT_EQ(0, observer_.GetBackgroundAlpha());
+  EXPECT_EQ(kShelfTranslucentAlpha, observer_.GetItemBackgroundAlpha());
 }
 
 // Verify the alpha values for the SHELF_BACKGROUND_OVERLAP state.
@@ -202,8 +218,8 @@
   PaintBackground(SHELF_BACKGROUND_OVERLAP);
 
   EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, animator_->target_background_type());
-  EXPECT_EQ(kShelfTranslucentAlpha, observer_.background_alpha());
-  EXPECT_EQ(0, observer_.item_background_alpha());
+  EXPECT_EQ(kShelfTranslucentAlpha, observer_.GetBackgroundAlpha());
+  EXPECT_EQ(0, observer_.GetItemBackgroundAlpha());
 }
 
 // Verify the alpha values for the SHELF_BACKGROUND_MAXIMIZED state.
@@ -211,8 +227,8 @@
   PaintBackground(SHELF_BACKGROUND_MAXIMIZED);
 
   EXPECT_EQ(SHELF_BACKGROUND_MAXIMIZED, animator_->target_background_type());
-  EXPECT_EQ(kMaxAlpha, observer_.background_alpha());
-  EXPECT_EQ(0, observer_.item_background_alpha());
+  EXPECT_EQ(kMaxAlpha, observer_.GetBackgroundAlpha());
+  EXPECT_EQ(0, observer_.GetItemBackgroundAlpha());
 }
 
 TEST_F(ShelfBackgroundAnimatorTest,
@@ -266,24 +282,24 @@
        AnimationProgressesToTargetWhenStoppingUnfinishedAnimator) {
   PaintBackground(SHELF_BACKGROUND_OVERLAP, AnimationChangeType::ANIMATE);
 
-  EXPECT_NE(kShelfTranslucentAlpha, observer_.background_alpha());
-  EXPECT_NE(0, observer_.item_background_alpha());
+  EXPECT_NE(kShelfTranslucentAlpha, observer_.GetBackgroundAlpha());
+  EXPECT_NE(0, observer_.GetItemBackgroundAlpha());
 
   test_api_->animator()->Stop();
 
-  EXPECT_EQ(kShelfTranslucentAlpha, observer_.background_alpha());
-  EXPECT_EQ(0, observer_.item_background_alpha());
+  EXPECT_EQ(kShelfTranslucentAlpha, observer_.GetBackgroundAlpha());
+  EXPECT_EQ(0, observer_.GetItemBackgroundAlpha());
 }
 
 // Verify observers are always notified, even when alpha values don't change.
 TEST_F(ShelfBackgroundAnimatorTest,
        ObserversAreNotifiedWhenSnappingToSameTargetBackground) {
   PaintBackground(SHELF_BACKGROUND_DEFAULT);
-  SetAlphaValuesOnObserver(kDummyAlpha);
+  SetColorValuesOnObserver(kDummyColor);
   PaintBackground(SHELF_BACKGROUND_DEFAULT);
 
-  EXPECT_NE(observer_.background_alpha(), kDummyAlpha);
-  EXPECT_NE(observer_.item_background_alpha(), kDummyAlpha);
+  EXPECT_NE(observer_.background_color(), kDummyColor);
+  EXPECT_NE(observer_.item_background_color(), kDummyColor);
 }
 
 }  // namespace ash

diff --git a/ash/common/shelf/shelf_button.cc b/ash/common/shelf/shelf_button.cc
index deb6529ae..3b4e8a36 100644
--- a/ash/common/shelf/shelf_button.cc
+++ b/ash/common/shelf/shelf_button.cc

@@ -146,7 +146,7 @@
         animation_end_time_(base::TimeTicks()),
         animating_(false) {
     // Make sure the events reach the parent view for handling.
-    set_interactive(false);
+    set_can_process_events_within_subtree(false);
   }
 
   ~BarView() override {
@@ -276,7 +276,7 @@
   icon_view_->SetHorizontalAlignment(views::ImageView::CENTER);
   icon_view_->SetVerticalAlignment(views::ImageView::LEADING);
   // Do not make this interactive, so that events are sent to ShelfView.
-  icon_view_->set_interactive(false);
+  icon_view_->set_can_process_events_within_subtree(false);
 
   AddChildView(bar_);
   AddChildView(icon_view_);

diff --git a/ash/common/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc
index a486b7a..53b90f4 100644
--- a/ash/common/shelf/shelf_constants.cc
+++ b/ash/common/shelf/shelf_constants.cc

@@ -14,7 +14,7 @@
 const int kWorkspaceAreaAutoHideInset = 5;
 const int kShelfAutoHideSize = 3;
 const int kShelfItemInset = 3;
-const SkColor kShelfBaseColor = SK_ColorBLACK;
+const SkColor kShelfDefaultBaseColor = SK_ColorBLACK;
 const SkColor kShelfButtonActivatedHighlightColor =
     SkColorSetA(SK_ColorWHITE, 100);
 const SkColor kShelfInkDropBaseColor = SK_ColorWHITE;

diff --git a/ash/common/shelf/shelf_constants.h b/ash/common/shelf/shelf_constants.h
index f875900..e931194 100644
--- a/ash/common/shelf/shelf_constants.h
+++ b/ash/common/shelf/shelf_constants.h

@@ -43,9 +43,9 @@
 // Animation duration for switching black shelf and dock background on and off.
 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;
 
-// The base color of the shelf to which different alpha values are applied
-// based on the desired shelf opacity level.
-ASH_EXPORT extern const SkColor kShelfBaseColor;
+// The default base color of the shelf to which different alpha values are
+// applied based on the desired shelf opacity level.
+ASH_EXPORT extern const SkColor kShelfDefaultBaseColor;
 
 // Highlight color used for shelf button activated states.
 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state

diff --git a/ash/common/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
index 65c69410..9dfc053 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc

@@ -754,9 +754,9 @@
   overflow_button_->SetBoundsRect(ideal_bounds.overflow_bounds);
 }
 
-void ShelfView::UpdateShelfItemBackground(int alpha) {
-  GetAppListButton()->SetBackgroundAlpha(alpha);
-  overflow_button_->SetBackgroundAlpha(alpha);
+void ShelfView::UpdateShelfItemBackground(SkColor color) {
+  GetAppListButton()->UpdateShelfItemBackground(color);
+  overflow_button_->UpdateShelfItemBackground(color);
 }
 
 void ShelfView::UpdateAllButtonsVisibilityInOverflowMode() {

diff --git a/ash/common/shelf/shelf_view.h b/ash/common/shelf/shelf_view.h
index 06855d8..3f1858b 100644
--- a/ash/common/shelf/shelf_view.h
+++ b/ash/common/shelf/shelf_view.h

@@ -16,6 +16,7 @@
 #include "ash/common/shelf/shelf_model_observer.h"
 #include "ash/common/shelf/shelf_tooltip_manager.h"
 #include "base/macros.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/animation/ink_drop_state.h"
@@ -157,7 +158,7 @@
                                bool canceled);
 
   // Updates the background for the shelf items.
-  void UpdateShelfItemBackground(int alpha);
+  void UpdateShelfItemBackground(SkColor color);
 
   // Return the view model for test purposes.
   const views::ViewModel* view_model_for_test() const {

diff --git a/ash/common/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
index 94d53a5..4e3ecf1 100644
--- a/ash/common/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc

@@ -62,7 +62,7 @@
   void OnBoundsChanged(const gfx::Rect& old_bounds) override;
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfBackground(int alpha) override;
+  void UpdateShelfBackground(SkColor color) override;
 
  private:
   ShelfWidget* shelf_widget_;
@@ -89,7 +89,6 @@
   set_allow_deactivate_on_esc(true);
   opaque_background_.SetColor(SK_ColorBLACK);
   opaque_background_.SetBounds(GetLocalBounds());
-  opaque_background_.SetOpacity(0.0f);
   opaque_foreground_.SetColor(SK_ColorBLACK);
   opaque_foreground_.SetBounds(GetLocalBounds());
   opaque_foreground_.SetOpacity(0.0f);
@@ -125,9 +124,8 @@
   opaque_foreground_.SetBounds(GetLocalBounds());
 }
 
-void ShelfWidget::DelegateView::UpdateShelfBackground(int alpha) {
-  const float kMaxAlpha = 255.0f;
-  opaque_background_.SetOpacity(alpha / kMaxAlpha);
+void ShelfWidget::DelegateView::UpdateShelfBackground(SkColor color) {
+  opaque_background_.SetColor(color);
 }
 
 ShelfWidget::ShelfWidget(WmWindow* shelf_container, WmShelf* wm_shelf)
@@ -135,7 +133,9 @@
       status_area_widget_(nullptr),
       delegate_view_(new DelegateView(this)),
       shelf_view_(nullptr),
-      background_animator_(SHELF_BACKGROUND_DEFAULT, wm_shelf_),
+      background_animator_(SHELF_BACKGROUND_DEFAULT,
+                           wm_shelf_,
+                           WmShell::Get()->wallpaper_controller()),
       activating_as_fallback_(false) {
   DCHECK(wm_shelf_);
   background_animator_.AddObserver(this);
@@ -346,9 +346,9 @@
     delegate_view_->GetFocusManager()->ClearFocus();
 }
 
-void ShelfWidget::UpdateShelfItemBackground(int alpha) {
+void ShelfWidget::UpdateShelfItemBackground(SkColor color) {
   if (shelf_view_)
-    shelf_view_->UpdateShelfItemBackground(alpha);
+    shelf_view_->UpdateShelfItemBackground(color);
 }
 
 void ShelfWidget::WillDeleteShelfLayoutManager() {

diff --git a/ash/common/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
index dac4c5f..e77b9d8 100644
--- a/ash/common/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h

@@ -96,7 +96,7 @@
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
   // ShelfBackgroundAnimatorObserver overrides:
-  void UpdateShelfItemBackground(int alpha) override;
+  void UpdateShelfItemBackground(SkColor color) override;
 
   // ShelfLayoutManagerObserver overrides:
   void WillDeleteShelfLayoutManager() override;

diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc
index afb1088..66f49d6f 100644
--- a/ash/common/system/status_area_widget.cc
+++ b/ash/common/system/status_area_widget.cc

@@ -181,15 +181,15 @@
     status_area_widget_delegate_->SetPaneFocusAndFocusDefault();
 }
 
-void StatusAreaWidget::UpdateShelfItemBackground(int alpha) {
-  web_notification_tray_->UpdateShelfItemBackground(alpha);
-  system_tray_->UpdateShelfItemBackground(alpha);
-  virtual_keyboard_tray_->UpdateShelfItemBackground(alpha);
-  logout_button_tray_->UpdateShelfItemBackground(alpha);
-  ime_menu_tray_->UpdateShelfItemBackground(alpha);
+void StatusAreaWidget::UpdateShelfItemBackground(SkColor color) {
+  web_notification_tray_->UpdateShelfItemBackground(color);
+  system_tray_->UpdateShelfItemBackground(color);
+  virtual_keyboard_tray_->UpdateShelfItemBackground(color);
+  logout_button_tray_->UpdateShelfItemBackground(color);
+  ime_menu_tray_->UpdateShelfItemBackground(color);
   if (palette_tray_)
-    palette_tray_->UpdateShelfItemBackground(alpha);
-  overview_button_tray_->UpdateShelfItemBackground(alpha);
+    palette_tray_->UpdateShelfItemBackground(color);
+  overview_button_tray_->UpdateShelfItemBackground(color);
 }
 
 void StatusAreaWidget::AddSystemTray() {

diff --git a/ash/common/system/status_area_widget.h b/ash/common/system/status_area_widget.h
index 702dcb8..acea237 100644
--- a/ash/common/system/status_area_widget.h
+++ b/ash/common/system/status_area_widget.h

@@ -79,7 +79,7 @@
   void OnNativeWidgetActivationChanged(bool active) override;
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfItemBackground(int alpha) override;
+  void UpdateShelfItemBackground(SkColor color) override;
 
  private:
   void AddSystemTray();

diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
index 1b5098f..fb988555 100644
--- a/ash/common/system/tray/tray_background_view.cc
+++ b/ash/common/system/tray/tray_background_view.cc

@@ -117,11 +117,11 @@
   TrayBackground(TrayBackgroundView* tray_background_view, bool draws_active)
       : tray_background_view_(tray_background_view),
         draws_active_(draws_active),
-        alpha_(0) {}
+        color_(SK_ColorTRANSPARENT) {}
 
   ~TrayBackground() override {}
 
-  void set_alpha(int alpha) { alpha_ = alpha; }
+  void set_color(SkColor color) { color_ = color; }
 
  private:
   WmShelf* GetShelf() const { return tray_background_view_->shelf(); }
@@ -129,7 +129,7 @@
   void PaintMaterial(gfx::Canvas* canvas, views::View* view) const {
     cc::PaintFlags background_flags;
     background_flags.setFlags(cc::PaintFlags::kAntiAlias_Flag);
-    background_flags.setColor(SkColorSetA(kShelfBaseColor, alpha_));
+    background_flags.setColor(color_);
     gfx::Insets insets =
         GetMirroredBackgroundInsets(GetShelf()->GetAlignment());
     gfx::Rect bounds = view->GetLocalBounds();
@@ -205,7 +205,7 @@
   // is removed (see https://crbug.com/614453).
   bool draws_active_;
 
-  int alpha_;
+  SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackground);
 };
@@ -514,9 +514,9 @@
   // Nothing to do here.
 }
 
-void TrayBackgroundView::UpdateShelfItemBackground(int alpha) {
+void TrayBackgroundView::UpdateShelfItemBackground(SkColor color) {
   if (background_) {
-    background_->set_alpha(alpha);
+    background_->set_color(color);
     SchedulePaint();
   }
 }

diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h
index ad991328..49e71055 100644
--- a/ash/common/system/tray/tray_background_view.h
+++ b/ash/common/system/tray/tray_background_view.h

@@ -126,7 +126,7 @@
   void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfItemBackground(int alpha) override;
+  void UpdateShelfItemBackground(SkColor color) override;
 
   // Updates the visibility of this tray's separator.
   void set_separator_visibility(bool visible) { separator_visible_ = visible; }

diff --git a/ash/common/wallpaper/wallpaper_controller.cc b/ash/common/wallpaper/wallpaper_controller.cc
index 8b9b4048..42e70a7 100644
--- a/ash/common/wallpaper/wallpaper_controller.cc
+++ b/ash/common/wallpaper/wallpaper_controller.cc

@@ -4,6 +4,10 @@
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
 
+#include <string>
+#include <utility>
+
+#include "ash/common/ash_switches.h"
 #include "ash/common/wallpaper/wallpaper_controller_observer.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_view.h"
@@ -13,14 +17,18 @@
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
+#include "components/wallpaper/wallpaper_color_calculator.h"
 #include "components/wallpaper/wallpaper_resizer.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
+#include "ui/gfx/color_analysis.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
+
 namespace {
 
 // How long to wait reloading the wallpaper after the display size has changed.
@@ -28,10 +36,41 @@
 
 }  // namespace
 
+// static
+bool WallpaperController::GetProminentColorProfile(
+    color_utils::LumaRange* luma,
+    color_utils::SaturationRange* saturation) {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshShelfColor)) {
+    return false;
+  }
+
+  *luma = color_utils::LumaRange::NORMAL;
+  *saturation = color_utils::SaturationRange::VIBRANT;
+
+  const std::string switch_value =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kAshShelfColor);
+  if (switch_value.find("light") != std::string::npos)
+    *luma = color_utils::LumaRange::LIGHT;
+  else if (switch_value.find("normal") != std::string::npos)
+    *luma = color_utils::LumaRange::NORMAL;
+  else if (switch_value.find("dark") != std::string::npos)
+    *luma = color_utils::LumaRange::DARK;
+
+  if (switch_value.find("vibrant") != std::string::npos)
+    *saturation = color_utils::SaturationRange::VIBRANT;
+  else if (switch_value.find("muted") != std::string::npos)
+    *saturation = color_utils::SaturationRange::MUTED;
+
+  return true;
+}
+
 WallpaperController::WallpaperController(
     const scoped_refptr<base::TaskRunner>& task_runner)
     : locked_(false),
       wallpaper_mode_(WALLPAPER_NONE),
+      prominent_color_(SK_ColorTRANSPARENT),
       wallpaper_reload_delay_(kWallpaperReloadDelayMs),
       task_runner_(task_runner) {
   WmShell::Get()->AddDisplayObserver(this);
@@ -39,6 +78,10 @@
 }
 
 WallpaperController::~WallpaperController() {
+  if (current_wallpaper_)
+    current_wallpaper_->RemoveObserver(this);
+  if (color_calculator_)
+    color_calculator_->RemoveObserver(this);
   WmShell::Get()->RemoveDisplayObserver(this);
   WmShell::Get()->RemoveShellObserver(this);
 }
@@ -82,6 +125,7 @@
 
   current_wallpaper_.reset(new wallpaper::WallpaperResizer(
       image, GetMaxDisplaySizeInNative(), layout, task_runner_));
+  current_wallpaper_->AddObserver(this);
   current_wallpaper_->StartResize();
 
   for (auto& observer : observers_)
@@ -91,6 +135,7 @@
 }
 
 void WallpaperController::CreateEmptyWallpaper() {
+  SetProminentColor(SK_ColorTRANSPARENT);
   current_wallpaper_.reset();
   wallpaper_mode_ = WALLPAPER_IMAGE;
   InstallDesktopControllerForAllWindows();
@@ -205,6 +250,16 @@
   SetWallpaperImage(gfx::ImageSkia::CreateFrom1xBitmap(wallpaper), layout);
 }
 
+void WallpaperController::OnWallpaperResized() {
+  CalculateWallpaperColors();
+}
+
+void WallpaperController::OnColorCalculationComplete() {
+  const SkColor color = color_calculator_->prominent_color();
+  color_calculator_.reset();
+  SetProminentColor(color);
+}
+
 void WallpaperController::InstallDesktopController(WmWindow* root_window) {
   WallpaperWidgetController* component = nullptr;
   int container_id = GetWallpaperContainerId(locked_);
@@ -273,4 +328,29 @@
   WmShell::Get()->wallpaper_delegate()->UpdateWallpaper(clear_cache);
 }
 
+void WallpaperController::SetProminentColor(SkColor color) {
+  if (prominent_color_ == color)
+    return;
+
+  prominent_color_ = color;
+  for (auto& observer : observers_)
+    observer.OnWallpaperColorsChanged();
+}
+
+void WallpaperController::CalculateWallpaperColors() {
+  color_utils::LumaRange luma;
+  color_utils::SaturationRange saturation;
+  if (!GetProminentColorProfile(&luma, &saturation))
+    return;
+
+  if (color_calculator_)
+    color_calculator_->RemoveObserver(this);
+
+  color_calculator_ = base::MakeUnique<wallpaper::WallpaperColorCalculator>(
+      GetWallpaper(), luma, saturation, task_runner_);
+  color_calculator_->AddObserver(this);
+  if (!color_calculator_->StartCalculation())
+    SetProminentColor(SK_ColorTRANSPARENT);
+}
+
 }  // namespace ash

diff --git a/ash/common/wallpaper/wallpaper_controller.h b/ash/common/wallpaper/wallpaper_controller.h
index ac2000f05..0cead11 100644
--- a/ash/common/wallpaper/wallpaper_controller.h
+++ b/ash/common/wallpaper/wallpaper_controller.h

@@ -15,8 +15,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
+#include "components/wallpaper/wallpaper_color_calculator_observer.h"
 #include "components/wallpaper/wallpaper_layout.h"
+#include "components/wallpaper/wallpaper_resizer_observer.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "ui/gfx/color_analysis.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace base {
@@ -24,6 +27,7 @@
 }
 
 namespace wallpaper {
+class WallpaperColorCalculator;
 class WallpaperResizer;
 }
 
@@ -35,7 +39,9 @@
 class ASH_EXPORT WallpaperController
     : public NON_EXPORTED_BASE(mojom::WallpaperController),
       public WmDisplayObserver,
-      public ShellObserver {
+      public ShellObserver,
+      public wallpaper::WallpaperResizerObserver,
+      public wallpaper::WallpaperColorCalculatorObserver {
  public:
   enum WallpaperMode { WALLPAPER_NONE, WALLPAPER_IMAGE };
 
@@ -50,6 +56,8 @@
   void AddObserver(WallpaperControllerObserver* observer);
   void RemoveObserver(WallpaperControllerObserver* observer);
 
+  SkColor prominent_color() const { return prominent_color_; }
+
   // Provides current image on the wallpaper, or empty gfx::ImageSkia if there
   // is no image, e.g. wallpaper is none.
   gfx::ImageSkia GetWallpaper() const;
@@ -107,7 +115,19 @@
   void SetWallpaper(const SkBitmap& wallpaper,
                     wallpaper::WallpaperLayout layout) override;
 
+  // WallpaperResizerObserver:
+  void OnWallpaperResized() override;
+
+  // WallpaperColorCalculatorObserver:
+  void OnColorCalculationComplete() override;
+
  private:
+  // Returns true if the shelf should be colored based on the wallpaper's
+  // prominent color. |luma| and |saturation| are output parameters.
+  static bool GetProminentColorProfile(
+      color_utils::LumaRange* luma,
+      color_utils::SaturationRange* saturation);
+
   // Creates a WallpaperWidgetController for |root_window|.
   void InstallDesktopController(WmWindow* root_window);
 
@@ -125,6 +145,13 @@
   // wallpaper cahce or not.
   void UpdateWallpaper(bool clear_cache);
 
+  // Sets |prominent_color_| and notifies the observers if there is a change.
+  void SetProminentColor(SkColor color);
+
+  // If enabled, will initiates an asynchronous task to extract colors from the
+  // wallpaper. If an existing calculation is in progress it is destroyed.
+  void CalculateWallpaperColors();
+
   bool locked_;
 
   WallpaperMode wallpaper_mode_;
@@ -139,6 +166,13 @@
 
   std::unique_ptr<wallpaper::WallpaperResizer> current_wallpaper_;
 
+  // Asynchronous task to extract colors from the wallpaper.
+  std::unique_ptr<wallpaper::WallpaperColorCalculator> color_calculator_;
+
+  // The prominent color extracted from the current wallpaper.
+  // SK_ColorTRANSPARENT is used by default or if extracting colors fails.
+  SkColor prominent_color_;
+
   gfx::Size current_max_display_size_;
 
   base::OneShotTimer timer_;

diff --git a/ash/common/wallpaper/wallpaper_controller_observer.h b/ash/common/wallpaper/wallpaper_controller_observer.h
index 2421adf..775c802 100644
--- a/ash/common/wallpaper/wallpaper_controller_observer.h
+++ b/ash/common/wallpaper/wallpaper_controller_observer.h

@@ -14,6 +14,11 @@
   // Invoked when the wallpaper data is changed.
   virtual void OnWallpaperDataChanged() = 0;
 
+  // Invoked when the colors extracted from the current wallpaper change. May
+  // be called as a side effect of changing the wallpaper on the
+  // WallpaperController, e.g. WallpaperController::SetWallpaperImage().
+  virtual void OnWallpaperColorsChanged() {}
+
  protected:
   virtual ~WallpaperControllerObserver() {}
 };

diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index 3e620c3f..fb6a220 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc

@@ -56,7 +56,9 @@
   explicit DockedBackgroundWidget(DockedWindowLayoutManager* manager)
       : manager_(manager),
         alignment_(DOCKED_ALIGNMENT_NONE),
-        background_animator_(SHELF_BACKGROUND_DEFAULT, nullptr),
+        background_animator_(SHELF_BACKGROUND_DEFAULT,
+                             nullptr,
+                             WmShell::Get()->wallpaper_controller()),
         opaque_background_(ui::LAYER_SOLID_COLOR),
         visible_background_type_(manager_->shelf()->GetBackgroundType()),
         visible_background_change_type_(AnimationChangeType::IMMEDIATE) {
@@ -86,9 +88,8 @@
   }
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfBackground(int alpha) override {
-    const float kMaxAlpha = 255.0f;
-    opaque_background_.SetOpacity(alpha / kMaxAlpha);
+  void UpdateShelfBackground(SkColor color) override {
+    opaque_background_.SetColor(color);
   }
 
   // WmShelfObserver:

diff --git a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
index 8edb1d0..da77506 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc

@@ -5,6 +5,7 @@
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 
 #include "ash/common/session/session_state_delegate.h"
+#include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
@@ -53,6 +54,15 @@
     return false;
   }
 
+  // Do not exit fullscreen in kiosk mode.
+  SystemTrayDelegate* system_tray_delegate =
+      WmShell::Get()->system_tray_delegate();
+  if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
+      system_tray_delegate->GetUserLoginStatus() ==
+          LoginStatus::ARC_KIOSK_APP) {
+    return false;
+  }
+
   WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN);
   window->GetWindowState()->OnWMEvent(&toggle_fullscreen);
   return true;

diff --git a/ash/mus/app_launch_unittest.cc b/ash/mus/app_launch_unittest.cc
index 7cf67d0..1ee880a4 100644
--- a/ash/mus/app_launch_unittest.cc
+++ b/ash/mus/app_launch_unittest.cc

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ash/public/interfaces/constants.mojom.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ -33,7 +34,7 @@
 };
 
 TEST_F(AppLaunchTest, TestQuickLaunch) {
-  connector()->Connect("ash");
+  connector()->Connect(mojom::kServiceName);
   connector()->Connect(mash::quick_launch::mojom::kServiceName);
 
   ui::mojom::WindowServerTestPtr test_interface;

diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 26879415..5602244 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc

@@ -23,6 +23,7 @@
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/top_level_window_factory.h"
 #include "ash/mus/window_properties.h"
+#include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
@@ -65,15 +66,19 @@
       wm_state_(base::MakeUnique<::wm::WMState>()),
       property_converter_(base::MakeUnique<aura::PropertyConverter>()) {
   property_converter_->RegisterProperty(
-      kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property);
+      kPanelAttachedKey, ui::mojom::WindowManager::kPanelAttached_Property,
+      aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter_->RegisterProperty(
       kRenderTitleAreaProperty,
-      ui::mojom::WindowManager::kRenderParentTitleArea_Property);
+      ui::mojom::WindowManager::kRenderParentTitleArea_Property,
+      aura::PropertyConverter::CreateAcceptAnyValueCallback());
   property_converter_->RegisterProperty(
-      kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property);
+      kShelfItemTypeKey, ui::mojom::WindowManager::kShelfItemType_Property,
+      base::Bind(&IsValidShelfItemType));
   property_converter_->RegisterProperty(
       ::wm::kShadowElevationKey,
-      ui::mojom::WindowManager::kShadowElevation_Property);
+      ui::mojom::WindowManager::kShadowElevation_Property,
+      base::Bind(&::wm::IsValidShadowElevation));
 }
 
 WindowManager::~WindowManager() {

diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
index 4c2c0cd..a9e6371b 100644
--- a/ash/mus/window_manager_unittest.cc
+++ b/ash/mus/window_manager_unittest.cc

@@ -6,6 +6,7 @@
 #include <memory>
 #include <vector>
 
+#include "ash/public/interfaces/constants.mojom.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ -83,7 +84,7 @@
 
   WindowTreeClientDelegate window_tree_delegate;
 
-  connector()->Connect("ash");
+  connector()->Connect(mojom::kServiceName);
 
   // Connect to mus and create a new top level window. The request goes to
   // |ash|, but is async.

diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index c0d2536f..acf89c7b 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn

@@ -11,6 +11,7 @@
     "session_types.h",
     "shelf_application_menu_item.cc",
     "shelf_application_menu_item.h",
+    "shelf_types.cc",
     "shelf_types.h",
     "shell_window_ids.cc",
     "shell_window_ids.h",

diff --git a/ash/public/cpp/shelf_types.cc b/ash/public/cpp/shelf_types.cc
new file mode 100644
index 0000000..e61144b
--- /dev/null
+++ b/ash/public/cpp/shelf_types.cc

@@ -0,0 +1,15 @@
+// Copyright 2017 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 "ash/public/cpp/shelf_types.h"
+
+namespace ash {
+
+bool IsValidShelfItemType(int64_t type) {
+  return type == TYPE_APP_PANEL || type == TYPE_APP_SHORTCUT ||
+         type == TYPE_APP_LIST || type == TYPE_BROWSER_SHORTCUT ||
+         type == TYPE_APP || type == TYPE_DIALOG || type == TYPE_UNDEFINED;
+}
+
+}  // namespace ash

diff --git a/ash/public/cpp/shelf_types.h b/ash/public/cpp/shelf_types.h
index 6074199..fbed76c 100644
--- a/ash/public/cpp/shelf_types.h
+++ b/ash/public/cpp/shelf_types.h

@@ -5,6 +5,10 @@
 #ifndef ASH_PUBLIC_CPP_SHELF_TYPES_H_
 #define ASH_PUBLIC_CPP_SHELF_TYPES_H_
 
+#include <cstdint>
+
+#include "ash/public/cpp/ash_public_export.h"
+
 namespace ash {
 
 enum ShelfAlignment {
@@ -114,6 +118,9 @@
   TYPE_UNDEFINED,
 };
 
+// Returns true if |type| is a valid ShelfItemType.
+ASH_PUBLIC_EXPORT bool IsValidShelfItemType(int64_t type);
+
 // Represents the status of applications in the shelf.
 enum ShelfItemStatus {
   // A closed shelf item, i.e. has no live instance.

diff --git a/ash/public/interfaces/BUILD.gn b/ash/public/interfaces/BUILD.gn
index 69c170faba..b0128049 100644
--- a/ash/public/interfaces/BUILD.gn
+++ b/ash/public/interfaces/BUILD.gn

@@ -9,6 +9,7 @@
     "accelerator_controller.mojom",
     "ash_window_type.mojom",
     "cast_config.mojom",
+    "constants.mojom",
     "locale.mojom",
     "media.mojom",
     "new_window.mojom",

diff --git a/ash/public/interfaces/constants.mojom b/ash/public/interfaces/constants.mojom
new file mode 100644
index 0000000..60c2a21
--- /dev/null
+++ b/ash/public/interfaces/constants.mojom

@@ -0,0 +1,7 @@
+// Copyright 2017 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.
+
+module ash.mojom;
+
+const string kServiceName = "ash";

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 5f1b6d0e3..66d31ad 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn

@@ -2009,6 +2009,7 @@
     "message_loop/message_loop_unittest.cc",
     "message_loop/message_pump_glib_unittest.cc",
     "message_loop/message_pump_io_ios_unittest.cc",
+    "message_loop/message_pump_mac_unittest.cc",
     "metrics/bucket_ranges_unittest.cc",
     "metrics/field_trial_params_unittest.cc",
     "metrics/field_trial_unittest.cc",

diff --git a/base/bind_unittest.nc b/base/bind_unittest.nc
index e6b2534..e7f2bd8 100644
--- a/base/bind_unittest.nc
+++ b/base/bind_unittest.nc

@@ -206,8 +206,8 @@
 #elif defined(NCTEST_DISALLOW_CAPTURING_LAMBDA)  // [r"fatal error: implicit instantiation of undefined template 'base::internal::FunctorTraits<\(lambda at (\.\./)+base/bind_unittest.nc:[0-9]+:[0-9]+\), void>'"]
 
 void WontCompile() {
-  int i = 0;
-  Bind([i]() {});
+  int i = 0, j = 0;
+  Bind([i,&j]() {j = i;});
 }
 
 #elif defined(NCTEST_DISALLOW_BINDING_ONCE_CALLBACK_WITH_NO_ARGS)  // [r"static_assert failed \"Attempting to bind a base::Callback with no additional arguments: save a heap allocation and use the original base::Callback object\""]

diff --git a/base/message_loop/message_pump_mac.h b/base/message_loop/message_pump_mac.h
index 14b8377..f0766eb8 100644
--- a/base/message_loop/message_pump_mac.h
+++ b/base/message_loop/message_pump_mac.h

@@ -78,9 +78,11 @@
 typedef NSAutoreleasePool AutoreleasePoolType;
 #endif  // !defined(__OBJC__) || __has_feature(objc_arc)
 
-class MessagePumpCFRunLoopBase : public MessagePump {
+class BASE_EXPORT MessagePumpCFRunLoopBase : public MessagePump {
   // Needs access to CreateAutoreleasePool.
   friend class MessagePumpScopedAutoreleasePool;
+  friend class TestMessagePumpCFRunLoopBase;
+
  public:
   MessagePumpCFRunLoopBase();
   ~MessagePumpCFRunLoopBase() override;
@@ -113,6 +115,21 @@
   virtual AutoreleasePoolType* CreateAutoreleasePool();
 
  private:
+  // Marking timers as invalid at the right time helps significantly reduce
+  // power use (see the comment in RunDelayedWorkTimer()), however there is no
+  // public API for doing so. CFRuntime.h states that CFRuntimeBase, upon which
+  // the above timer invalidation functions are based, can change from release
+  // to release and should not be accessed directly (this struct last changed at
+  // least in 2008 in CF-476).
+  //
+  // This function uses private API to modify a test timer's valid state and
+  // uses public API to confirm that the private API changed the right bit.
+  static bool CanInvalidateCFRunLoopTimers();
+
+  // Sets a Core Foundation object's "invalid" bit to |valid|. Based on code
+  // from CFRunLoop.c.
+  static void ChromeCFRunLoopTimerSetValid(CFRunLoopTimerRef timer, bool valid);
+
   // Timer callback scheduled by ScheduleDelayedWork.  This does not do any
   // work, but it signals work_source_ so that delayed work can be performed
   // within the appropriate priority constraints.

diff --git a/base/message_loop/message_pump_mac.mm b/base/message_loop/message_pump_mac.mm
index d924ead..82d9f1e8 100644
--- a/base/message_loop/message_pump_mac.mm
+++ b/base/message_loop/message_pump_mac.mm

@@ -69,7 +69,48 @@
 // Set to true if MessagePumpMac::Create() is called before NSApp is
 // initialized.  Only accessed from the main thread.
 bool g_not_using_cr_app = false;
+
+// Various CoreFoundation definitions.
+typedef struct __CFRuntimeBase {
+  uintptr_t _cfisa;
+  uint8_t _cfinfo[4];
+#if __LP64__
+  uint32_t _rc;
 #endif
+} CFRuntimeBase;
+
+#if defined(__BIG_ENDIAN__)
+#define __CF_BIG_ENDIAN__ 1
+#define __CF_LITTLE_ENDIAN__ 0
+#endif
+
+#if defined(__LITTLE_ENDIAN__)
+#define __CF_LITTLE_ENDIAN__ 1
+#define __CF_BIG_ENDIAN__ 0
+#endif
+
+#define CF_INFO_BITS (!!(__CF_BIG_ENDIAN__)*3)
+
+#define __CFBitfieldMask(N1, N2) \
+  ((((UInt32)~0UL) << (31UL - (N1) + (N2))) >> (31UL - N1))
+#define __CFBitfieldSetValue(V, N1, N2, X)   \
+  ((V) = ((V) & ~__CFBitfieldMask(N1, N2)) | \
+         (((X) << (N2)) & __CFBitfieldMask(N1, N2)))
+
+// Marking timers as invalid at the right time by flipping their valid bit helps
+// significantly reduce power use (see the explanation in
+// RunDelayedWorkTimer()), however there is no public API for doing so.
+// CFRuntime.h states that CFRuntimeBase can change from release to release
+// and should not be accessed directly. The last known change of this struct
+// occurred in 2008 in CF-476 / 10.5; unfortunately the source for 10.11 and
+// 10.12 is not available for inspection at this time.
+// CanInvalidateCFRunLoopTimers() will at least prevent us from invalidating
+// timers if this function starts flipping the wrong bit on a future OS release.
+void __ChromeCFRunLoopTimerSetValid(CFRunLoopTimerRef timer, bool valid) {
+  __CFBitfieldSetValue(((CFRuntimeBase*)timer)->_cfinfo[CF_INFO_BITS], 3, 3,
+                       valid);
+}
+#endif  // !defined(OS_IOS)
 
 }  // namespace
 
@@ -94,6 +135,47 @@
   DISALLOW_COPY_AND_ASSIGN(MessagePumpScopedAutoreleasePool);
 };
 
+#if !defined(OS_IOS)
+// This function uses private API to modify a test timer's valid state and
+// uses public API to confirm that the private API changed the correct bit.
+// static
+bool MessagePumpCFRunLoopBase::CanInvalidateCFRunLoopTimers() {
+  CFRunLoopTimerContext timer_context = CFRunLoopTimerContext();
+  timer_context.info = nullptr;
+  ScopedCFTypeRef<CFRunLoopTimerRef> test_timer(
+      CFRunLoopTimerCreate(NULL,                // allocator
+                           kCFTimeIntervalMax,  // fire time
+                           kCFTimeIntervalMax,  // interval
+                           0,                   // flags
+                           0,                   // priority
+                           nullptr, &timer_context));
+  // Should be valid from the start.
+  if (!CFRunLoopTimerIsValid(test_timer)) {
+    return false;
+  }
+  // Confirm that the private API can mark the timer invalid.
+  __ChromeCFRunLoopTimerSetValid(test_timer, false);
+  if (CFRunLoopTimerIsValid(test_timer)) {
+    return false;
+  }
+  // Confirm that the private API can mark the timer valid.
+  __ChromeCFRunLoopTimerSetValid(test_timer, true);
+  return CFRunLoopTimerIsValid(test_timer);
+}
+#endif  // !defined(OS_IOS)
+
+// static
+void MessagePumpCFRunLoopBase::ChromeCFRunLoopTimerSetValid(
+    CFRunLoopTimerRef timer,
+    bool valid) {
+#if !defined(OS_IOS)
+  static bool can_invalidate_timers = CanInvalidateCFRunLoopTimers();
+  if (can_invalidate_timers) {
+    __ChromeCFRunLoopTimerSetValid(timer, valid);
+  }
+#endif  // !defined(OS_IOS)
+}
+
 // Must be called on the run loop thread.
 MessagePumpCFRunLoopBase::MessagePumpCFRunLoopBase()
     : delegate_(NULL),
@@ -243,6 +325,17 @@
     const TimeTicks& delayed_work_time) {
   TimeDelta delta = delayed_work_time - TimeTicks::Now();
   delayed_work_fire_time_ = CFAbsoluteTimeGetCurrent() + delta.InSecondsF();
+
+  // Flip the timer's validation bit just before setting the new fire time. Do
+  // this now because CFRunLoopTimerSetNextFireDate() likely checks the validity
+  // of a timer before proceeding to set its fire date. Making the timer valid
+  // now won't have any side effects (such as a premature firing of the timer)
+  // because we're only flipping a bit.
+  //
+  // Please see the comment in RunDelayedWorkTimer() for more info on the whys
+  // of invalidation.
+  ChromeCFRunLoopTimerSetValid(delayed_work_timer_, true);
+
   CFRunLoopTimerSetNextFireDate(delayed_work_timer_, delayed_work_fire_time_);
   if (timer_slack_ == TIMER_SLACK_MAXIMUM) {
     CFRunLoopTimerSetTolerance(delayed_work_timer_, delta.InSecondsF() * 0.5);
@@ -264,6 +357,31 @@
   // The timer won't fire again until it's reset.
   self->delayed_work_fire_time_ = kCFTimeIntervalMax;
 
+  // The message pump's timer needs to fire at changing and unpredictable
+  // intervals. Creating a new timer for each firing time is very expensive, so
+  // the message pump instead uses a repeating timer with a very large repeat
+  // rate. After each firing of the timer, the run loop sets the timer's next
+  // firing time to the distant future, essentially pausing the timer until the
+  // pump sets the next firing time. This is the solution recommended by Apple.
+  //
+  // It turns out, however, that scheduling timers is also quite expensive, and
+  // that every one of the message pump's timer firings incurs two
+  // reschedulings. The first rescheduling occurs in ScheduleDelayedWork(),
+  // which sets the desired next firing time. The second comes after exiting
+  // this method (the timer's callback method), when the run loop sets the
+  // timer's next firing time to far in the future.
+  //
+  // The code in __CFRunLoopDoTimer() inside CFRunLoop.c calls the timer's
+  // callback, confirms that the timer is valid, and then sets its future
+  // firing time based on its repeat frequency. Flipping the valid bit here
+  // causes the __CFRunLoopDoTimer() to skip setting the future firing time.
+  // Note that there's public API to invalidate a timer but it goes beyond
+  // flipping the valid bit, making the timer unusable in the future.
+  //
+  // ScheduleDelayedWork() flips the valid bit back just before setting the
+  // timer's new firing time.
+  ChromeCFRunLoopTimerSetValid(self->delayed_work_timer_, false);
+
   // CFRunLoopTimers fire outside of the priority scheme for CFRunLoopSources.
   // In order to establish the proper priority in which work and delayed work
   // are processed one for one, the timer used to schedule delayed work must

diff --git a/base/message_loop/message_pump_mac_unittest.cc b/base/message_loop/message_pump_mac_unittest.cc
new file mode 100644
index 0000000..17c70c8
--- /dev/null
+++ b/base/message_loop/message_pump_mac_unittest.cc

@@ -0,0 +1,108 @@
+// Copyright 2017 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 "base/message_loop/message_pump_mac.h"
+
+#include "base/mac/scoped_cftyperef.h"
+#include "base/macros.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace base {
+
+class TestMessagePumpCFRunLoopBase {
+ public:
+  bool TestCanInvalidateTimers() {
+    return MessagePumpCFRunLoopBase::CanInvalidateCFRunLoopTimers();
+  }
+  static void SetTimerValid(CFRunLoopTimerRef timer, bool valid) {
+    MessagePumpCFRunLoopBase::ChromeCFRunLoopTimerSetValid(timer, valid);
+  }
+
+  static void PerformTimerCallback(CFRunLoopTimerRef timer, void* info) {
+    TestMessagePumpCFRunLoopBase* self =
+        static_cast<TestMessagePumpCFRunLoopBase*>(info);
+    self->timer_callback_called_ = true;
+
+    if (self->invalidate_timer_in_callback_) {
+      SetTimerValid(timer, false);
+    }
+  }
+
+  bool invalidate_timer_in_callback_;
+
+  bool timer_callback_called_;
+};
+
+TEST(MessagePumpMacTest, TestCanInvalidateTimers) {
+  TestMessagePumpCFRunLoopBase message_pump_test;
+
+  // Catch whether or not the use of private API ever starts failing.
+  EXPECT_TRUE(message_pump_test.TestCanInvalidateTimers());
+}
+
+TEST(MessagePumpMacTest, TestInvalidatedTimerReuse) {
+  TestMessagePumpCFRunLoopBase message_pump_test;
+
+  CFRunLoopTimerContext timer_context = CFRunLoopTimerContext();
+  timer_context.info = &message_pump_test;
+  const CFTimeInterval kCFTimeIntervalMax =
+      std::numeric_limits<CFTimeInterval>::max();
+  ScopedCFTypeRef<CFRunLoopTimerRef> test_timer(CFRunLoopTimerCreate(
+      NULL,                // allocator
+      kCFTimeIntervalMax,  // fire time
+      kCFTimeIntervalMax,  // interval
+      0,                   // flags
+      0,                   // priority
+      TestMessagePumpCFRunLoopBase::PerformTimerCallback, &timer_context));
+  CFRunLoopAddTimer(CFRunLoopGetCurrent(), test_timer,
+                    kMessageLoopExclusiveRunLoopMode);
+
+  // Sanity check.
+  EXPECT_TRUE(CFRunLoopTimerIsValid(test_timer));
+
+  // Confirm that the timer fires as expected, and that it's not a one-time-use
+  // timer (those timers are invalidated after they fire).
+  CFAbsoluteTime next_fire_time = CFAbsoluteTimeGetCurrent() + 0.01;
+  CFRunLoopTimerSetNextFireDate(test_timer, next_fire_time);
+  message_pump_test.timer_callback_called_ = false;
+  message_pump_test.invalidate_timer_in_callback_ = false;
+  CFRunLoopRunInMode(kMessageLoopExclusiveRunLoopMode, 0.02, true);
+  EXPECT_TRUE(message_pump_test.timer_callback_called_);
+  EXPECT_TRUE(CFRunLoopTimerIsValid(test_timer));
+
+  // As a repeating timer, the timer should have a new fire date set in the
+  // future.
+  EXPECT_GT(CFRunLoopTimerGetNextFireDate(test_timer), next_fire_time);
+
+  // Try firing the timer, and invalidating it within its callback.
+  next_fire_time = CFAbsoluteTimeGetCurrent() + 0.01;
+  CFRunLoopTimerSetNextFireDate(test_timer, next_fire_time);
+  message_pump_test.timer_callback_called_ = false;
+  message_pump_test.invalidate_timer_in_callback_ = true;
+  CFRunLoopRunInMode(kMessageLoopExclusiveRunLoopMode, 0.02, true);
+  EXPECT_TRUE(message_pump_test.timer_callback_called_);
+  EXPECT_FALSE(CFRunLoopTimerIsValid(test_timer));
+
+  // The CFRunLoop believes the timer is invalid, so it should not have a
+  // fire date.
+  EXPECT_EQ(0, CFRunLoopTimerGetNextFireDate(test_timer));
+
+  // Now mark the timer as valid and confirm that it still fires correctly.
+  TestMessagePumpCFRunLoopBase::SetTimerValid(test_timer, true);
+  EXPECT_TRUE(CFRunLoopTimerIsValid(test_timer));
+  next_fire_time = CFAbsoluteTimeGetCurrent() + 0.01;
+  CFRunLoopTimerSetNextFireDate(test_timer, next_fire_time);
+  message_pump_test.timer_callback_called_ = false;
+  message_pump_test.invalidate_timer_in_callback_ = false;
+  CFRunLoopRunInMode(kMessageLoopExclusiveRunLoopMode, 0.02, true);
+  EXPECT_TRUE(message_pump_test.timer_callback_called_);
+  EXPECT_TRUE(CFRunLoopTimerIsValid(test_timer));
+
+  // Confirm that the run loop again gave it a new fire date in the future.
+  EXPECT_GT(CFRunLoopTimerGetNextFireDate(test_timer), next_fire_time);
+
+  CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), test_timer,
+                       kMessageLoopExclusiveRunLoopMode);
+}
+}  // namespace base

diff --git a/base/task_scheduler/post_task.cc b/base/task_scheduler/post_task.cc
index 3cf075d..a1a3bc2 100644
--- a/base/task_scheduler/post_task.cc
+++ b/base/task_scheduler/post_task.cc

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "base/logging.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/post_task_and_reply_impl.h"
 
@@ -58,6 +59,8 @@
                                const TaskTraits& traits,
                                const Closure& task,
                                TimeDelta delay) {
+  DCHECK(TaskScheduler::GetInstance())
+      << "Ref. Prerequisite section of post_task.h";
   TaskScheduler::GetInstance()->PostDelayedTaskWithTraits(from_here, traits,
                                                           task, delay);
 }
@@ -71,17 +74,23 @@
 }
 
 scoped_refptr<TaskRunner> CreateTaskRunnerWithTraits(const TaskTraits& traits) {
+  DCHECK(TaskScheduler::GetInstance())
+      << "Ref. Prerequisite section of post_task.h";
   return TaskScheduler::GetInstance()->CreateTaskRunnerWithTraits(traits);
 }
 
 scoped_refptr<SequencedTaskRunner> CreateSequencedTaskRunnerWithTraits(
     const TaskTraits& traits) {
+  DCHECK(TaskScheduler::GetInstance())
+      << "Ref. Prerequisite section of post_task.h";
   return TaskScheduler::GetInstance()->CreateSequencedTaskRunnerWithTraits(
       traits);
 }
 
 scoped_refptr<SingleThreadTaskRunner> CreateSingleThreadTaskRunnerWithTraits(
     const TaskTraits& traits) {
+  DCHECK(TaskScheduler::GetInstance())
+      << "Ref. Prerequisite section of post_task.h";
   return TaskScheduler::GetInstance()->CreateSingleThreadTaskRunnerWithTraits(
       traits);
 }

diff --git a/base/task_scheduler/post_task.h b/base/task_scheduler/post_task.h
index 8b3e7df..3174f06d 100644
--- a/base/task_scheduler/post_task.h
+++ b/base/task_scheduler/post_task.h

@@ -23,9 +23,6 @@
 
 // This is the preferred interface to post tasks to the TaskScheduler.
 //
-// TaskScheduler must have been registered for the current process via
-// TaskScheduler::SetInstance() before the functions below are valid.
-//
 // To post a simple one-off task with default traits:
 //     PostTask(FROM_HERE, Bind(...));
 //
@@ -62,6 +59,13 @@
 // registered TaskScheduler (i.e. not on the main thread). Tasks posted through
 // functions below with a delay may be coalesced (i.e. delays may be adjusted to
 // reduce the number of wakeups and hence power consumption).
+//
+// Prerequisite: A TaskScheduler must have been registered for the current
+// process via TaskScheduler::SetInstance() before the functions below are
+// valid. This is typically done during the initialization phase in each
+// process. If your code is not running in that phase, you most likely don't
+// have to worry about this. You will encounter DCHECKs or nullptr dereferences
+// if this is violated. For tests, prefer base::test::ScopedTaskScheduler.
 
 // Posts |task| to the TaskScheduler. Calling this is equivalent to calling
 // PostTaskWithTraits with plain TaskTraits.

diff --git a/base/task_scheduler/task_scheduler.h b/base/task_scheduler/task_scheduler.h
index 296e40b..da2cb79 100644
--- a/base/task_scheduler/task_scheduler.h
+++ b/base/task_scheduler/task_scheduler.h

@@ -108,25 +108,36 @@
   // new TaskScheduler.
 
   // Creates and sets a task scheduler with one worker pool that can have up to
-  // |max_threads| threads. CHECKs on failure.
+  // |max_threads| threads. CHECKs on failure. For tests, prefer
+  // base::test::ScopedTaskScheduler (ensures isolation).
   static void CreateAndSetSimpleTaskScheduler(int max_threads);
 
   // Creates and sets a task scheduler with custom worker pools. CHECKs on
   // failure. |worker_pool_params_vector| describes the worker pools to create.
   // |worker_pool_index_for_traits_callback| returns the index in |worker_pools|
-  // of the worker pool in which a task with given traits should run.
+  // of the worker pool in which a task with given traits should run. For tests,
+  // prefer base::test::ScopedTaskScheduler (ensures isolation).
   static void CreateAndSetDefaultTaskScheduler(
       const std::vector<SchedulerWorkerPoolParams>& worker_pool_params_vector,
       const WorkerPoolIndexForTraitsCallback&
           worker_pool_index_for_traits_callback);
 
   // Registers |task_scheduler| to handle tasks posted through the post_task.h
-  // API for this process.
+  // API for this process. For tests, prefer base::test::ScopedTaskScheduler
+  // (ensures isolation).
   static void SetInstance(std::unique_ptr<TaskScheduler> task_scheduler);
 
-  // Retrieve the TaskScheduler set via CreateAndSetDefaultTaskScheduler() or
-  // SetInstance(). This should be used very rarely; most users of TaskScheduler
-  // should use the post_task.h API.
+  // Retrieve the TaskScheduler set via SetInstance() or
+  // CreateAndSet(Simple|Default)TaskScheduler(). This should be used very
+  // rarely; most users of TaskScheduler should use the post_task.h API. In
+  // particular, refrain from doing
+  //   if (!TaskScheduler::GetInstance()) {
+  //     TaskScheduler::SetInstance(...);
+  //     base::PostTask(...);
+  //   }
+  // instead make sure to SetInstance() early in one determinstic place in the
+  // process' initialization phase.
+  // In doubt, consult with //base/task_scheduler/OWNERS.
   static TaskScheduler* GetInstance();
 
  private:

diff --git a/base/task_scheduler/task_traits.h b/base/task_scheduler/task_traits.h
index c2e3728..435fdac 100644
--- a/base/task_scheduler/task_traits.h
+++ b/base/task_scheduler/task_traits.h

@@ -127,7 +127,7 @@
   // removing usage of methods listed above in the labeled tasks would still
   // result in tasks that may block (per MayBlock()'s definition).
   //
-  // In doubt, consult with base/task_scheduler/OWNERS.
+  // In doubt, consult with //base/task_scheduler/OWNERS.
   TaskTraits& WithBaseSyncPrimitives();
 
   // Applies |priority| to tasks with these traits.

diff --git a/base/threading/sequenced_task_runner_handle.cc b/base/threading/sequenced_task_runner_handle.cc
index 53f3261..90f68b3 100644
--- a/base/threading/sequenced_task_runner_handle.cc
+++ b/base/threading/sequenced_task_runner_handle.cc

@@ -16,45 +16,56 @@
 
 namespace {
 
-base::LazyInstance<base::ThreadLocalPointer<SequencedTaskRunnerHandle>>::Leaky
+LazyInstance<ThreadLocalPointer<SequencedTaskRunnerHandle>>::Leaky
     lazy_tls_ptr = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
 scoped_refptr<SequencedTaskRunner> SequencedTaskRunnerHandle::Get() {
+  // Return the registered SingleThreadTaskRunner, if any. This must be at the
+  // top so that a SingleThreadTaskRunner has priority over a
+  // SequencedTaskRunner (RLZ registers both on the same thread despite that
+  // being prevented by DCHECKs).
+  // TODO(fdoray): Move this to the bottom once RLZ stops registering a
+  // SingleThreadTaskRunner and a SequencedTaskRunner on the same thread.
+  // https://crbug.com/618530#c14
+  if (ThreadTaskRunnerHandle::IsSet()) {
+    // Various modes of setting SequencedTaskRunnerHandle don't combine.
+    DCHECK(!lazy_tls_ptr.Pointer()->Get());
+    DCHECK(!SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid());
+
+    return ThreadTaskRunnerHandle::Get();
+  }
+
   // Return the registered SequencedTaskRunner, if any.
   const SequencedTaskRunnerHandle* handle = lazy_tls_ptr.Pointer()->Get();
   if (handle) {
     // Various modes of setting SequencedTaskRunnerHandle don't combine.
-    DCHECK(!base::ThreadTaskRunnerHandle::IsSet());
     DCHECK(!SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid());
+
     return handle->task_runner_;
   }
 
   // If we are on a worker thread for a SequencedBlockingPool that is running a
   // sequenced task, return a SequencedTaskRunner for it.
-  scoped_refptr<base::SequencedWorkerPool> pool =
+  scoped_refptr<SequencedWorkerPool> pool =
       SequencedWorkerPool::GetWorkerPoolForCurrentThread();
-  if (pool) {
-    SequencedWorkerPool::SequenceToken sequence_token =
-        SequencedWorkerPool::GetSequenceTokenForCurrentThread();
-    DCHECK(sequence_token.IsValid());
-    scoped_refptr<SequencedTaskRunner> sequenced_task_runner(
-        pool->GetSequencedTaskRunner(sequence_token));
-    DCHECK(sequenced_task_runner->RunsTasksOnCurrentThread());
-    return sequenced_task_runner;
-  }
-
-  // Return the SingleThreadTaskRunner for the current thread otherwise.
-  return base::ThreadTaskRunnerHandle::Get();
+  DCHECK(pool);
+  SequencedWorkerPool::SequenceToken sequence_token =
+      SequencedWorkerPool::GetSequenceTokenForCurrentThread();
+  DCHECK(sequence_token.IsValid());
+  scoped_refptr<SequencedTaskRunner> sequenced_task_runner(
+      pool->GetSequencedTaskRunner(sequence_token));
+  DCHECK(sequenced_task_runner->RunsTasksOnCurrentThread());
+  return sequenced_task_runner;
 }
 
 // static
 bool SequencedTaskRunnerHandle::IsSet() {
   return lazy_tls_ptr.Pointer()->Get() ||
          SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid() ||
-         base::ThreadTaskRunnerHandle::IsSet();
+         ThreadTaskRunnerHandle::IsSet();
 }
 
 SequencedTaskRunnerHandle::SequencedTaskRunnerHandle(

diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index df5325f..8ab8ea0 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py

@@ -94,9 +94,7 @@
 
 
 def _ConvertToJMakeArgs(javac_cmd, pdb_path):
-  new_args = ['bin/jmake', '-pdb', pdb_path]
-  if javac_cmd[0] != 'javac':
-    new_args.extend(('-jcexec', new_args[0]))
+  new_args = ['bin/jmake', '-pdb', pdb_path, '-jcexec', javac_cmd[0]]
   if md5_check.PRINT_EXPLANATIONS:
     new_args.append('-Xtiming')
 
@@ -420,9 +418,12 @@
 
   java_files = _FilterJavaFiles(java_files, options.javac_includes)
 
-  javac_cmd = ['javac']
   if options.use_errorprone_path:
-    javac_cmd = [options.use_errorprone_path] + ERRORPRONE_OPTIONS
+    javac_path = options.use_errorprone_path
+    javac_cmd = [javac_path] + ERRORPRONE_OPTIONS
+  else:
+    javac_path = distutils.spawn.find_executable('javac')
+    javac_cmd = [javac_path]
 
   javac_cmd.extend((
       '-g',
@@ -473,8 +474,10 @@
         else:
           classpath_inputs.append(path)
 
-  # Compute the list of paths that when changed, we need to rebuild.
-  input_paths = classpath_inputs + options.java_srcjars + java_files
+  # GN already knows of java_files, so listing them just make things worse when
+  # they change.
+  depfile_deps = [javac_path] + classpath_inputs + options.java_srcjars
+  input_paths = depfile_deps + java_files
 
   output_paths = [
       options.jar_path,
@@ -493,6 +496,7 @@
       lambda changes: _OnStaleMd5(changes, options, javac_cmd, java_files,
                                   classpath_inputs),
       options,
+      depfile_deps=depfile_deps,
       input_paths=input_paths,
       input_strings=javac_cmd,
       output_paths=output_paths,

diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index 93e3a633..ef260f7a 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py

@@ -498,6 +498,7 @@
     self._store_tombstones = False
     self._initializeTombstonesAttributes(args)
 
+    self._should_save_images = None
     self._should_save_logcat = None
     self._initializeLogAttributes(args)
 
@@ -678,6 +679,7 @@
 
   def _initializeLogAttributes(self, args):
     self._should_save_logcat = bool(args.json_results_file)
+    self._should_save_images = bool(args.json_results_file)
 
   def _initializeEditPrefsAttributes(self, args):
     if not hasattr(args, 'shared_prefs_file'):
@@ -738,6 +740,10 @@
     return self._flags
 
   @property
+  def should_save_images(self):
+    return self._should_save_images
+
+  @property
   def should_save_logcat(self):
     return self._should_save_logcat
 

diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
index 1cc82f96..7bfe3f5 100644
--- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
+++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -6,6 +6,7 @@
 import os
 import posixpath
 import re
+import tempfile
 import time
 
 from devil.android import device_errors
@@ -14,15 +15,25 @@
 from devil.utils import reraiser_thread
 from pylib import valgrind_tools
 from pylib.android import logdog_logcat_monitor
+from pylib.constants import host_paths
 from pylib.base import base_test_result
 from pylib.instrumentation import instrumentation_test_instance
 from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_test_run
+from pylib.utils import google_storage_helper
 from pylib.utils import logdog_helper
 from py_trace_event import trace_event
 from py_utils import contextlib_ext
+from py_utils import tempfile_ext
 import tombstones
 
+try:
+  from PIL import Image  # pylint: disable=import-error
+  from PIL import ImageChops  # pylint: disable=import-error
+  can_compute_diffs = True
+except ImportError:
+  can_compute_diffs = False
+
 _TAG = 'test_runner_py'
 
 TIMEOUT_ANNOTATIONS = [
@@ -35,6 +46,15 @@
   ('SmallTest', 1 * 60),
 ]
 
+_RE_RENDER_IMAGE_NAME = re.compile(
+      r'(?P<test_class>\w+)\.'
+      r'(?P<description>\w+)\.'
+      r'(?P<device_model>\w+)\.'
+      r'(?P<orientation>port|land)\.png')
+
+RENDER_TESTS_RESULTS_DIR = {
+  'ChromePublicTest': 'chrome/test/data/android/render_tests'
+}
 
 # TODO(jbudorick): Make this private once the instrumentation test_runner is
 # deprecated.
@@ -321,6 +341,8 @@
       if logcat_url:
         result.SetLink('logcat', logcat_url)
 
+    self._ProcessRenderTestResults(device, results)
+
     # Update the result name if the test used flags.
     if flags:
       for r in results:
@@ -352,11 +374,19 @@
         file_name = '%s-%s.png' % (
             test_display_name,
             time.strftime('%Y%m%dT%H%M%S', time.localtime()))
-        saved_dir = device.TakeScreenshot(
+        screenshot_file = device.TakeScreenshot(
             os.path.join(self._test_instance.screenshot_dir, file_name))
         logging.info(
             'Saved screenshot for %s to %s.',
-            test_display_name, saved_dir)
+            test_display_name, screenshot_file)
+        if self._test_instance.should_save_images:
+          link = google_storage_helper.upload(
+              google_storage_helper.unique_name('screenshot', device=device),
+              screenshot_file,
+              bucket='chromium-render-tests')
+          for result in results:
+            result.SetLink('failure_screenshot', link)
+
       logging.info('detected failure in %s. raw output:', test_display_name)
       for l in output:
         logging.info('  %s', l)
@@ -368,7 +398,6 @@
             else None)
         device.ClearApplicationState(self._test_instance.package_info.package,
                                      permissions=permissions)
-
     else:
       logging.debug('raw output from %s:', test_display_name)
       for l in output:
@@ -396,6 +425,95 @@
           result.SetLink('tombstones', tombstones_url)
     return results, None
 
+  def _ProcessRenderTestResults(self, device, results):
+    render_results_dir = RENDER_TESTS_RESULTS_DIR.get(self._test_instance.suite)
+    if not render_results_dir:
+      return
+
+    failure_images_device_dir = posixpath.join(
+        device.GetExternalStoragePath(),
+        'chromium_tests_root', render_results_dir, 'failures')
+    if not device.FileExists(failure_images_device_dir):
+      return
+
+    if self._test_instance.should_save_images:
+      with tempfile_ext.NamedTemporaryDirectory() as temp_dir:
+        device.PullFile(failure_images_device_dir, temp_dir)
+        device.RemovePath(failure_images_device_dir, recursive=True)
+
+        for failure_filename in os.listdir(
+            os.path.join(temp_dir, 'failures')):
+
+          m = _RE_RENDER_IMAGE_NAME.match(failure_filename)
+          if not m:
+            logging.warning('Unexpected file in render test failures: %s',
+                            failure_filename)
+            continue
+
+          failure_filepath = os.path.join(
+              temp_dir, 'failures', failure_filename)
+          failure_link = google_storage_helper.upload(
+              google_storage_helper.unique_name(
+                  failure_filename, device=device),
+              failure_filepath,
+              bucket='chromium-render-tests')
+
+          golden_filepath = os.path.join(
+              host_paths.DIR_SOURCE_ROOT, render_results_dir,
+              failure_filename)
+          if not os.path.exists(golden_filepath):
+            logging.error('Cannot find golden image for %s', failure_filename)
+            continue
+          golden_link = google_storage_helper.upload(
+              google_storage_helper.unique_name(
+                  failure_filename, device=device),
+              golden_filepath,
+              bucket='chromium-render-tests')
+
+          if can_compute_diffs:
+            diff_filename = '_diff'.join(
+                os.path.splitext(failure_filename))
+            diff_filepath = os.path.join(temp_dir, diff_filename)
+            (ImageChops.difference(
+                Image.open(failure_filepath), Image.open(golden_filepath))
+                    .convert('L')
+                    .point(lambda i: 255 if i else 0)
+                    .save(diff_filepath))
+            diff_link = google_storage_helper.upload(
+                google_storage_helper.unique_name(
+                    diff_filename, device=device),
+                diff_filepath,
+                bucket='chromium-render-tests')
+          else:
+            diff_link = ''
+            logging.error('Error importing PIL library. Image diffs for '
+                          'render test results will not be computed.')
+
+          with tempfile.NamedTemporaryFile(suffix='.html') as temp_html:
+            temp_html.write('''
+                <html>
+                <table>
+                <tr>
+                  <th>Failure</th>
+                  <th>Golden</th>
+                  <th>Diff</th>
+                </tr>
+                <tr>
+                  <td><img src="%s"/></td>
+                  <td><img src="%s"/></td>
+                  <td><img src="%s"/></td>
+                </tr>
+                </table>
+                </html>
+                ''' % (failure_link, golden_link, diff_link))
+            html_results_link = google_storage_helper.upload(
+                google_storage_helper.unique_name(
+                    'render_html', device=device),
+                temp_html.name,
+                bucket='chromium-render-tests')
+            for result in results:
+              result.SetLink(failure_filename, html_results_link)
+
   #override
   def _ShouldRetry(self, test):
     if 'RetryOnFailure' in test.get('annotations', {}):

diff --git a/build/android/pylib/utils/google_storage_helper.py b/build/android/pylib/utils/google_storage_helper.py
new file mode 100644
index 0000000..2fbbc15
--- /dev/null
+++ b/build/android/pylib/utils/google_storage_helper.py

@@ -0,0 +1,57 @@
+# Copyright 2017 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.
+
+"""Helper functions to upload data to Google Storage.
+
+Text data should be streamed to logdog using |logdog_helper| module.
+Due to logdog not having image or HTML viewer, those instead should be uploaded
+to Google Storage directly using this module.
+"""
+
+import logging
+import os
+import sys
+import time
+
+from devil.utils import cmd_helper
+from pylib.constants import host_paths
+from pylib.utils import decorators
+
+sys.path.append(os.path.join(host_paths.DIR_SOURCE_ROOT, 'build'))
+import find_depot_tools  # pylint: disable=import-error
+
+_URL_TEMPLATE = 'https://storage.googleapis.com/%s/'
+
+
+@decorators.NoRaiseException(default_return_value='')
+def upload(name, filepath, bucket):
+  """Uploads data to Google Storage.
+
+  Args:
+    name: Name of the file on Google Storage.
+    filepath: Path to file you want to upload.
+    bucket: Bucket to upload file to.
+  """
+  gs_path = os.path.join('gs://%s/' % bucket, name)
+  logging.info('Uploading %s to %s', filepath, gs_path)
+  cmd_helper.RunCmd(
+      [os.path.join(find_depot_tools.DEPOT_TOOLS_PATH, 'gsutil.py'), 'cp',
+       filepath, gs_path])
+
+  return os.path.join(_URL_TEMPLATE % bucket, name)
+
+
+def unique_name(basename, timestamp=True, device=None):
+  """Helper function for creating a unique name for a logdog stream.
+
+  Args:
+    basename: Base of the unique name.
+    timestamp: Whether or not to add a timestamp to name.
+    device: Device to add device serial of to name.
+  """
+  return '%s%s%s' % (
+      basename,
+      '_%s' % time.strftime('%Y%m%dT%H%M%S', time.localtime())
+      if timestamp else '',
+      '_%s' % device.serial if device else '')

diff --git a/build/android/pylib/utils/logdog_helper.py b/build/android/pylib/utils/logdog_helper.py
index 8dfab7e..fc933d3 100644
--- a/build/android/pylib/utils/logdog_helper.py
+++ b/build/android/pylib/utils/logdog_helper.py

@@ -27,7 +27,7 @@
   Returns:
     Link to view uploaded text in logdog viewer.
   """
-  logging.debug('Writing text to logdog stream, %s', name)
+  logging.info('Writing text to logdog stream, %s', name)
   with get_logdog_client().text(name) as stream:
     stream.write(data)
     return stream.get_viewer_url()
@@ -43,7 +43,7 @@
   Returns:
     A file like object. close() file when done.
   """
-  logging.debug('Opening text logdog stream, %s', name)
+  logging.info('Opening text logdog stream, %s', name)
   return get_logdog_client().open_text(name)
 
 
@@ -58,7 +58,7 @@
   Returns:
     Link to view uploaded binary in logdog viewer.
   """
-  logging.debug('Writing binary to logdog stream, %s', name)
+  logging.info('Writing binary to logdog stream, %s', name)
   with get_logdog_client().binary(name) as stream:
     with open(binary_path, 'r') as f:
       stream.write(f.read())
@@ -82,4 +82,3 @@
 def get_logdog_client():
   logging.debug('Getting logdog client.')
   return bootstrap.ButlerBootstrap.probe().stream_client()
-

diff --git a/build/android/render_tests/process_render_test_results.py b/build/android/render_tests/process_render_test_results.py
deleted file mode 100755
index 9ab0d1b..0000000
--- a/build/android/render_tests/process_render_test_results.py
+++ /dev/null

@@ -1,214 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-
-import argparse
-import collections
-import logging
-import os
-import posixpath
-import re
-import shutil
-import sys
-import tempfile
-import zipfile
-
-sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
-import devil_chromium
-from devil.android import device_utils
-from devil.utils import cmd_helper
-from pylib.constants import host_paths
-
-sys.path.append(os.path.join(host_paths.DIR_SOURCE_ROOT, 'build'))
-import find_depot_tools  # pylint: disable=import-error
-
-sys.path.append(os.path.join(host_paths.DIR_SOURCE_ROOT, 'third_party'))
-import jinja2  # pylint: disable=import-error
-
-try:
-  from PIL import Image  # pylint: disable=import-error
-  from PIL import ImageChops  # pylint: disable=import-error
-  can_compute_diffs = True
-except ImportError:
-  can_compute_diffs = False
-  logging.exception('Error importing PIL library. Image diffs will not be '
-                    'displayed properly unless PIL module is installed.')
-
-_RE_IMAGE_NAME = re.compile(
-    r'(?P<test_class>\w+)\.'
-    r'(?P<description>\w+)\.'
-    r'(?P<device_model>\w+)\.'
-    r'(?P<orientation>port|land)\.png')
-
-_RENDER_TEST_BASE_URL = 'https://storage.googleapis.com/chromium-render-tests/'
-_RENDER_TEST_BUCKET = 'gs://chromium-render-tests/'
-
-_JINJA_TEMPLATE_DIR = os.path.dirname(os.path.abspath(__file__))
-_JINJA_TEMPLATE_FILENAME = 'render_webpage.html.jinja2'
-
-
-def _UploadFiles(upload_dir, files):
-  """Upload files to the render tests GS bucket."""
-  if files:
-    google_storage_upload_dir = os.path.join(_RENDER_TEST_BUCKET, upload_dir)
-    cmd = [os.path.join(find_depot_tools.DEPOT_TOOLS_PATH, 'gsutil.py'),
-           '-m', 'cp']
-    cmd.extend(files)
-    cmd.append(google_storage_upload_dir)
-    cmd_helper.RunCmd(cmd)
-
-
-def _GoogleStorageUrl(upload_dir, filename):
-  return os.path.join(
-      _RENDER_TEST_BASE_URL, upload_dir, os.path.basename(filename))
-
-
-def _ComputeImageDiff(failure_image, golden_image):
-  """Compute mask showing which pixels are different between two images."""
-  return (ImageChops.difference(failure_image, golden_image)
-      .convert('L')
-      .point(lambda i: 255 if i else 0))
-
-
-def ProcessRenderTestResults(devices, render_results_dir,
-                             upload_dir, html_file):
-  """Grabs render results from device and generates webpage displaying results.
-
-  Args:
-    devices: List of DeviceUtils objects to grab results from.
-    render_results_path: Path where render test results are storage.
-        Will look for failures render test results on the device in
-        /sdcard/chromium_tests_root/<render_results_path>/failures/
-        and will look for golden images at Chromium src/<render_results_path>/.
-    upload_dir: Directory to upload the render test results to.
-    html_file: File to write the test results to.
-  """
-  results_dict = collections.defaultdict(lambda: collections.defaultdict(list))
-
-  diff_upload_dir = os.path.join(upload_dir, 'diffs')
-  failure_upload_dir = os.path.join(upload_dir, 'failures')
-  golden_upload_dir = os.path.join(upload_dir, 'goldens')
-
-  diff_images = []
-  failure_images = []
-  golden_images = []
-
-  temp_dir = None
-  try:
-    temp_dir = tempfile.mkdtemp()
-
-    for device in devices:
-      failures_device_dir = posixpath.join(
-          device.GetExternalStoragePath(),
-          'chromium_tests_root', render_results_dir, 'failures')
-      device.PullFile(failures_device_dir, temp_dir)
-
-    for failure_filename in os.listdir(os.path.join(temp_dir, 'failures')):
-      m = _RE_IMAGE_NAME.match(failure_filename)
-      if not m:
-        logging.warning(
-            'Unexpected file in render test failures, %s', failure_filename)
-        continue
-      failure_file = os.path.join(temp_dir, 'failures', failure_filename)
-
-      # Check to make sure we have golden image for this failure.
-      golden_file = os.path.join(
-          host_paths.DIR_SOURCE_ROOT, render_results_dir, failure_filename)
-      if not os.path.exists(golden_file):
-        logging.error('Cannot find golden image for %s', failure_filename)
-        continue
-
-      # Compute image diff between failure and golden.
-      if can_compute_diffs:
-        diff_image = _ComputeImageDiff(
-            Image.open(failure_file), Image.open(golden_file))
-        diff_filename = '_diff'.join(
-            os.path.splitext(os.path.basename(failure_file)))
-        diff_file = os.path.join(temp_dir, diff_filename)
-        diff_image.save(diff_file)
-        diff_images.append(diff_file)
-
-      failure_images.append(failure_file)
-      golden_images.append(golden_file)
-
-      test_class = m.group('test_class')
-      device_model = m.group('device_model')
-
-      results_entry = {
-          'description': m.group('description'),
-          'orientation': m.group('orientation'),
-          'failure_image': _GoogleStorageUrl(failure_upload_dir, failure_file),
-          'golden_image': _GoogleStorageUrl(golden_upload_dir, golden_file),
-      }
-      if can_compute_diffs:
-        results_entry.update(
-            {'diff_image': _GoogleStorageUrl(diff_upload_dir, diff_file)})
-      results_dict[test_class][device_model].append(results_entry)
-
-    if can_compute_diffs:
-      _UploadFiles(diff_upload_dir, diff_images)
-    _UploadFiles(failure_upload_dir, failure_images)
-    _UploadFiles(golden_upload_dir, golden_images)
-
-    if failure_images:
-      failures_zipfile = os.path.join(temp_dir, 'failures.zip')
-      with zipfile.ZipFile(failures_zipfile, mode='w') as zf:
-        for failure_file in failure_images:
-          zf.write(failure_file, os.path.join(
-              render_results_dir, os.path.basename(failure_file)))
-        failure_zip_url = _GoogleStorageUrl(upload_dir, failures_zipfile)
-      _UploadFiles(upload_dir, [failures_zipfile])
-    else:
-      failure_zip_url = None
-
-    jinja2_env = jinja2.Environment(
-        loader=jinja2.FileSystemLoader(_JINJA_TEMPLATE_DIR),
-        trim_blocks=True)
-    template = jinja2_env.get_template(_JINJA_TEMPLATE_FILENAME)
-    #  pylint: disable=no-member
-    processed_template_output = template.render(
-        full_results=dict(results_dict),
-        failure_zip_url=failure_zip_url, show_diffs=can_compute_diffs)
-    #  pylint: enable=no-member
-    with open(html_file, 'wb') as f:
-      f.write(processed_template_output)
-  finally:
-    if temp_dir:
-      shutil.rmtree(temp_dir)
-
-
-def main():
-  parser = argparse.ArgumentParser()
-
-  parser.add_argument('--render-results-dir',
-                      required=True,
-                      help='Path on device to look for render test images')
-  parser.add_argument('--output-html-file',
-                      required=True,
-                      help='File to output the results webpage.')
-  parser.add_argument('-d', '--device', dest='devices', action='append',
-                      default=[],
-                      help='Device to look for render test results on. '
-                           'Default is to look on all connected devices.')
-  parser.add_argument('--adb-path', type=os.path.abspath,
-                      help='Absolute path to the adb binary to use.')
-  parser.add_argument('--buildername', type=str, required=True,
-                      help='Bot buildername. Used to generate path to upload '
-                           'render test results')
-  parser.add_argument('--build-number', type=str, required=True,
-                      help='Bot build number. Used to generate path to upload '
-                           'render test results')
-
-  args = parser.parse_args()
-  devil_chromium.Initialize(adb_path=args.adb_path)
-  devices = device_utils.DeviceUtils.HealthyDevices(device_arg=args.devices)
-
-  upload_dir = os.path.join(args.buildername, args.build_number)
-  ProcessRenderTestResults(
-      devices, args.render_results_dir, upload_dir, args.output_html_file)
-
-
-if __name__ == '__main__':
-  sys.exit(main())

diff --git a/build/android/render_tests/render_webpage.html.jinja2 b/build/android/render_tests/render_webpage.html.jinja2
deleted file mode 100644
index b5ea6039..0000000
--- a/build/android/render_tests/render_webpage.html.jinja2
+++ /dev/null

@@ -1,84 +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.
--->
-<!DOCTYPE html>
-<html>
-  <head>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.blue-indigo.min.css">
-    <script defer src="https://code.getmdl.io/1.2.1/material.min.js"></script>
-
-    <style>
-      div.text-element {
-        text-align: center;
-      }
-      body {
-          background-color: #efefef;
-      }
-    </style>
-  </head>
-
-  <body>
-    {% if failure_zip_url is not none %}
-      <a href="{{ failure_zip_url }}">
-        <div class="mdl-color--primary" width="100%">
-          <h3>Download Image Zip</h3>
-        </div>
-      </a>
-    {% endif %}
-
-    {% for test_class, device_results in full_results.iteritems() %}
-      <div class="mdl-color--primary" width="100%">
-        <h3>{{ test_class }}</h3>
-      </div>
-
-      <div class="mdl-tabs mdl-js-tabs mdl-js-ripple-effect">
-        <div class="mdl-tabs__tab-bar">
-          {% for device_model, _ in device_results.iteritems() %}
-            <a href="#{{ device_model }}-panel" class="mdl-tabs__tab">{{ device_model }}</a>
-          {% endfor %}
-        </div>
-
-        {% for device_model, test_results in device_results.iteritems() %}
-          <div class="mdl-tabs__panel" id="{{ device_model }}-panel">
-
-            <div class="mdl-grid">
-              <div class="mdl-cell mdl-cell--3-col text-element"><b>Description</b></div>
-              <div class="mdl-cell mdl-cell--3-col text-element"><b>Golden</b></div>
-              <div class="mdl-cell mdl-cell--3-col text-element"><b>Failure</b></div>
-              {% if show_diffs %}
-                <div class="mdl-cell mdl-cell--3-col text-element"><b>Diff</b></div>
-              {% endif %}
-            </div>
-            {% for result in test_results %}
-              <div class="mdl-grid">
-                <div class="mdl-cell mdl-cell--3-col text-element">
-                  {{ result['description'] }}
-                </div>
-                <div class="mdl-cell mdl-cell--3-col">
-                  <a href="{{ result['golden_image'] }}">
-                    <img class="mdl-shadow--2dp" src="{{ result['golden_image'] }}" width="100%">
-                  </a>
-                </div>
-                <div class="mdl-cell mdl-cell--3-col mdl-shadow--2dp">
-                  <a href="{{ result['failure_image'] }}">
-                    <img src="{{ result['failure_image'] }}" width="100%">
-                  </a>
-                </div>
-                {% if show_diffs %}
-                  <div class="mdl-cell mdl-cell--3-col mdl-shadow--2dp">
-                    <a href="{{ result['diff_image'] }}">
-                      <img src="{{ result['diff_image'] }}" width="100%">
-                    </a>
-                  </div>
-                {% endif %}
-              </div>
-            {% endfor %}
-          </div>
-        {% endfor %}
-      </div>
-    {% endfor %}
-  </body>
-</html>

diff --git a/build/android/test_runner.pydeps b/build/android/test_runner.pydeps
index 2bf69ff..1cb513a 100644
--- a/build/android/test_runner.pydeps
+++ b/build/android/test_runner.pydeps

@@ -13,6 +13,7 @@
 ../../third_party/catapult/common/py_utils/py_utils/cloud_storage_global_lock.py
 ../../third_party/catapult/common/py_utils/py_utils/contextlib_ext.py
 ../../third_party/catapult/common/py_utils/py_utils/lock.py
+../../third_party/catapult/common/py_utils/py_utils/tempfile_ext.py
 ../../third_party/catapult/dependency_manager/dependency_manager/__init__.py
 ../../third_party/catapult/dependency_manager/dependency_manager/archive_info.py
 ../../third_party/catapult/dependency_manager/dependency_manager/base_config.py
@@ -120,6 +121,7 @@
 ../../tools/swarming_client/libs/logdog/stream.py
 ../../tools/swarming_client/libs/logdog/streamname.py
 ../../tools/swarming_client/libs/logdog/varint.py
+../find_depot_tools.py
 ../util/lib/common/unittest_util.py
 devil_chromium.py
 pylib/__init__.py
@@ -177,6 +179,7 @@
 pylib/utils/decorators.py
 pylib/utils/device_dependencies.py
 pylib/utils/dexdump.py
+pylib/utils/google_storage_helper.py
 pylib/utils/logdog_helper.py
 pylib/utils/proguard.py
 pylib/utils/repo_utils.py

diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
index 2fd1517..22e308f 100644
--- a/build/config/clang/BUILD.gn
+++ b/build/config/clang/BUILD.gn

@@ -37,6 +37,16 @@
       "find-bad-constructs",
     ]
 
+    # TODO(vmpstr): We need to enable this everywhere. crbug.com/554600
+    if (is_linux && !is_chromeos && !is_chromecast) {
+      cflags += [
+        "-Xclang",
+        "-plugin-arg-find-bad-constructs",
+        "-Xclang",
+        "check-auto-raw-pointer",
+      ]
+    }
+
     if ((is_linux || is_android) && !is_chromecast) {
       cflags += [
         "-Xclang",

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 8f57120..9137028 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn

@@ -1084,7 +1084,10 @@
         "-Wno-shift-negative-value",
       ]
     }
-    if (!is_nacl && !use_xcode_clang) {
+
+    # use_xcode_clang only refers to the iOS toolchain, host binaries use
+    # chromium's clang always.
+    if (!is_nacl && (!use_xcode_clang || current_toolchain == host_toolchain)) {
       # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not
       # recognize.
       cflags += [
@@ -1099,16 +1102,13 @@
 
         # TODO(thakis): Consider turning this on, https://crbug.com/691120
         "-Wno-block-capture-autoreleasing",
-      ]
-      if (llvm_force_head_revision) {
-        cflags += [
-          # TODO(hans): https://crbug.com/681136
-          "-Wno-unused-lambda-capture",
 
-          # TODO(thakis ): https://crbug.com/683349
-          "-Wno-user-defined-warnings",
-        ]
-      }
+        # TODO(hans): https://crbug.com/681136
+        "-Wno-unused-lambda-capture",
+
+        # TODO(thakis ): https://crbug.com/683349
+        "-Wno-user-defined-warnings",
+      ]
     }
   }
 }

diff --git a/build/toolchain/toolchain.gni b/build/toolchain/toolchain.gni
index 5722c12..6eb3c908 100644
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni

@@ -50,12 +50,7 @@
 declare_args() {
   if (is_clang) {
     # Clang compiler version. Clang files are placed at version-dependent paths.
-    if (llvm_force_head_revision) {
-      clang_version = "5.0.0"
-    } else {
-      # TODO(thakis): Remove this branch the next time clang rolls.
-      clang_version = "4.0.0"
-    }
+    clang_version = "5.0.0"
   }
 }
 

diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index 34afd76..33a9a35 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc

@@ -91,7 +91,8 @@
   for (size_t i = 0; i < render_surface_layer_list.size(); ++i) {
     size_t surface_index = render_surface_layer_list.size() - 1 - i;
     LayerImpl* render_surface_layer = render_surface_layer_list[surface_index];
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
     DCHECK(render_surface);
 
     const LayerImplList& layer_list = render_surface->layer_list();
@@ -100,7 +101,8 @@
          ++layer_index) {
       LayerImpl* layer = layer_list[layer_index];
 
-      if (layer->render_surface() && layer->render_surface() != render_surface)
+      if (layer->GetRenderSurface() &&
+          layer->GetRenderSurface() != render_surface)
         continue;
 
       if (layer == hud_layer)
@@ -122,7 +124,8 @@
   for (size_t i = 0; i < render_surface_layer_list.size(); ++i) {
     size_t surface_index = render_surface_layer_list.size() - 1 - i;
     LayerImpl* render_surface_layer = render_surface_layer_list[surface_index];
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
     DCHECK(render_surface);
 
     debug_rects_.push_back(DebugRect(
@@ -137,7 +140,8 @@
   for (size_t i = 0; i < render_surface_layer_list.size(); ++i) {
     size_t surface_index = render_surface_layer_list.size() - 1 - i;
     LayerImpl* render_surface_layer = render_surface_layer_list[surface_index];
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
     DCHECK(render_surface);
 
     debug_rects_.push_back(

diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
index 19b72bad..46123e0 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.cc
+++ b/cc/debug/rasterize_and_record_benchmark_impl.cc

@@ -51,7 +51,7 @@
       SkBitmap bitmap;
       bitmap.allocPixels(SkImageInfo::MakeN32Premul(content_rect.width(),
                                                     content_rect.height()));
-      PaintCanvas canvas(bitmap);
+      SkCanvas canvas(bitmap);
       raster_source->PlaybackToCanvas(&canvas, content_rect, content_rect,
                                       contents_scale,
                                       RasterSource::PlaybackSettings());

diff --git a/cc/ipc/display_compositor.mojom b/cc/ipc/display_compositor.mojom
index 52b688a..5e4813f 100644
--- a/cc/ipc/display_compositor.mojom
+++ b/cc/ipc/display_compositor.mojom

@@ -57,6 +57,16 @@
       cc.mojom.MojoCompositorFrameSink& compositor_frame_sink,
       cc.mojom.MojoCompositorFrameSinkPrivate& compositor_frame_sink_private,
       cc.mojom.MojoCompositorFrameSinkClient compositor_frame_sink_client);
+
+  // Set up a BeginFrame relationship between two FrameSinkIds. In this case,
+  // the child inherits the BeginFrameSource from the parent if it doesn't
+  // already have a BeginFrameSource.
+  RegisterFrameSinkHierarchy(cc.mojom.FrameSinkId parent_frame_sink_id,
+                             cc.mojom.FrameSinkId child_frame_sink_id);
+
+  // Removes a BeginFrame relationship between two FrameSinkIds.
+  UnregisterFrameSinkHierarchy(cc.mojom.FrameSinkId parent_frame_sink_id,
+                               cc.mojom.FrameSinkId child_frame_sink_id);
 };
 
 // The DisplayCompositorClient interface is implemented by the Display

diff --git a/cc/ipc/mojo_compositor_frame_sink.mojom b/cc/ipc/mojo_compositor_frame_sink.mojom
index a38af96..aad4152e 100644
--- a/cc/ipc/mojo_compositor_frame_sink.mojom
+++ b/cc/ipc/mojo_compositor_frame_sink.mojom

@@ -70,14 +70,10 @@
   WillDrawSurface(LocalSurfaceId local_surface_id, gfx.mojom.Rect damage_rect);
 };
 
-// MojoCompositorFrameSinkPrivate is used by the display compositor host to set
-// up BeginFrameSource hierarchies.  This API lives in SurfaceManager but is
-// called from here in order to ensure that hierarchy registration does not race
-// CompositorFrameSink creation.
+// MojoCompositorFrameSinkPrivate is used by the display compositor host to
+// perform privilieged operations on a CompositorFrameSink such as
+// CopyOutputRequests.
 interface MojoCompositorFrameSinkPrivate {
-  AddChildFrameSink(FrameSinkId child_frame_sink_id);
-  RemoveChildFrameSink(FrameSinkId child_frame_sink_id);
-
   // Requests that the renderer send back a copy of the surface that this
   // CompositorFrameSink submits to. The result can be in form of a bitmap
   // or a texture. See cc::CopyOutputRequest.

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 6787376..010df13 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc

@@ -1024,7 +1024,7 @@
                                            gfx::Rect(scaled_bounds));
 }
 
-RenderSurfaceImpl* LayerImpl::render_surface() const {
+RenderSurfaceImpl* LayerImpl::GetRenderSurface() const {
   EffectNode* effect_node = GetEffectTree().Node(effect_tree_index_);
   if (effect_node->owning_layer_id == id())
     return GetEffectTree().GetRenderSurface(effect_tree_index_);

diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 5435f37..d2b5c39 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h

@@ -123,9 +123,6 @@
   void UpdatePropertyTreeTransformIsAnimated(bool is_animated);
   void UpdatePropertyTreeScrollOffset();
 
-  // For compatibility with Layer.
-  bool has_render_surface() const { return !!render_surface(); }
-
   LayerTreeImpl* layer_tree_impl() const { return layer_tree_impl_; }
 
   void PopulateSharedQuadState(SharedQuadState* state) const;
@@ -230,7 +227,7 @@
 
   bool ShowDebugBorders() const;
 
-  RenderSurfaceImpl* render_surface() const;
+  RenderSurfaceImpl* GetRenderSurface() const;
 
   // The render surface which this layer draws into. This can be either owned by
   // the same layer or an ancestor of this layer.

diff --git a/cc/layers/layer_iterator.h b/cc/layers/layer_iterator.h
index 4257c28..9eb8224 100644
--- a/cc/layers/layer_iterator.h
+++ b/cc/layers/layer_iterator.h

@@ -164,7 +164,7 @@
       : render_surface_layer_list_(render_surface_layer_list),
         target_render_surface_layer_index_(0) {
     for (size_t i = 0; i < render_surface_layer_list->size(); ++i) {
-      if (!render_surface_layer_list->at(i)->render_surface()) {
+      if (!render_surface_layer_list->at(i)->GetRenderSurface()) {
         NOTREACHED();
         MoveToEnd();
         return;
@@ -250,7 +250,7 @@
   }
 
   inline bool current_layer_represents_contributing_render_surface() const {
-    RenderSurfaceImpl* render_surface = current_layer()->render_surface();
+    RenderSurfaceImpl* render_surface = current_layer()->GetRenderSurface();
     return render_surface && render_surface != target_render_surface();
   }
   inline bool current_layer_represents_target_render_surface() const {
@@ -259,7 +259,7 @@
   }
 
   inline RenderSurfaceImpl* target_render_surface() const {
-    return target_render_surface_layer()->render_surface();
+    return target_render_surface_layer()->GetRenderSurface();
   }
   inline const LayerImplList& target_render_surface_children() const {
     return target_render_surface()->layer_list();

diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index ea51d6fd..4b93ea6e 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc

@@ -57,7 +57,8 @@
        ++surface_index) {
     TestLayerImpl* render_surface_layer = static_cast<TestLayerImpl*>(
         render_surface_layer_list->at(surface_index));
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
 
     render_surface_layer->count_representing_target_surface_ = -1;
     render_surface_layer->count_representing_contributing_surface_ = -1;

diff --git a/cc/layers/layer_position_constraint_unittest.cc b/cc/layers/layer_position_constraint_unittest.cc
index 4451b0a..ce8e214 100644
--- a/cc/layers/layer_position_constraint_unittest.cc
+++ b/cc/layers/layer_position_constraint_unittest.cc

@@ -459,12 +459,12 @@
   gfx::Transform expected_grand_child_transform;
   gfx::Transform expected_great_grand_child_transform;
   expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
-  EXPECT_TRUE(grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
@@ -496,12 +496,12 @@
   expected_great_grand_child_transform.Translate(10.0, 30.0);
   expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
@@ -603,18 +603,18 @@
   gfx::Transform expected_fixed_position_child_transform;
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->render_surface());
-  EXPECT_TRUE(great_grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->render_surface()->draw_transform());
+      great_grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -643,18 +643,18 @@
   expected_fixed_position_child_transform.Translate(10.0, 30.0);
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->render_surface());
-  EXPECT_TRUE(great_grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->render_surface()->draw_transform());
+      great_grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -765,18 +765,18 @@
   gfx::Transform expected_fixed_position_child_transform;
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->render_surface());
-  EXPECT_TRUE(great_grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->render_surface()->draw_transform());
+      great_grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -810,18 +810,18 @@
   expected_fixed_position_child_transform.Translate(10.0, 30.0);
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->render_surface());
-  EXPECT_TRUE(great_grand_child_impl_->render_surface());
+  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->render_surface()->draw_transform());
+      grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->render_surface()->draw_transform());
+      great_grand_child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
@@ -848,10 +848,10 @@
   gfx::Transform expected_surface_draw_transform;
   gfx::Transform expected_child_transform;
   gfx::Transform expected_grand_child_transform;
-  EXPECT_TRUE(child_impl_->render_surface());
+  EXPECT_TRUE(child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      child_impl_->render_surface()->draw_transform());
+      child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
@@ -869,10 +869,10 @@
   expected_grand_child_transform.MakeIdentity();
   expected_grand_child_transform.Translate(10.0, 10.0);
 
-  EXPECT_TRUE(child_impl_->render_surface());
+  EXPECT_TRUE(child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      child_impl_->render_surface()->draw_transform());
+      child_impl_->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,

diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc
index d89445b..7fc6e9c 100644
--- a/cc/layers/painted_scrollbar_layer.cc
+++ b/cc/layers/painted_scrollbar_layer.cc

@@ -10,6 +10,8 @@
 #include "cc/base/math_util.h"
 #include "cc/input/main_thread_scrolling_reason.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "cc/trees/draw_property_utils.h"
 #include "cc/trees/layer_tree_host.h"
@@ -263,26 +265,25 @@
 
   SkBitmap skbitmap;
   skbitmap.allocN32Pixels(content_rect.width(), content_rect.height());
-  SkCanvas skcanvas(skbitmap);
+  PaintCanvas canvas(skbitmap);
 
   float scale_x =
       content_rect.width() / static_cast<float>(layer_rect.width());
   float scale_y =
       content_rect.height() / static_cast<float>(layer_rect.height());
 
-  skcanvas.scale(SkFloatToScalar(scale_x),
-                 SkFloatToScalar(scale_y));
-  skcanvas.translate(SkFloatToScalar(-layer_rect.x()),
-                     SkFloatToScalar(-layer_rect.y()));
+  canvas.scale(SkFloatToScalar(scale_x), SkFloatToScalar(scale_y));
+  canvas.translate(SkFloatToScalar(-layer_rect.x()),
+                   SkFloatToScalar(-layer_rect.y()));
 
   SkRect layer_skrect = RectToSkRect(layer_rect);
-  SkPaint paint;
+  PaintFlags paint;
   paint.setAntiAlias(false);
   paint.setBlendMode(SkBlendMode::kClear);
-  skcanvas.drawRect(layer_skrect, paint);
-  skcanvas.clipRect(layer_skrect);
+  canvas.drawRect(layer_skrect, paint);
+  canvas.clipRect(layer_skrect);
 
-  scrollbar_->PaintPart(&skcanvas, part, layer_rect);
+  scrollbar_->PaintPart(&canvas, part, layer_rect);
   // Make sure that the pixels are no longer mutable to unavoid unnecessary
   // allocation and copying.
   skbitmap.setImmutable();

diff --git a/cc/layers/painted_scrollbar_layer_unittest.cc b/cc/layers/painted_scrollbar_layer_unittest.cc
index e249607..ed58fa01 100644
--- a/cc/layers/painted_scrollbar_layer_unittest.cc
+++ b/cc/layers/painted_scrollbar_layer_unittest.cc

@@ -22,7 +22,7 @@
  public:
   MockScrollbar() : FakeScrollbar(true, true, true) {}
   MOCK_METHOD3(PaintPart,
-               void(SkCanvas* canvas,
+               void(PaintCanvas* canvas,
                     ScrollbarPart part,
                     const gfx::Rect& content_rect));
 };

diff --git a/cc/layers/picture_image_layer_unittest.cc b/cc/layers/picture_image_layer_unittest.cc
index 2280494..0a9f7a1 100644
--- a/cc/layers/picture_image_layer_unittest.cc
+++ b/cc/layers/picture_image_layer_unittest.cc

@@ -37,8 +37,8 @@
   image_canvas->clear(SK_ColorRED);
   SkPaint blue_paint;
   blue_paint.setColor(SK_ColorBLUE);
-  image_canvas->drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint);
-  image_canvas->drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint);
+  image_canvas->drawRect(SkRect::MakeWH(100, 100), blue_paint);
+  image_canvas->drawRect(SkRect::MakeLTRB(100, 100, 200, 200), blue_paint);
 
   layer->SetImage(image_surface->makeImageSnapshot());
   layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height()));

diff --git a/cc/layers/render_surface_impl_unittest.cc b/cc/layers/render_surface_impl_unittest.cc
index df81ad1..2095c94 100644
--- a/cc/layers/render_surface_impl_unittest.cc
+++ b/cc/layers/render_surface_impl_unittest.cc

@@ -28,7 +28,8 @@
 
   impl.CalcDrawProps(viewport_size);
 
-  RenderSurfaceImpl* render_surface_impl = owning_layer_impl->render_surface();
+  RenderSurfaceImpl* render_surface_impl =
+      owning_layer_impl->GetRenderSurface();
   ASSERT_TRUE(render_surface_impl);
 
   {
@@ -103,7 +104,7 @@
                                ->root_layer_for_testing()
                                ->test_properties()
                                ->children[0];
-  RenderSurfaceImpl* render_surface_impl = surface_raw->render_surface();
+  RenderSurfaceImpl* render_surface_impl = surface_raw->GetRenderSurface();
   std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
   AppendQuadsData append_quads_data;
   render_surface_impl->AppendQuads(render_pass.get(), &append_quads_data);

diff --git a/cc/layers/render_surface_unittest.cc b/cc/layers/render_surface_unittest.cc
index ce28a33..85ed8c4 100644
--- a/cc/layers/render_surface_unittest.cc
+++ b/cc/layers/render_surface_unittest.cc

@@ -54,7 +54,7 @@
   host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
 
   RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->root_layer_for_testing()->render_surface();
+      host_impl.active_tree()->root_layer_for_testing()->GetRenderSurface();
   ASSERT_TRUE(render_surface);
 
   // Currently, the content_rect, clip_rect, and
@@ -117,9 +117,9 @@
   host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
 
   ASSERT_TRUE(
-      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface());
+      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface());
   RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface();
+      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface();
 
   gfx::Rect content_rect(0, 0, 50, 50);
   gfx::Rect clip_rect(5, 5, 40, 40);
@@ -188,9 +188,9 @@
   host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
 
   ASSERT_TRUE(
-      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface());
+      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface());
   RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface();
+      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface();
 
   gfx::Rect content_rect(0, 0, 50, 50);
   gfx::Transform origin;

diff --git a/cc/output/program_binding.cc b/cc/output/program_binding.cc
index a8f4b6a..8402e82 100644
--- a/cc/output/program_binding.cc
+++ b/cc/output/program_binding.cc

@@ -177,21 +177,24 @@
   return !!program_;
 }
 
-bool ProgramBindingBase::Link(GLES2Interface* context) {
+bool ProgramBindingBase::Link(GLES2Interface* context,
+                              const std::string& vertex_source,
+                              const std::string& fragment_source) {
   context->LinkProgram(program_);
   CleanupShaders(context);
   if (!program_)
     return false;
-#ifndef NDEBUG
   int linked = 0;
   context->GetProgramiv(program_, GL_LINK_STATUS, &linked);
   if (!linked) {
     char buffer[1024] = "";
     context->GetProgramInfoLog(program_, sizeof(buffer), nullptr, buffer);
-    DLOG(ERROR) << "Error compiling shader: " << buffer;
+    LOG(ERROR) << "Error linking shader: " << buffer << "\n"
+               << "Vertex shader:\n"
+               << vertex_source << "Fragment shader:\n"
+               << fragment_source;
     return false;
   }
-#endif
   return true;
 }
 
@@ -221,17 +224,16 @@
       shader_source_str,
       shader_length);
   context->CompileShader(shader);
-#if DCHECK_IS_ON()
   int compiled = 0;
   context->GetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
   if (!compiled) {
     char buffer[1024] = "";
     context->GetShaderInfoLog(shader, sizeof(buffer), nullptr, buffer);
-    DLOG(ERROR) << "Error compiling shader: " << buffer
-                << "\n shader program: " << shader_source;
+    LOG(ERROR) << "Error compiling shader: " << buffer << "\n"
+               << "Shader program:\n"
+               << shader_source;
     return 0u;
   }
-#endif
   return shader;
 }
 

diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
index 6f1bc91..ce45f269 100644
--- a/cc/output/program_binding.h
+++ b/cc/output/program_binding.h

@@ -32,7 +32,9 @@
   bool Init(gpu::gles2::GLES2Interface* context,
             const std::string& vertex_shader,
             const std::string& fragment_shader);
-  bool Link(gpu::gles2::GLES2Interface* context);
+  bool Link(gpu::gles2::GLES2Interface* context,
+            const std::string& vertex_source,
+            const std::string& fragment_source);
   void Cleanup(gpu::gles2::GLES2Interface* context);
 
   unsigned program() const { return program_; }
@@ -403,9 +405,10 @@
     if (IsContextLost(context_provider->ContextGL()))
       return;
 
-    if (!ProgramBindingBase::Init(context_provider->ContextGL(),
-                                  vertex_shader_.GetShaderString(),
-                                  fragment_shader_.GetShaderString())) {
+    std::string vertex_source = vertex_shader_.GetShaderString();
+    std::string fragment_source = fragment_shader_.GetShaderString();
+    if (!ProgramBindingBase::Init(context_provider->ContextGL(), vertex_source,
+                                  fragment_source)) {
       DCHECK(IsContextLost(context_provider->ContextGL()));
       return;
     }
@@ -417,7 +420,7 @@
                           program_, &base_uniform_index);
 
     // Link after binding uniforms
-    if (!Link(context_provider->ContextGL())) {
+    if (!Link(context_provider->ContextGL(), vertex_source, fragment_source)) {
       DCHECK(IsContextLost(context_provider->ContextGL()));
       return;
     }

diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc
index ca64a255..b2336bc 100644
--- a/cc/output/renderer_pixeltest.cc
+++ b/cc/output/renderer_pixeltest.cc

@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "cc/base/math_util.h"
 #include "cc/output/gl_renderer.h"
+#include "cc/paint/paint_canvas.h"
 #include "cc/paint/paint_flags.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
@@ -2640,6 +2641,12 @@
   return true;
 }
 
+void draw_point_color(SkCanvas* canvas, SkScalar x, SkScalar y, SkColor color) {
+  SkPaint paint;
+  paint.setColor(color);
+  canvas->drawPoint(x, y, paint);
+}
+
 // If we disable image filtering, then a 2x2 bitmap should appear as four
 // huge sharp squares.
 TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadDisableImageFiltering) {
@@ -2660,10 +2667,10 @@
   sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2);
   ASSERT_NE(surface, nullptr);
   SkCanvas* canvas = surface->getCanvas();
-  canvas->drawPoint(0, 0, SK_ColorGREEN);
-  canvas->drawPoint(0, 1, SK_ColorBLUE);
-  canvas->drawPoint(1, 0, SK_ColorBLUE);
-  canvas->drawPoint(1, 1, SK_ColorGREEN);
+  draw_point_color(canvas, 0, 0, SK_ColorGREEN);
+  draw_point_color(canvas, 0, 1, SK_ColorBLUE);
+  draw_point_color(canvas, 1, 0, SK_ColorBLUE);
+  draw_point_color(canvas, 1, 1, SK_ColorGREEN);
 
   std::unique_ptr<FakeRecordingSource> recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
@@ -2709,10 +2716,10 @@
   sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(2, 2);
   ASSERT_NE(surface, nullptr);
   SkCanvas* canvas = surface->getCanvas();
-  canvas->drawPoint(0, 0, SK_ColorGREEN);
-  canvas->drawPoint(0, 1, SK_ColorBLUE);
-  canvas->drawPoint(1, 0, SK_ColorBLUE);
-  canvas->drawPoint(1, 1, SK_ColorGREEN);
+  draw_point_color(canvas, 0, 0, SK_ColorGREEN);
+  draw_point_color(canvas, 0, 1, SK_ColorBLUE);
+  draw_point_color(canvas, 1, 0, SK_ColorBLUE);
+  draw_point_color(canvas, 1, 1, SK_ColorGREEN);
 
   std::unique_ptr<FakeRecordingSource> recording =
       FakeRecordingSource::CreateFilledRecordingSource(viewport.size());
@@ -2753,10 +2760,10 @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
-    canvas.drawPoint(0, 0, SK_ColorGREEN);
-    canvas.drawPoint(0, 1, SK_ColorBLUE);
-    canvas.drawPoint(1, 0, SK_ColorBLUE);
-    canvas.drawPoint(1, 1, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 0, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 1, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 0, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
@@ -2804,10 +2811,10 @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
-    canvas.drawPoint(0, 0, SK_ColorGREEN);
-    canvas.drawPoint(0, 1, SK_ColorBLUE);
-    canvas.drawPoint(1, 0, SK_ColorBLUE);
-    canvas.drawPoint(1, 1, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 0, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 1, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 0, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
@@ -2856,10 +2863,10 @@
   {
     SkAutoLockPixels lock(bitmap);
     SkCanvas canvas(bitmap);
-    canvas.drawPoint(0, 0, SK_ColorGREEN);
-    canvas.drawPoint(0, 1, SK_ColorBLUE);
-    canvas.drawPoint(1, 0, SK_ColorBLUE);
-    canvas.drawPoint(1, 1, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 0, SK_ColorGREEN);
+    draw_point_color(&canvas, 0, 1, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 0, SK_ColorBLUE);
+    draw_point_color(&canvas, 1, 1, SK_ColorGREEN);
   }
 
   gfx::Size tile_size(2, 2);
@@ -3213,17 +3220,17 @@
   bitmap.allocPixels(
       SkImageInfo::MakeN32Premul(mask_rect.width(), mask_rect.height()));
   SkCanvas canvas(bitmap);
-  PaintFlags flags;
-  flags.setStyle(PaintFlags::kStroke_Style);
-  flags.setStrokeWidth(SkIntToScalar(4));
-  flags.setColor(SK_ColorGREEN);
+  SkPaint paint;
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStrokeWidth(SkIntToScalar(4));
+  paint.setColor(SK_ColorGREEN);
   canvas.clear(SK_ColorWHITE);
   gfx::Rect inset_rect = rect;
   while (!inset_rect.IsEmpty()) {
     inset_rect.Inset(6, 6, 4, 4);
     canvas.drawRect(SkRect::MakeXYWH(inset_rect.x(), inset_rect.y(),
                                      inset_rect.width(), inset_rect.height()),
-                    flags);
+                    paint);
     inset_rect.Inset(6, 6, 4, 4);
   }
 

diff --git a/cc/playback/discardable_image_map_unittest.cc b/cc/playback/discardable_image_map_unittest.cc
index 672e8617..b0e71fc 100644
--- a/cc/playback/discardable_image_map_unittest.cc
+++ b/cc/playback/discardable_image_map_unittest.cc

@@ -82,10 +82,10 @@
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        PaintFlags flags;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
-            paint);
+            flags);
       }
     }
   }
@@ -169,10 +169,10 @@
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        PaintFlags flags;
         content_layer_client.add_draw_image(
             discardable_image[y][x],
-            gfx::Point(1024 + x * 512 + 6, y * 512 + 6), paint);
+            gfx::Point(1024 + x * 512 + 6, y * 512 + 6), flags);
       }
     }
   }
@@ -285,10 +285,10 @@
     for (int x = 0; x < 4; ++x) {
       if ((x + y) & 1) {
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
-        SkPaint paint;
+        PaintFlags flags;
         content_layer_client.add_draw_image(
             discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6),
-            paint);
+            flags);
       }
     }
   }
@@ -330,9 +330,9 @@
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(1 << 25, 1 << 25));
-  SkPaint paint;
+  PaintFlags flags;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
-                                      paint);
+                                      flags);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
@@ -387,9 +387,9 @@
   int dimension = std::numeric_limits<int>::max();
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(dimension, dimension));
-  SkPaint paint;
+  PaintFlags flags;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(42, 42),
-                                      paint);
+                                      flags);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
@@ -424,13 +424,13 @@
 
   sk_sp<SkImage> discardable_image =
       CreateDiscardableImage(gfx::Size(dimension, dimension));
-  SkPaint paint;
+  PaintFlags flags;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0),
-                                      paint);
+                                      flags);
   content_layer_client.add_draw_image(discardable_image, gfx::Point(10000, 0),
-                                      paint);
+                                      flags);
   content_layer_client.add_draw_image(discardable_image,
-                                      gfx::Point(-10000, 500), paint);
+                                      gfx::Point(-10000, 500), flags);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
@@ -478,13 +478,13 @@
   sk_sp<SkImage> long_discardable_image =
       CreateDiscardableImage(gfx::Size(10000, 100));
 
-  SkPaint paint;
+  PaintFlags flags;
   content_layer_client.add_draw_image(discardable_image, gfx::Point(-10, -11),
-                                      paint);
+                                      flags);
   content_layer_client.add_draw_image(discardable_image, gfx::Point(950, 951),
-                                      paint);
+                                      flags);
   content_layer_client.add_draw_image(long_discardable_image,
-                                      gfx::Point(-100, 500), paint);
+                                      gfx::Point(-100, 500), flags);
 
   scoped_refptr<DisplayItemList> display_list =
       content_layer_client.PaintContentsToDisplayList(
@@ -546,11 +546,11 @@
         discardable_image[y][x] = CreateDiscardableImage(gfx::Size(500, 500));
         SkMatrix scale = SkMatrix::MakeScale(std::max(x * 0.5f, kMinScale),
                                              std::max(y * 0.5f, kMinScale));
-        SkPaint paint;
-        paint.setShader(discardable_image[y][x]->makeShader(
+        PaintFlags flags;
+        flags.setShader(discardable_image[y][x]->makeShader(
             SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &scale));
         content_layer_client.add_draw_rect(
-            gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500), paint);
+            gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500), flags);
       }
     }
   }

diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index bbf8eef..426371e 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc

@@ -11,6 +11,11 @@
 #include "base/memory/ptr_util.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
+#include "cc/paint/paint_record.h"
+#include "cc/paint/paint_recorder.h"
+#include "cc/paint/paint_surface.h"
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/clip_path_display_item.h"
 #include "cc/playback/compositing_display_item.h"
@@ -23,14 +28,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
-#include "third_party/skia/include/core/SkSurface.h"
-
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "third_party/skia/include/effects/SkImageSource.h"
-#include "third_party/skia/include/utils/SkPictureUtils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
@@ -41,27 +41,28 @@
 
 const gfx::Rect kVisualRect(0, 0, 42, 42);
 
-sk_sp<const SkPicture> CreateRectPicture(const gfx::Rect& bounds) {
-  SkPictureRecorder recorder;
-  SkCanvas* canvas = recorder.beginRecording(bounds.width(), bounds.height());
+sk_sp<const PaintRecord> CreateRectPicture(const gfx::Rect& bounds) {
+  PaintRecorder recorder;
+  PaintCanvas* canvas =
+      recorder.beginRecording(bounds.width(), bounds.height());
   canvas->drawRect(
       SkRect::MakeXYWH(bounds.x(), bounds.y(), bounds.width(), bounds.height()),
-      SkPaint());
+      PaintFlags());
   return recorder.finishRecordingAsPicture();
 }
 
 void AppendFirstSerializationTestPicture(scoped_refptr<DisplayItemList> list,
                                          const gfx::Size& layer_size) {
   gfx::PointF offset(2.f, 3.f);
-  SkPictureRecorder recorder;
+  PaintRecorder recorder;
 
-  SkPaint red_paint;
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
 
-  SkCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
+  PaintCanvas* canvas = recorder.beginRecording(SkRect::MakeXYWH(
       offset.x(), offset.y(), layer_size.width(), layer_size.height()));
   canvas->translate(offset.x(), offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 4.f, 4.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(4, 4), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 }
@@ -70,21 +71,21 @@
 
 TEST(DisplayItemListTest, SingleDrawingItem) {
   gfx::Rect layer_rect(100, 100);
-  SkPictureRecorder recorder;
-  SkPaint blue_paint;
-  blue_paint.setColor(SK_ColorBLUE);
-  SkPaint red_paint;
+  PaintRecorder recorder;
+  PaintFlags blue_flags;
+  blue_flags.setColor(SK_ColorBLUE);
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF offset(8.f, 9.f);
   gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size()));
-  SkCanvas* canvas =
+  PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(recording_rect));
   canvas->translate(offset.x(), offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
+  canvas->drawRect(SkRect::MakeLTRB(0.f, 0.f, 60.f, 60.f), red_paint);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
   list->Finalize();
@@ -95,34 +96,36 @@
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
-  SkCanvas expected_canvas(expected_bitmap);
+  PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + offset.x(), 0.f + offset.y(),
-                                 60.f + offset.x(), 60.f + offset.y(),
-                                 red_paint);
-  expected_canvas.drawRectCoords(50.f + offset.x(), 50.f + offset.y(),
-                                 75.f + offset.x(), 75.f + offset.y(),
-                                 blue_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + offset.x(), 0.f + offset.y(), 60.f + offset.x(),
+                       60.f + offset.y()),
+      red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + offset.x(), 50.f + offset.y(), 75.f + offset.x(),
+                       75.f + offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, ClipItem) {
   gfx::Rect layer_rect(100, 100);
-  SkPictureRecorder recorder;
-  SkPaint blue_paint;
-  blue_paint.setColor(SK_ColorBLUE);
-  SkPaint red_paint;
+  PaintRecorder recorder;
+  PaintFlags blue_flags;
+  blue_flags.setColor(SK_ColorBLUE);
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  SkCanvas* canvas =
+  PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ -135,7 +138,7 @@
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ -149,35 +152,37 @@
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
-  SkCanvas expected_canvas(expected_bitmap);
+  PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + first_offset.x(), 0.f + first_offset.y(),
-                                 60.f + first_offset.x(),
-                                 60.f + first_offset.y(), red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + first_offset.x(), 0.f + first_offset.y(),
+                       60.f + first_offset.x(), 60.f + first_offset.y()),
+      red_paint);
   expected_canvas.clipRect(gfx::RectToSkRect(clip_rect));
-  expected_canvas.drawRectCoords(
-      50.f + second_offset.x(), 50.f + second_offset.y(),
-      75.f + second_offset.x(), 75.f + second_offset.y(), blue_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + second_offset.x(), 50.f + second_offset.y(),
+                       75.f + second_offset.x(), 75.f + second_offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
 
 TEST(DisplayItemListTest, TransformItem) {
   gfx::Rect layer_rect(100, 100);
-  SkPictureRecorder recorder;
-  SkPaint blue_paint;
-  blue_paint.setColor(SK_ColorBLUE);
-  SkPaint red_paint;
+  PaintRecorder recorder;
+  PaintFlags blue_flags;
+  blue_flags.setColor(SK_ColorBLUE);
+  PaintFlags red_paint;
   red_paint.setColor(SK_ColorRED);
   unsigned char pixels[4 * 100 * 100] = {0};
   auto list = make_scoped_refptr(new DisplayItemList);
 
   gfx::PointF first_offset(8.f, 9.f);
   gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size()));
-  SkCanvas* canvas =
+  PaintCanvas* canvas =
       recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect));
   canvas->translate(first_offset.x(), first_offset.y());
-  canvas->drawRectCoords(0.f, 0.f, 60.f, 60.f, red_paint);
+  canvas->drawRect(SkRect::MakeWH(60, 60), red_paint);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ -190,7 +195,7 @@
                                    gfx::SizeF(layer_rect.size()));
   canvas = recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect));
   canvas->translate(second_offset.x(), second_offset.y());
-  canvas->drawRectCoords(50.f, 50.f, 75.f, 75.f, blue_paint);
+  canvas->drawRect(SkRect::MakeLTRB(50.f, 50.f, 75.f, 75.f), blue_flags);
   list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
       kVisualRect, recorder.finishRecordingAsPicture());
 
@@ -204,15 +209,17 @@
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
-  SkCanvas expected_canvas(expected_bitmap);
+  PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.clipRect(gfx::RectToSkRect(layer_rect));
-  expected_canvas.drawRectCoords(0.f + first_offset.x(), 0.f + first_offset.y(),
-                                 60.f + first_offset.x(),
-                                 60.f + first_offset.y(), red_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(0.f + first_offset.x(), 0.f + first_offset.y(),
+                       60.f + first_offset.x(), 60.f + first_offset.y()),
+      red_paint);
   expected_canvas.setMatrix(transform.matrix());
-  expected_canvas.drawRectCoords(
-      50.f + second_offset.x(), 50.f + second_offset.y(),
-      75.f + second_offset.x(), 75.f + second_offset.y(), blue_paint);
+  expected_canvas.drawRect(
+      SkRect::MakeLTRB(50.f + second_offset.x(), 50.f + second_offset.y(),
+                       75.f + second_offset.x(), 75.f + second_offset.y()),
+      blue_flags);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
 }
@@ -248,16 +255,17 @@
 
   // Include a rect drawing so that filter is actually applied to something.
   {
-    SkPictureRecorder recorder;
+    PaintRecorder recorder;
 
-    SkPaint red_paint;
+    PaintFlags red_paint;
     red_paint.setColor(SK_ColorRED);
 
-    SkCanvas* canvas = recorder.beginRecording(
+    PaintCanvas* canvas = recorder.beginRecording(
         SkRect::MakeXYWH(0, 0, layer_rect.width(), layer_rect.height()));
-    canvas->drawRectCoords(filter_bounds.x(), filter_bounds.y(),
-                           filter_bounds.right(), filter_bounds.bottom(),
-                           red_paint);
+    canvas->drawRect(
+        SkRect::MakeLTRB(filter_bounds.x(), filter_bounds.y(),
+                         filter_bounds.right(), filter_bounds.bottom()),
+        red_paint);
     list->CreateAndAppendDrawingItem<DrawingDisplayItem>(
         ToNearestRect(filter_bounds), recorder.finishRecordingAsPicture());
   }
@@ -269,12 +277,12 @@
 
   SkBitmap expected_bitmap;
   unsigned char expected_pixels[4 * 100 * 100] = {0};
-  SkPaint paint;
+  PaintFlags paint;
   paint.setColor(SkColorSetRGB(64, 64, 64));
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   expected_bitmap.installPixels(info, expected_pixels, info.minRowBytes());
-  SkCanvas expected_canvas(expected_bitmap);
+  PaintCanvas expected_canvas(expected_bitmap);
   expected_canvas.drawRect(RectFToSkRect(filter_bounds), paint);
 
   EXPECT_EQ(0, memcmp(pixels, expected_pixels, 4 * 100 * 100));
@@ -284,24 +292,24 @@
   const int kNumCommandsInTestSkPicture = 1000;
   size_t memory_usage;
 
-  // Make an SkPicture whose size is known.
+  // Make an PaintRecord whose size is known.
   gfx::Rect layer_rect(100, 100);
-  SkPictureRecorder recorder;
-  SkPaint blue_paint;
-  blue_paint.setColor(SK_ColorBLUE);
-  SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect));
+  PaintRecorder recorder;
+  PaintFlags blue_flags;
+  blue_flags.setColor(SK_ColorBLUE);
+  PaintCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(layer_rect));
   for (int i = 0; i < kNumCommandsInTestSkPicture; i++)
-    canvas->drawPaint(blue_paint);
-  sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
-  size_t picture_size = SkPictureUtils::ApproximateBytesUsed(picture.get());
-  ASSERT_GE(picture_size, kNumCommandsInTestSkPicture * sizeof(blue_paint));
+    canvas->drawRect(SkRect(), blue_flags);
+  sk_sp<PaintRecord> record = recorder.finishRecordingAsPicture();
+  size_t record_size = record->approximateBytesUsed();
+  ASSERT_GE(record_size, kNumCommandsInTestSkPicture * sizeof(SkRect));
 
   auto list = make_scoped_refptr(new DisplayItemList);
-  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, picture);
+  list->CreateAndAppendDrawingItem<DrawingDisplayItem>(kVisualRect, record);
   list->Finalize();
   memory_usage = list->ApproximateMemoryUsage();
-  EXPECT_GE(memory_usage, picture_size);
-  EXPECT_LE(memory_usage, 2 * picture_size);
+  EXPECT_GE(memory_usage, record_size);
+  EXPECT_LE(memory_usage, 2 * record_size);
 }
 
 TEST(DisplayItemListTest, AsValueWithNoItems) {

diff --git a/cc/playback/drawing_display_item.cc b/cc/playback/drawing_display_item.cc
index f040dfe..90f1030d 100644
--- a/cc/playback/drawing_display_item.cc
+++ b/cc/playback/drawing_display_item.cc

@@ -46,10 +46,12 @@
 
   // SkPicture always does a wrapping save/restore on the canvas, so it is not
   // necessary here.
-  if (callback)
+  if (callback) {
     picture_->playback(canvas, callback);
-  else
-    canvas->drawPicture(picture_.get());
+  } else {
+    // TODO(enne): switch this to playback once PaintRecord is real.
+    canvas->drawPicture(ToSkPicture(picture_.get()));
+  }
 }
 
 void DrawingDisplayItem::AsValueInto(
@@ -73,7 +75,8 @@
   array->EndArray();
 
   std::string b64_picture;
-  PictureDebugUtil::SerializeAsBase64(picture_.get(), &b64_picture);
+  PictureDebugUtil::SerializeAsBase64(ToSkPicture(picture_.get()),
+                                      &b64_picture);
   array->SetString("skp64", b64_picture);
   array->EndDictionary();
 }
@@ -83,7 +86,7 @@
 }
 
 size_t DrawingDisplayItem::ExternalMemoryUsage() const {
-  return SkPictureUtils::ApproximateBytesUsed(ToSkPicture(picture_.get()));
+  return picture_->approximateBytesUsed();
 }
 
 DISABLE_CFI_PERF

diff --git a/cc/playback/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc
index 9d7f6b6..2cbe3c8 100644
--- a/cc/playback/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc

@@ -183,8 +183,8 @@
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
 
-  SkPaint simple_paint;
-  simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
+  PaintFlags simple_flags;
+  simple_flags.setColor(SkColorSetARGB(255, 12, 23, 34));
 
   SkBitmap non_discardable_bitmap;
   non_discardable_bitmap.allocN32Pixels(128, 128);
@@ -193,13 +193,13 @@
       SkImage::MakeFromBitmap(non_discardable_bitmap);
 
   recording_source->add_draw_rect_with_flags(gfx::Rect(0, 0, 256, 256),
-                                             simple_paint);
+                                             simple_flags);
   recording_source->add_draw_rect_with_flags(gfx::Rect(128, 128, 512, 512),
-                                             simple_paint);
+                                             simple_flags);
   recording_source->add_draw_rect_with_flags(gfx::Rect(512, 0, 256, 256),
-                                             simple_paint);
+                                             simple_flags);
   recording_source->add_draw_rect_with_flags(gfx::Rect(0, 512, 256, 256),
-                                             simple_paint);
+                                             simple_flags);
   recording_source->add_draw_image(non_discardable_image, gfx::Point(128, 0));
   recording_source->add_draw_image(non_discardable_image, gfx::Point(0, 128));
   recording_source->add_draw_image(non_discardable_image, gfx::Point(150, 150));

diff --git a/cc/raster/gpu_raster_buffer_provider.cc b/cc/raster/gpu_raster_buffer_provider.cc
index 38065332e..2e253dc 100644
--- a/cc/raster/gpu_raster_buffer_provider.cc
+++ b/cc/raster/gpu_raster_buffer_provider.cc

@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/histograms.h"
+#include "cc/paint/paint_canvas.h"
 #include "cc/playback/image_hijack_canvas.h"
 #include "cc/playback/raster_source.h"
 #include "cc/raster/scoped_gpu_raster.h"

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 83aaa006..dd900f8 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc

@@ -547,7 +547,8 @@
       // TODO(ccameron): This will always return false on pixel tests, which
       // makes it un-test-able until we upgrade Mesa.
       // https://crbug.com/687720
-      return caps.texture_half_float_linear && caps.color_buffer_float;
+      return caps.texture_half_float_linear &&
+             caps.color_buffer_half_float_rgba;
   }
 
   NOTREACHED();

diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
index 6e81726..66de03d3 100644
--- a/cc/scheduler/scheduler.cc
+++ b/cc/scheduler/scheduler.cc

@@ -266,10 +266,10 @@
   if (!state_machine_.BeginFrameNeeded()) {
     TRACE_EVENT_INSTANT0("cc", "Scheduler::BeginFrameDropped",
                          TRACE_EVENT_SCOPE_THREAD);
-    // TODO(eseckler): Determine and set correct |ack.latest_confirmed_frame|.
-    BeginFrameAck ack(args.source_id, args.sequence_number,
-                      args.sequence_number, 0, false);
-    begin_frame_source_->DidFinishFrame(this, ack);
+    // Since we don't use the BeginFrame, we may later receive the same
+    // BeginFrame again. Thus, we can't confirm it at this point, even though we
+    // don't have any updates right now.
+    SendBeginFrameAck(args, kBeginFrameSkipped);
     return false;
   }
 
@@ -331,10 +331,7 @@
   // Discard missed begin frames if they are too late.
   if (adjusted_args.type == BeginFrameArgs::MISSED &&
       now > adjusted_args.deadline) {
-    // TODO(eseckler): Determine and set correct |ack.latest_confirmed_frame|.
-    BeginFrameAck ack(adjusted_args.source_id, adjusted_args.sequence_number,
-                      adjusted_args.sequence_number, 0, false);
-    begin_frame_source_->DidFinishFrame(this, ack);
+    SendBeginFrameAck(adjusted_args, kBeginFrameSkipped);
     return;
   }
 
@@ -344,10 +341,12 @@
     OnBeginImplFrameDeadline();
     // We may not need begin frames any longer.
     if (!observing_begin_frame_source_) {
-      // TODO(eseckler): Determine and set correct |ack.latest_confirmed_frame|.
-      BeginFrameAck ack(adjusted_args.source_id, adjusted_args.sequence_number,
-                        adjusted_args.sequence_number, 0, false);
-      begin_frame_source_->DidFinishFrame(this, ack);
+      // We need to confirm the ignored BeginFrame, since we don't have updates.
+      // To persist the confirmation for future BeginFrameAcks, we let the state
+      // machine know about the BeginFrame.
+      state_machine_.OnBeginFrameDroppedNotObserving(args.source_id,
+                                                     args.sequence_number);
+      SendBeginFrameAck(adjusted_args, kBeginFrameSkipped);
       return;
     }
   }
@@ -406,12 +405,7 @@
                                       can_activate_before_deadline)) {
     TRACE_EVENT_INSTANT0("cc", "SkipBeginImplFrameToReduceLatency",
                          TRACE_EVENT_SCOPE_THREAD);
-    if (begin_frame_source_) {
-      // TODO(eseckler): Determine and set correct |ack.latest_confirmed_frame|.
-      BeginFrameAck ack(adjusted_args.source_id, adjusted_args.sequence_number,
-                        adjusted_args.sequence_number, 0, false);
-      begin_frame_source_->DidFinishFrame(this, ack);
-    }
+    SendBeginFrameAck(begin_main_frame_args_, kBeginFrameSkipped);
     return;
   }
 
@@ -439,17 +433,33 @@
   ProcessScheduledActions();
 
   client_->DidFinishImplFrame();
-  if (begin_frame_source_) {
-    // TODO(eseckler): Determine and set correct |ack.latest_confirmed_frame|.
-    BeginFrameAck ack(begin_main_frame_args_.source_id,
-                      begin_main_frame_args_.sequence_number,
-                      begin_main_frame_args_.sequence_number, 0,
-                      state_machine_.did_submit_in_last_frame());
-    begin_frame_source_->DidFinishFrame(this, ack);
-  }
+  SendBeginFrameAck(begin_main_frame_args_, kBeginFrameFinished);
   begin_impl_frame_tracker_.Finish();
 }
 
+void Scheduler::SendBeginFrameAck(const BeginFrameArgs& args,
+                                  BeginFrameResult result) {
+  if (!begin_frame_source_)
+    return;
+
+  uint64_t latest_confirmed_sequence_number =
+      BeginFrameArgs::kInvalidFrameNumber;
+  if (args.source_id == state_machine_.begin_frame_source_id()) {
+    latest_confirmed_sequence_number =
+        state_machine_
+            .last_begin_frame_sequence_number_compositor_frame_was_fresh();
+  }
+
+  bool did_submit = false;
+  if (result == kBeginFrameFinished) {
+    did_submit = state_machine_.did_submit_in_last_frame();
+  }
+
+  BeginFrameAck ack(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, did_submit);
+  begin_frame_source_->DidFinishFrame(this, ack);
+}
+
 // BeginImplFrame starts a compositor frame that will wait up until a deadline
 // for a BeginMainFrame+activation to complete before it times out and draws
 // any asynchronous animation and scroll/pinch updates.
@@ -460,7 +470,7 @@
   DCHECK(state_machine_.HasInitializedCompositorFrameSink());
 
   begin_impl_frame_tracker_.Start(args);
-  state_machine_.OnBeginImplFrame();
+  state_machine_.OnBeginImplFrame(args.source_id, args.sequence_number);
   devtools_instrumentation::DidBeginFrame(layer_tree_host_id_);
   compositor_timing_history_->WillBeginImplFrame(
       state_machine_.NewActiveTreeLikely());

diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
index 5fd4c92..81a0a34 100644
--- a/cc/scheduler/scheduler.h
+++ b/cc/scheduler/scheduler.h

@@ -206,6 +206,8 @@
   void BeginImplFrameSynchronous(const BeginFrameArgs& args);
   void BeginImplFrame(const BeginFrameArgs& args);
   void FinishImplFrame();
+  enum BeginFrameResult { kBeginFrameSkipped, kBeginFrameFinished };
+  void SendBeginFrameAck(const BeginFrameArgs& args, BeginFrameResult result);
   void OnBeginImplFrameDeadline();
   void PollToAdvanceCommitState();
 

diff --git a/cc/scheduler/scheduler_state_machine.cc b/cc/scheduler/scheduler_state_machine.cc
index 4ca6d431..ae1991b 100644
--- a/cc/scheduler/scheduler_state_machine.cc
+++ b/cc/scheduler/scheduler_state_machine.cc

@@ -10,6 +10,7 @@
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
+#include "cc/output/begin_frame_args.h"
 
 namespace cc {
 
@@ -24,6 +25,16 @@
       begin_impl_frame_state_(BEGIN_IMPL_FRAME_STATE_IDLE),
       begin_main_frame_state_(BEGIN_MAIN_FRAME_STATE_IDLE),
       forced_redraw_state_(FORCED_REDRAW_STATE_IDLE),
+      begin_frame_source_id_(0),
+      begin_frame_sequence_number_(BeginFrameArgs::kInvalidFrameNumber),
+      last_begin_frame_sequence_number_begin_main_frame_sent_(
+          BeginFrameArgs::kInvalidFrameNumber),
+      last_begin_frame_sequence_number_pending_tree_was_fresh_(
+          BeginFrameArgs::kInvalidFrameNumber),
+      last_begin_frame_sequence_number_active_tree_was_fresh_(
+          BeginFrameArgs::kInvalidFrameNumber),
+      last_begin_frame_sequence_number_compositor_frame_was_fresh_(
+          BeginFrameArgs::kInvalidFrameNumber),
       commit_count_(0),
       current_frame_number_(0),
       last_frame_number_submit_performed_(-1),
@@ -220,6 +231,18 @@
                     last_frame_number_draw_performed_);
   state->SetInteger("last_frame_number_begin_main_frame_sent",
                     last_frame_number_begin_main_frame_sent_);
+  state->SetInteger("begin_frame_source_id", begin_frame_source_id_);
+  state->SetInteger("begin_frame_sequence_number",
+                    begin_frame_sequence_number_);
+  state->SetInteger("last_begin_frame_sequence_number_begin_main_frame_sent",
+                    last_begin_frame_sequence_number_begin_main_frame_sent_);
+  state->SetInteger("last_begin_frame_sequence_number_pending_tree_was_fresh",
+                    last_begin_frame_sequence_number_pending_tree_was_fresh_);
+  state->SetInteger("last_begin_frame_sequence_number_active_tree_was_fresh",
+                    last_begin_frame_sequence_number_active_tree_was_fresh_);
+  state->SetInteger(
+      "last_begin_frame_sequence_number_compositor_frame_was_fresh",
+      last_begin_frame_sequence_number_compositor_frame_was_fresh_);
   state->SetBoolean("funnel: draw_funnel", draw_funnel_);
   state->SetBoolean("funnel: send_begin_main_frame_funnel",
                     send_begin_main_frame_funnel_);
@@ -630,6 +653,8 @@
   needs_impl_side_invalidation_ = false;
   has_pending_tree_ = true;
   impl_side_invalidation_funnel_ = true;
+  // TODO(eseckler): Track impl-side invalidations for pending/active tree and
+  // CompositorFrame freshness computation.
 }
 
 bool SchedulerStateMachine::CouldCreatePendingTree() const {
@@ -662,6 +687,8 @@
   needs_begin_main_frame_ = false;
   send_begin_main_frame_funnel_ = true;
   last_frame_number_begin_main_frame_sent_ = current_frame_number_;
+  last_begin_frame_sequence_number_begin_main_frame_sent_ =
+      begin_frame_sequence_number_;
 }
 
 void SchedulerStateMachine::WillCommit(bool commit_has_no_updates) {
@@ -672,7 +699,24 @@
   last_commit_had_no_updates_ = commit_has_no_updates;
   begin_main_frame_state_ = BEGIN_MAIN_FRAME_STATE_IDLE;
 
-  if (!commit_has_no_updates) {
+  if (commit_has_no_updates) {
+    // Pending tree might still exist from prior commit.
+    if (has_pending_tree_) {
+      DCHECK(settings_.main_frame_before_activation_enabled);
+      last_begin_frame_sequence_number_pending_tree_was_fresh_ =
+          last_begin_frame_sequence_number_begin_main_frame_sent_;
+    } else {
+      if (last_begin_frame_sequence_number_compositor_frame_was_fresh_ ==
+          last_begin_frame_sequence_number_active_tree_was_fresh_) {
+        // Assuming that SetNeedsRedraw() is only called at the beginning of
+        // a BeginFrame, we can update the compositor frame freshness.
+        last_begin_frame_sequence_number_compositor_frame_was_fresh_ =
+            last_begin_frame_sequence_number_begin_main_frame_sent_;
+      }
+      last_begin_frame_sequence_number_active_tree_was_fresh_ =
+          last_begin_frame_sequence_number_begin_main_frame_sent_;
+    }
+  } else {
     // If there was a commit, the impl-side invalidations will be merged with
     // it. We always fill the impl-side invalidation funnel here, even if no
     // request was currently pending, to defer creating another pending tree and
@@ -682,9 +726,11 @@
       WillPerformImplSideInvalidationInternal();
     impl_side_invalidation_funnel_ = true;
 
-    // Pending tree only exists if commit had updates.
+    // We have a new pending tree.
     has_pending_tree_ = true;
     pending_tree_is_ready_for_activation_ = false;
+    last_begin_frame_sequence_number_pending_tree_was_fresh_ =
+        last_begin_frame_sequence_number_begin_main_frame_sent_;
     wait_for_ready_to_draw_ = settings_.commit_to_active_tree;
   }
 
@@ -716,6 +762,8 @@
   pending_tree_is_ready_for_activation_ = false;
   active_tree_needs_first_draw_ = true;
   needs_redraw_ = true;
+  last_begin_frame_sequence_number_active_tree_was_fresh_ =
+      last_begin_frame_sequence_number_pending_tree_was_fresh_;
 
   previous_pending_tree_was_impl_side_ = current_pending_tree_is_impl_side_;
   current_pending_tree_is_impl_side_ = false;
@@ -750,9 +798,17 @@
       NOTREACHED() << "Invalid return DrawResult:" << draw_result;
       break;
     case DRAW_ABORTED_DRAINING_PIPELINE:
+      consecutive_checkerboard_animations_ = 0;
+      forced_redraw_state_ = FORCED_REDRAW_STATE_IDLE;
+      break;
     case DRAW_SUCCESS:
       consecutive_checkerboard_animations_ = 0;
       forced_redraw_state_ = FORCED_REDRAW_STATE_IDLE;
+      // The draw either didn't have damage or had damage and submitted a
+      // CompositorFrame. In either case, the compositor frame freshness should
+      // be updated to match the active tree.
+      last_begin_frame_sequence_number_compositor_frame_was_fresh_ =
+          last_begin_frame_sequence_number_active_tree_was_fresh_;
       break;
     case DRAW_ABORTED_CHECKERBOARD_ANIMATIONS:
       DCHECK(!did_submit_in_last_frame_);
@@ -920,7 +976,65 @@
   return false;
 }
 
-void SchedulerStateMachine::OnBeginImplFrame() {
+void SchedulerStateMachine::OnBeginFrameDroppedNotObserving(
+    uint32_t source_id,
+    uint64_t sequence_number) {
+  DCHECK(!BeginFrameNeeded());
+  DCHECK_EQ(BEGIN_IMPL_FRAME_STATE_IDLE, begin_impl_frame_state_);
+
+  // Confirms the dropped BeginFrame, since we don't have updates.
+  UpdateBeginFrameSequenceNumbersForBeginFrame(source_id, sequence_number);
+  UpdateBeginFrameSequenceNumbersForBeginFrameDeadline();
+}
+
+void SchedulerStateMachine::UpdateBeginFrameSequenceNumbersForBeginFrame(
+    uint32_t source_id,
+    uint64_t sequence_number) {
+  if (source_id != begin_frame_source_id_) {
+    begin_frame_source_id_ = source_id;
+    begin_frame_sequence_number_ = sequence_number;
+
+    // Reset freshness sequence numbers.
+    last_begin_frame_sequence_number_begin_main_frame_sent_ =
+        BeginFrameArgs::kInvalidFrameNumber;
+    last_begin_frame_sequence_number_active_tree_was_fresh_ =
+        BeginFrameArgs::kInvalidFrameNumber;
+    last_begin_frame_sequence_number_pending_tree_was_fresh_ =
+        BeginFrameArgs::kInvalidFrameNumber;
+    last_begin_frame_sequence_number_compositor_frame_was_fresh_ =
+        BeginFrameArgs::kInvalidFrameNumber;
+  } else {
+    DCHECK_GT(sequence_number, begin_frame_sequence_number_);
+    begin_frame_sequence_number_ = sequence_number;
+  }
+}
+
+void SchedulerStateMachine::
+    UpdateBeginFrameSequenceNumbersForBeginFrameDeadline() {
+  // Update frame numbers for freshness in case no updates were necessary.
+  if (begin_main_frame_state_ != BEGIN_MAIN_FRAME_STATE_IDLE ||
+      needs_begin_main_frame_) {
+    return;
+  }
+
+  if (has_pending_tree_) {
+    last_begin_frame_sequence_number_pending_tree_was_fresh_ =
+        begin_frame_sequence_number_;
+    return;
+  }
+
+  last_begin_frame_sequence_number_active_tree_was_fresh_ =
+      begin_frame_sequence_number_;
+
+  if (!needs_redraw_)
+    last_begin_frame_sequence_number_compositor_frame_was_fresh_ =
+        begin_frame_sequence_number_;
+}
+
+void SchedulerStateMachine::OnBeginImplFrame(uint32_t source_id,
+                                             uint64_t sequence_number) {
+  UpdateBeginFrameSequenceNumbersForBeginFrame(source_id, sequence_number);
+
   begin_impl_frame_state_ = BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME;
   current_frame_number_++;
 
@@ -950,6 +1064,9 @@
     if (prepare_tiles_funnel_ > 0)
       prepare_tiles_funnel_--;
   }
+
+  if (!settings_.using_synchronous_renderer_compositor)
+    UpdateBeginFrameSequenceNumbersForBeginFrameDeadline();
 }
 
 void SchedulerStateMachine::OnBeginImplFrameIdle() {
@@ -966,6 +1083,12 @@
   // funnels so that we don't perform any actions that we shouldn't.
   if (!BeginFrameNeeded())
     send_begin_main_frame_funnel_ = true;
+
+  // Synchronous compositor finishes BeginFrames before triggering their
+  // deadline. Therefore, we update sequence numbers when becoming idle, before
+  // the Scheduler sends its BeginFrameAck.
+  if (settings_.using_synchronous_renderer_compositor)
+    UpdateBeginFrameSequenceNumbersForBeginFrameDeadline();
 }
 
 SchedulerStateMachine::BeginImplFrameDeadlineMode

diff --git a/cc/scheduler/scheduler_state_machine.h b/cc/scheduler/scheduler_state_machine.h
index 975c32e..2ad99993 100644
--- a/cc/scheduler/scheduler_state_machine.h
+++ b/cc/scheduler/scheduler_state_machine.h

@@ -5,12 +5,13 @@
 #ifndef CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 #define CC_SCHEDULER_SCHEDULER_STATE_MACHINE_H_
 
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
-#include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/commit_earlyout_reason.h"
 #include "cc/scheduler/draw_result.h"
 #include "cc/scheduler/scheduler_settings.h"
@@ -146,10 +147,16 @@
   // to make progress.
   bool BeginFrameNeeded() const;
 
+  // Indicates that the Scheduler has received a BeginFrame that did not require
+  // a BeginImplFrame, because the Scheduler stopped observing BeginFrames.
+  // Updates the sequence and freshness numbers for the dropped BeginFrame.
+  void OnBeginFrameDroppedNotObserving(uint32_t source_id,
+                                       uint64_t sequence_number);
+
   // Indicates that the system has entered and left a BeginImplFrame callback.
   // The scheduler will not draw more than once in a given BeginImplFrame
   // callback nor send more than one BeginMainFrame message.
-  void OnBeginImplFrame();
+  void OnBeginImplFrame(uint32_t source_id, uint64_t sequence_number);
   // Indicates that the scheduler has entered the draw phase. The scheduler
   // will not draw more than once in a single draw phase.
   // TODO(sunnyps): Rename OnBeginImplFrameDeadline to OnDraw or similar.
@@ -282,6 +289,11 @@
     return previous_pending_tree_was_impl_side_;
   }
 
+  uint32_t begin_frame_source_id() const { return begin_frame_source_id_; }
+  uint64_t last_begin_frame_sequence_number_compositor_frame_was_fresh() const {
+    return last_begin_frame_sequence_number_compositor_frame_was_fresh_;
+  }
+
  protected:
   bool BeginFrameRequiredForAction() const;
   bool BeginFrameNeededForVideo() const;
@@ -308,6 +320,10 @@
   void WillPerformImplSideInvalidationInternal();
   void DidDrawInternal(DrawResult draw_result);
 
+  void UpdateBeginFrameSequenceNumbersForBeginFrame(uint32_t source_id,
+                                                    uint64_t sequence_number);
+  void UpdateBeginFrameSequenceNumbersForBeginFrameDeadline();
+
   const SchedulerSettings settings_;
 
   CompositorFrameSinkState compositor_frame_sink_state_;
@@ -315,6 +331,17 @@
   BeginMainFrameState begin_main_frame_state_;
   ForcedRedrawOnTimeoutState forced_redraw_state_;
 
+  // These fields are used to track the freshness of pending updates in the
+  // commit/activate/draw pipeline. The Scheduler uses the CompositorFrame's
+  // freshness to fill the |latest_confirmed_sequence_number| field in
+  // BeginFrameAcks.
+  uint32_t begin_frame_source_id_;
+  uint64_t begin_frame_sequence_number_;
+  uint64_t last_begin_frame_sequence_number_begin_main_frame_sent_;
+  uint64_t last_begin_frame_sequence_number_pending_tree_was_fresh_;
+  uint64_t last_begin_frame_sequence_number_active_tree_was_fresh_;
+  uint64_t last_begin_frame_sequence_number_compositor_frame_was_fresh_;
+
   // These are used for tracing only.
   int commit_count_;
   int current_frame_number_;

diff --git a/cc/scheduler/scheduler_state_machine_unittest.cc b/cc/scheduler/scheduler_state_machine_unittest.cc
index db63297..71b1422 100644
--- a/cc/scheduler/scheduler_state_machine_unittest.cc
+++ b/cc/scheduler/scheduler_state_machine_unittest.cc

@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include "base/trace_event/trace_event.h"
+#include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/scheduler.h"
 #include "cc/test/begin_frame_args_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -22,6 +23,19 @@
   EXPECT_STREQ(SchedulerStateMachine::enum_tostring(expected), \
                SchedulerStateMachine::enum_tostring(actual))
 
+#define EXPECT_SEQUENCE_NUMBERS(current, main_frame, pending_tree,            \
+                                active_tree, compositor_frame)                \
+  EXPECT_EQ(current, state.begin_frame_sequence_number());                    \
+  EXPECT_EQ(main_frame,                                                       \
+            state.last_begin_frame_sequence_number_begin_main_frame_sent());  \
+  EXPECT_EQ(pending_tree,                                                     \
+            state.last_begin_frame_sequence_number_pending_tree_was_fresh()); \
+  EXPECT_EQ(active_tree,                                                      \
+            state.last_begin_frame_sequence_number_active_tree_was_fresh());  \
+  EXPECT_EQ(                                                                  \
+      compositor_frame,                                                       \
+      state.last_begin_frame_sequence_number_compositor_frame_was_fresh())
+
 #define EXPECT_IMPL_FRAME_STATE(expected)               \
   EXPECT_ENUM_EQ(BeginImplFrameStateToString, expected, \
                  state.begin_impl_frame_state())        \
@@ -86,6 +100,10 @@
     compositor_frame_sink_state_ = COMPOSITOR_FRAME_SINK_ACTIVE;
   }
 
+  void IssueNextBeginImplFrame() {
+    OnBeginImplFrame(0, next_begin_frame_number_++);
+  }
+
   void SetBeginMainFrameState(BeginMainFrameState cs) {
     begin_main_frame_state_ = cs;
   }
@@ -154,12 +172,26 @@
     return needs_impl_side_invalidation_;
   }
 
+  uint64_t begin_frame_sequence_number() const {
+    return begin_frame_sequence_number_;
+  }
+  uint64_t last_begin_frame_sequence_number_begin_main_frame_sent() const {
+    return last_begin_frame_sequence_number_begin_main_frame_sent_;
+  }
+  uint64_t last_begin_frame_sequence_number_pending_tree_was_fresh() const {
+    return last_begin_frame_sequence_number_pending_tree_was_fresh_;
+  }
+  uint64_t last_begin_frame_sequence_number_active_tree_was_fresh() const {
+    return last_begin_frame_sequence_number_active_tree_was_fresh_;
+  }
+
   using SchedulerStateMachine::ShouldTriggerBeginImplFrameDeadlineImmediately;
   using SchedulerStateMachine::ProactiveBeginFrameWanted;
   using SchedulerStateMachine::WillCommit;
 
  protected:
   DrawResult draw_result_for_test_;
+  uint64_t next_begin_frame_number_ = BeginFrameArgs::kStartingFrameNumber;
 };
 
 void PerformAction(StateMachine* sm, SchedulerStateMachine::Action action) {
@@ -279,7 +311,7 @@
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
     EXPECT_FALSE(state.NeedsCommit());
 
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
     state.OnBeginImplFrameDeadline();
@@ -298,7 +330,7 @@
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
     EXPECT_TRUE(state.NeedsCommit());
 
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
     state.OnBeginImplFrameDeadline();
@@ -326,7 +358,7 @@
     EXPECT_TRUE(state.NeedsCommit());
     EXPECT_TRUE(state.BeginFrameNeeded());
 
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(
         SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
     EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -353,7 +385,7 @@
     EXPECT_IMPL_FRAME_STATE(SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_IDLE);
     EXPECT_TRUE(state.BeginFrameNeeded());
 
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(
         SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
     EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -375,7 +407,7 @@
   EXPECT_TRUE(state.BeginFrameNeeded());
 
   // Commit to the pending tree.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -391,7 +423,7 @@
 
   // Verify that the next commit starts while there is still a pending tree.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -428,7 +460,7 @@
   EXPECT_TRUE(state.BeginFrameNeeded());
 
   // Start a frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   EXPECT_FALSE(state.CommitPending());
 
@@ -446,7 +478,7 @@
   // finishes and the requested commit wasn't actually necessary.
   EXPECT_TRUE(state.CommitPending());
   EXPECT_TRUE(state.RedrawPending());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   state.SetDrawResultForTest(DRAW_ABORTED_CHECKERBOARD_ANIMATIONS);
@@ -465,7 +497,7 @@
   EXPECT_TRUE(state.BeginFrameNeeded());
 
   // Start a frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   EXPECT_FALSE(state.CommitPending());
 
@@ -483,7 +515,7 @@
   // It doesn't request a draw until we get a new commit though.
   EXPECT_TRUE(state.CommitPending());
   EXPECT_FALSE(state.RedrawPending());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -501,7 +533,7 @@
   EXPECT_TRUE(state.RedrawPending());
 
   // Verify we draw with the new frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   state.SetDrawResultForTest(DRAW_SUCCESS);
@@ -522,7 +554,7 @@
   // Start a commit.
   state.SetNeedsBeginMainFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -553,7 +585,7 @@
   EXPECT_TRUE(state.RedrawPending());
 
   // The redraw should be forced at the end of the next BeginImplFrame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -577,7 +609,7 @@
   // Start a commit.
   state.SetNeedsBeginMainFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -591,7 +623,7 @@
   // Fail the draw enough times to force a redraw.
   for (int i = 0; i < draw_limit; ++i) {
     state.SetNeedsRedraw(true);
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
     state.OnBeginImplFrameDeadline();
     state.SetDrawResultForTest(DRAW_ABORTED_CHECKERBOARD_ANIMATIONS);
@@ -612,7 +644,7 @@
   // redraw, but not back in IDLE.
   for (int i = 0; i < draw_limit; ++i) {
     state.SetNeedsRedraw(true);
-    state.OnBeginImplFrame();
+    state.IssueNextBeginImplFrame();
     EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
     state.OnBeginImplFrameDeadline();
     state.SetDrawResultForTest(DRAW_ABORTED_CHECKERBOARD_ANIMATIONS);
@@ -634,7 +666,7 @@
   // Start a draw.
   state.SetNeedsRedraw(true);
   EXPECT_TRUE(state.BeginFrameNeeded());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_TRUE(state.RedrawPending());
@@ -649,7 +681,7 @@
 
   // We should not be trying to draw again now, but we have a commit pending.
   EXPECT_TRUE(state.BeginFrameNeeded());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // We should try to draw again at the end of the next BeginImplFrame on
@@ -670,7 +702,7 @@
 
   // Draw the first frame.
   EXPECT_TRUE(state.BeginFrameNeeded());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   state.OnBeginImplFrameDeadline();
@@ -686,7 +718,7 @@
 
   // Move to another frame. This should now draw.
   EXPECT_TRUE(state.BeginFrameNeeded());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
@@ -824,7 +856,7 @@
       state.SetVisible(false);
       state.SetNeedsRedraw(true);
       if (j == 1)
-        state.OnBeginImplFrame();
+        state.IssueNextBeginImplFrame();
 
       state.SetCanDraw(false);
       EXPECT_NE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE,
@@ -847,7 +879,7 @@
   state.SetNeedsBeginMainFrame();
   state.SetNeedsRedraw(true);
   state.SetCanDraw(false);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_ABORT);
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
@@ -871,7 +903,7 @@
   EXPECT_TRUE(state.BeginFrameNeeded());
 
   // Begin the frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -900,7 +932,7 @@
   EXPECT_IMPL_FRAME_STATE(SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_IDLE);
   EXPECT_ACTION(SchedulerStateMachine::ACTION_COMMIT);
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_IMPL_FRAME_STATE(
       SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME);
   EXPECT_ACTION(SchedulerStateMachine::ACTION_COMMIT);
@@ -932,7 +964,7 @@
   state.SetNeedsBeginMainFrame();
 
   // Begin the frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -978,7 +1010,7 @@
   state.SetNeedsBeginMainFrame();
 
   // Make a main frame, commit and activate it. But don't draw it.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   state.NotifyBeginMainFrameStarted();
@@ -991,7 +1023,7 @@
   // pending tree and not clobber the active tree, we're able to start a new
   // begin frame and commit it.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   state.NotifyBeginMainFrameStarted();
@@ -1010,20 +1042,29 @@
   state.SetNeedsBeginMainFrame();
 
   // Make a main frame, commit and activate it. But don't draw it.
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 10);
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
   state.NotifyBeginMainFrameStarted();
   state.NotifyReadyToCommit();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
   state.NotifyReadyToActivate();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Try to make a new main frame before drawing, but since we would clobber the
   // active tree, we will not do so.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 11);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 }
 
 TEST(SchedulerStateMachineTest, AbortedMainFrameDoesNotResetPendingTree) {
@@ -1034,7 +1075,7 @@
 
   // Perform a commit so that we have an active tree.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1049,7 +1090,7 @@
   // Ask for another commit but abort it. Verify that we didn't reset pending
   // tree state.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1063,7 +1104,7 @@
 
   // Ask for another commit that doesn't abort.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1092,12 +1133,15 @@
   state.SetNeedsBeginMainFrame();
 
   // Begin the frame.
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 10);
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
   EXPECT_FALSE(state.NeedsCommit());
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Tell the scheduler the frame finished.
   state.NotifyBeginMainFrameStarted();
@@ -1106,51 +1150,65 @@
       SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_READY_TO_COMMIT);
   // Commit.
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
   // Commit always calls NotifyReadyToActivate in this mode.
   state.NotifyReadyToActivate();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // No draw because we haven't received NotifyReadyToDraw yet.
   state.OnBeginImplFrameDeadline();
   EXPECT_TRUE(state.active_tree_needs_first_draw());
   EXPECT_TRUE(state.needs_redraw());
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Can't BeginMainFrame yet since last commit hasn't been drawn yet.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 11);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Now call ready to draw which will allow the draw to happen and
   // BeginMainFrame to be sent.
   state.NotifyReadyToDraw();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, 10u, 10u);
   // Submit throttled from this point.
   state.DidSubmitCompositorFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Can't BeginMainFrame yet since we're submit-frame throttled.
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 12);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(12u, 10u, 10u, 10u, 10u);
 
   // CompositorFrameAck unblocks BeginMainFrame.
   state.DidReceiveCompositorFrameAck();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_SEQUENCE_NUMBERS(12u, 12u, 10u, 10u, 10u);
   state.NotifyBeginMainFrameStarted();
   state.NotifyReadyToCommit();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);
+  EXPECT_SEQUENCE_NUMBERS(12u, 12u, 12u, 10u, 10u);
   state.NotifyReadyToActivate();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(12u, 12u, 12u, 12u, 10u);
 
   // Draw the newly activated tree.
   state.NotifyReadyToDraw();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(12u, 12u, 12u, 12u, 12u);
 }
 
 TEST(SchedulerStateMachineTest, TestFullCycleWithCommitRequestInbetween) {
@@ -1162,7 +1220,7 @@
   state.SetNeedsBeginMainFrame();
 
   // Begin the frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -1201,7 +1259,7 @@
   EXPECT_FALSE(state.needs_redraw());
 
   // Next BeginImplFrame should initiate second commit.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
@@ -1264,7 +1322,7 @@
   state.SetNeedsBeginMainFrame();
 
   // Begin the frame while visible.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -1298,7 +1356,7 @@
   EXPECT_TRUE(state.NeedsCommit());
 
   // Start a new frame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 
@@ -1320,7 +1378,7 @@
 
   // Get into a begin frame / commit state.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_SENT);
@@ -1344,7 +1402,7 @@
   EXPECT_FALSE(state.NeedsCommit());
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_IDLE);
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1352,7 +1410,7 @@
   // Verify another commit can start if requested, though.
   state.SetNeedsBeginMainFrame();
   EXPECT_MAIN_FRAME_STATE(SchedulerStateMachine::BEGIN_MAIN_FRAME_STATE_IDLE);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION(SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
 
@@ -1368,14 +1426,14 @@
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Check that the first init does not SetNeedsBeginMainFrame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Check that a needs commit initiates a BeginMainFrame.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
@@ -1400,7 +1458,7 @@
   state.CreateAndInitializeCompositorFrameSinkWithActivatedCommit();
 
   // When the context is recreated, we should begin a commit.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
@@ -1422,14 +1480,14 @@
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Once context recreation begins, nothing should happen.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // While context is recreating, commits shouldn't begin.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1446,7 +1504,7 @@
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // When the BeginFrame comes in we should begin a commit
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1472,7 +1530,7 @@
   // Finishing the first commit after initializing an CompositorFrameSink should
   // automatically cause a redraw.
   EXPECT_TRUE(state.RedrawPending());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
@@ -1480,7 +1538,7 @@
   EXPECT_FALSE(state.RedrawPending());
 
   // Next frame as no work to do.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1488,7 +1546,7 @@
   // Once the context is recreated, whether we draw should be based on
   // SetCanDraw if waiting on first draw after activate.
   state.SetNeedsRedraw(true);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
@@ -1502,7 +1560,7 @@
   // SetCanDraw if waiting on first draw after activate.
   state.SetNeedsRedraw(true);
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1534,7 +1592,7 @@
 
   // Set damage and expect a draw.
   state.SetNeedsRedraw(true);
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 10);
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1543,9 +1601,13 @@
   state.DidSubmitCompositorFrame();
   state.DidReceiveCompositorFrameAck();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Cause a lost context while the BeginMainFrame is in flight.
   state.DidLoseCompositorFrameSink();
+  EXPECT_FALSE(state.BeginFrameNeeded());
 
   // Ask for another draw. Expect nothing happens.
   state.SetNeedsRedraw(true);
@@ -1555,28 +1617,37 @@
   state.NotifyBeginMainFrameStarted();
   state.NotifyReadyToCommit();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
   state.NotifyReadyToActivate();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // We will abort the draw when the CompositorFrameSink is lost if we are
   // waiting for the first draw to unblock the main thread.
   EXPECT_TRUE(state.active_tree_needs_first_draw());
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_ABORT);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   // Expect to begin context recreation only in BEGIN_IMPL_FRAME_STATE_IDLE
   EXPECT_IMPL_FRAME_STATE(SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_IDLE);
   EXPECT_ACTION(
       SchedulerStateMachine::ACTION_BEGIN_COMPOSITOR_FRAME_SINK_CREATION);
 
-  state.OnBeginImplFrame();
+  state.OnBeginImplFrame(0, 11);
   EXPECT_IMPL_FRAME_STATE(
       SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME);
   EXPECT_ACTION(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
 
   state.OnBeginImplFrameDeadline();
   EXPECT_IMPL_FRAME_STATE(
       SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_INSIDE_DEADLINE);
   EXPECT_ACTION(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, 11u, 11u);
 }
 
 TEST(SchedulerStateMachineTest,
@@ -1591,7 +1662,7 @@
 
   // Set damage and expect a draw.
   state.SetNeedsRedraw(true);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1625,7 +1696,7 @@
   EXPECT_ACTION(
       SchedulerStateMachine::ACTION_BEGIN_COMPOSITOR_FRAME_SINK_CREATION);
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_IMPL_FRAME_STATE(
       SchedulerStateMachine::BEGIN_IMPL_FRAME_STATE_INSIDE_BEGIN_FRAME);
   EXPECT_ACTION(SchedulerStateMachine::ACTION_NONE);
@@ -1641,7 +1712,7 @@
 
   // After we get a new CompositorFrameSink, the commit flow should start.
   state.CreateAndInitializeCompositorFrameSinkWithActivatedCommit();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1675,7 +1746,7 @@
   state.DidCreateAndInitializeCompositorFrameSink();
 
   EXPECT_FALSE(state.RedrawPending());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION(SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
 
@@ -1738,7 +1809,7 @@
   // When become visible again, the needs commit should still be pending.
   state.SetVisible(true);
   EXPECT_TRUE(state.BeginFrameNeeded());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
@@ -1902,7 +1973,7 @@
 
   // This test mirrors what happens during the first frame of a scroll gesture.
   // First we get the input event and a BeginFrame.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
 
   // As a response the compositor requests a redraw and a commit to tell the
   // main thread about the new scroll offset.
@@ -1937,7 +2008,7 @@
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   EXPECT_TRUE(state.ShouldTriggerBeginImplFrameDeadlineImmediately());
@@ -1955,7 +2026,7 @@
   // in prefer impl latency mode.
   state.SetNeedsRedraw(true);
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -1992,7 +2063,7 @@
   // throttled and did not just submit one.
   state.SetNeedsBeginMainFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   EXPECT_FALSE(state.ShouldTriggerBeginImplFrameDeadlineImmediately());
   state.OnBeginImplFrameDeadline();
@@ -2007,7 +2078,7 @@
 
   state.SetNeedsBeginMainFrame();
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -2027,7 +2098,7 @@
 
   state.SetNeedsBeginMainFrame();
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -2047,7 +2118,7 @@
 
   state.SetNeedsBeginMainFrame();
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -2070,14 +2141,14 @@
   EXPECT_FALSE(state.BeginFrameNeeded());
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   state.SetDeferCommits(false);
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 }
@@ -2091,7 +2162,7 @@
   bool commit_has_no_updates = true;
   state.WillCommit(commit_has_no_updates);
   EXPECT_TRUE(state.ProactiveBeginFrameWanted());
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_FALSE(state.ProactiveBeginFrameWanted());
 }
 
@@ -2103,7 +2174,7 @@
 
   // Set up the request for a commit and start a frame.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   PerformAction(&state, SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
 
   // Lose the CompositorFrameSink.
@@ -2139,7 +2210,7 @@
   // No impl-side invalidations should be performed while we are not visible.
   state.SetVisible(false);
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 }
@@ -2154,7 +2225,7 @@
   // frames.
   state.SetBeginFrameSourcePaused(true);
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 }
@@ -2165,7 +2236,7 @@
   SET_UP_STATE(state);
 
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(
@@ -2187,14 +2258,14 @@
 
   // No impl-side invalidations should be performed during frame sink creation.
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Initializing the CompositorFrameSink puts us in a state waiting for the
   // first commit.
   state.DidCreateAndInitializeCompositorFrameSink();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   state.NotifyBeginMainFrameStarted();
@@ -2211,7 +2282,7 @@
 
   // Set up request for the main frame, commit and create the pending tree.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   state.NotifyBeginMainFrameStarted();
@@ -2234,7 +2305,7 @@
 
   // Since there is no main frame request, this should perform impl-side
   // invalidations.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_PERFORM_IMPL_SIDE_INVALIDATION);
@@ -2247,7 +2318,8 @@
 
   // Set up request for the main frame.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
+
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -2278,7 +2350,7 @@
 
   // Set up a request for impl-side invalidation.
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_PERFORM_IMPL_SIDE_INVALIDATION);
@@ -2294,7 +2366,7 @@
 
   // Now start the next frame, which will first draw the active tree and then
   // perform the pending impl-side invalidation request.
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
   EXPECT_ACTION_UPDATE_STATE(
@@ -2311,7 +2383,7 @@
 
   // Commit to the sync tree, activate and draw.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   state.NotifyBeginMainFrameStarted();
@@ -2328,14 +2400,14 @@
   // Request impl-side invalidation and start a new frame, which should be
   // blocked on the ack for the previous frame.
   state.SetNeedsImplSideInvalidation();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 
   // Ack the previous frame and begin impl frame, which should perform the
   // invalidation now.
   state.DidReceiveCompositorFrameAck();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_PERFORM_IMPL_SIDE_INVALIDATION);
@@ -2349,7 +2421,7 @@
 
   // Set up request for the main frame.
   state.SetNeedsBeginMainFrame();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
@@ -2373,7 +2445,7 @@
   // invalidation should run first, since it will perform PrepareTiles as well.
   state.SetNeedsImplSideInvalidation();
   state.SetNeedsPrepareTiles();
-  state.OnBeginImplFrame();
+  state.IssueNextBeginImplFrame();
   state.OnBeginImplFrameDeadline();
   EXPECT_ACTION_UPDATE_STATE(
       SchedulerStateMachine::ACTION_PERFORM_IMPL_SIDE_INVALIDATION);
@@ -2381,5 +2453,287 @@
   EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
 }
 
+TEST(SchedulerStateMachineTest, TestBeginFrameFreshnessInitialState) {
+  SchedulerSettings default_scheduler_settings;
+  StateMachine state(default_scheduler_settings);
+  SET_UP_STATE(state)
+
+  // Initially, we report invalid frame numbers.
+  EXPECT_SEQUENCE_NUMBERS(
+      BeginFrameArgs::kInvalidFrameNumber, BeginFrameArgs::kInvalidFrameNumber,
+      BeginFrameArgs::kInvalidFrameNumber, BeginFrameArgs::kInvalidFrameNumber,
+      BeginFrameArgs::kInvalidFrameNumber);
+}
+
+TEST(SchedulerStateMachineTest, TestBeginFrameFreshnessWithoutUpdates) {
+  // Setup without any requested updates.
+  SchedulerSettings default_scheduler_settings;
+  StateMachine state(default_scheduler_settings);
+  SET_UP_STATE(state)
+  state.SetNeedsRedraw(false);
+  EXPECT_FALSE(state.RedrawPending());
+  EXPECT_FALSE(state.NeedsCommit());
+
+  // OnBeginImplFrame() updates the sequence number.
+  state.OnBeginImplFrame(0, 10);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // When no updates are required, OnBeginImplFrameDeadline() updates active
+  // tree and compositor frame freshness.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber, 10u, 10u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+}
+
+TEST(SchedulerStateMachineTest, TestBeginFrameFreshnessWithImplFrameUpdates) {
+  // Setup with an impl-thread draw requested.
+  SchedulerSettings default_scheduler_settings;
+  StateMachine state(default_scheduler_settings);
+  SET_UP_STATE(state)
+  state.SetNeedsRedraw(true);
+  EXPECT_TRUE(state.RedrawPending());
+  EXPECT_FALSE(state.NeedsCommit());
+
+  // OnBeginImplFrame() updates the sequence number.
+  state.OnBeginImplFrame(0, 10);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // With only an impl-thread draw requested, OnBeginImplFrameDeadline()
+  // updates the active tree freshness.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_SEQUENCE_NUMBERS(10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber, 10u,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // Compositor frame freshness is updated when active tree is drawn.
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.RedrawPending());
+  state.DidSubmitCompositorFrame();
+  state.DidReceiveCompositorFrameAck();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber, 10u, 10u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+}
+
+TEST(SchedulerStateMachineTest, TestBeginFrameFreshnessWithMainFrameUpdates) {
+  // Setup with a BeginMainFrame requested.
+  SchedulerSettings default_scheduler_settings;
+  StateMachine state(default_scheduler_settings);
+  SET_UP_STATE(state)
+  state.SetNeedsRedraw(false);
+  state.SetNeedsBeginMainFrameForTest(true);
+  EXPECT_FALSE(state.RedrawPending());
+  EXPECT_TRUE(state.NeedsCommit());
+
+  // OnBeginImplFrame() updates the sequence number, WillSendBeginMainFrame()
+  // updates begin_main_frame_sent sequence number.
+  state.OnBeginImplFrame(0, 10);
+  EXPECT_ACTION_UPDATE_STATE(
+      SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.NeedsCommit());
+  EXPECT_TRUE(state.CommitPending());
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // When a BeginMainFrame is needed, OnBeginImplFrameDeadline() updates no
+  // freshness numbers.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // When a main frame is in progress, OnBeginImplFrameDeadline() updates no
+  // freshness numbers.
+  state.NotifyBeginMainFrameStarted();
+  state.OnBeginImplFrame(0, 11);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // Pending tree freshness is updated when the new pending tree is committed.
+  state.NotifyReadyToCommit();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_COMMIT);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.CommitPending());
+  EXPECT_TRUE(state.has_pending_tree());
+  EXPECT_SEQUENCE_NUMBERS(11u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // If no further BeginMainFrame is needed, OnBeginFrameImplDeadline()
+  // updates the pending tree's frame number.
+  state.OnBeginImplFrame(0, 12);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(12u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(12u, 10u, 12u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // If a further BeginMainFrame is needed, OnBeginFrameImplDeadline()
+  // updates no freshness numbers.
+  state.SetNeedsBeginMainFrameForTest(true);
+  EXPECT_TRUE(state.NeedsCommit());
+  state.OnBeginImplFrame(0, 13);
+  // BMF will be sent only after pending_tree activation.
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(13u, 10u, 12u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // Active tree freshness is updated when pending frame is activated.
+  state.NotifyReadyToActivate();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_ACTIVATE_SYNC_TREE);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.has_pending_tree());
+  EXPECT_SEQUENCE_NUMBERS(13u, 10u, 12u, 12u,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  EXPECT_TRUE(state.RedrawPending());
+
+  // BMF requested above will be sent after activation.
+  state.OnBeginImplFrame(0, 14);
+  EXPECT_ACTION_UPDATE_STATE(
+      SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // Active tree freshness is updated when commit didn't have updates, but
+  // compositor frame freshness is not updated.
+  state.NotifyBeginMainFrameStarted();
+  state.BeginMainFrameAborted(CommitEarlyOutReason::FINISHED_NO_UPDATES);
+  EXPECT_SEQUENCE_NUMBERS(14u, 14u, 12u, 14u,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // Compositor frame freshness is updated when active tree is drawn.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_DRAW_IF_POSSIBLE);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.RedrawPending());
+  state.DidSubmitCompositorFrame();
+  state.DidReceiveCompositorFrameAck();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(14u, 14u, 12u, 14u, 14u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // When no updates are required, OnBeginImplFrameDeadline() updates active
+  // tree and compositor frame freshness.
+  state.OnBeginImplFrame(0, 15);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(15u, 14u, 12u, 15u, 15u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // Active tree and compositor frame freshness are updated when commit doesn't
+  // have updates and compositor frame was fresh before.
+  state.SetNeedsBeginMainFrameForTest(true);
+  EXPECT_TRUE(state.NeedsCommit());
+  state.OnBeginImplFrame(0, 16);
+  EXPECT_ACTION_UPDATE_STATE(
+      SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.NeedsCommit());
+  EXPECT_TRUE(state.CommitPending());
+  state.NotifyBeginMainFrameStarted();
+  state.BeginMainFrameAborted(CommitEarlyOutReason::FINISHED_NO_UPDATES);
+  EXPECT_SEQUENCE_NUMBERS(16u, 16u, 12u, 16u, 16u);
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(16u, 16u, 12u, 16u, 16u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+
+  // When the source changes, the current frame number is updated and frame
+  // numbers for freshness are reset to invalid numbers.
+  state.OnBeginImplFrame(1, 5);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(5u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // When no updates are required, OnBeginImplFrameDeadline() updates active
+  // tree and compositor frame freshness.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(5u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber, 5u, 5u);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+}
+
+TEST(SchedulerStateMachineTest,
+     TestBeginFrameFreshnessWithNoUpdatesCommitAndPendingTree) {
+  // Setup with main_frame_before_activation_enabled, a pending tree, and a
+  // new BeginMainFrame requested.
+  SchedulerSettings settings;
+  settings.main_frame_before_activation_enabled = true;
+  StateMachine state(settings);
+  SET_UP_STATE(state)
+  state.SetHasPendingTree(true);
+  state.SetNeedsRedraw(false);
+  state.SetNeedsBeginMainFrameForTest(true);
+  EXPECT_FALSE(state.RedrawPending());
+  EXPECT_TRUE(state.NeedsCommit());
+
+  // OnBeginImplFrame() updates the sequence number, WillSendBeginMainFrame()
+  // updates begin_main_frame_sent sequence number.
+  state.OnBeginImplFrame(0, 10);
+  EXPECT_ACTION_UPDATE_STATE(
+      SchedulerStateMachine::ACTION_SEND_BEGIN_MAIN_FRAME);
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_FALSE(state.NeedsCommit());
+  EXPECT_TRUE(state.CommitPending());
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // Pending tree freshness is updated when commit didn't have updates, but an
+  // older pending tree is still pending.
+  state.NotifyBeginMainFrameStarted();
+  state.BeginMainFrameAborted(CommitEarlyOutReason::FINISHED_NO_UPDATES);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+
+  // As no further BeginMainFrame is needed, OnBeginFrameImplDeadline()
+  // updates the pending tree's frame number, but without any visible change.
+  state.OnBeginImplFrameDeadline();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+  EXPECT_SEQUENCE_NUMBERS(10u, 10u, 10u, BeginFrameArgs::kInvalidFrameNumber,
+                          BeginFrameArgs::kInvalidFrameNumber);
+  state.OnBeginImplFrameIdle();
+  EXPECT_ACTION_UPDATE_STATE(SchedulerStateMachine::ACTION_NONE);
+}
+
 }  // namespace
 }  // namespace cc

diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc
index 03afa472..dad4992 100644
--- a/cc/scheduler/scheduler_unittest.cc
+++ b/cc/scheduler/scheduler_unittest.cc

@@ -241,8 +241,7 @@
       : now_src_(new base::SimpleTestTickClock()),
         task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
         fake_external_begin_frame_source_(nullptr),
-        fake_compositor_timing_history_(nullptr),
-        next_begin_frame_number_(BeginFrameArgs::kStartingFrameNumber) {
+        fake_compositor_timing_history_(nullptr) {
     now_src_->Advance(base::TimeDelta::FromMicroseconds(10000));
     // A bunch of tests require NowTicks()
     // to be > BeginFrameArgs::DefaultInterval()
@@ -411,10 +410,9 @@
     // Creep the time forward so that any BeginFrameArgs is not equal to the
     // last one otherwise we violate the BeginFrameSource contract.
     now_src_->Advance(BeginFrameArgs::DefaultInterval());
-    BeginFrameArgs args = CreateBeginFrameArgsForTesting(
-        BEGINFRAME_FROM_HERE, fake_external_begin_frame_source_->source_id(),
-        next_begin_frame_number_, now_src());
-    next_begin_frame_number_++;
+    BeginFrameArgs args =
+        fake_external_begin_frame_source_->CreateBeginFrameArgs(
+            BEGINFRAME_FROM_HERE, now_src());
     fake_external_begin_frame_source_->TestOnBeginFrame(args);
     return args;
   }
@@ -443,7 +441,6 @@
   std::unique_ptr<FakeSchedulerClient> client_;
   std::unique_ptr<TestScheduler> scheduler_;
   FakeCompositorTimingHistory* fake_compositor_timing_history_;
-  uint64_t next_begin_frame_number_;
 };
 
 TEST_F(SchedulerTest, InitializeCompositorFrameSinkDoesNotBeginImplFrame) {
@@ -1341,10 +1338,8 @@
 
   // Advance frame and create a begin frame.
   now_src_->Advance(BeginFrameArgs::DefaultInterval());
-  BeginFrameArgs args = CreateBeginFrameArgsForTesting(
-      BEGINFRAME_FROM_HERE, fake_external_begin_frame_source_->source_id(),
-      next_begin_frame_number_, now_src());
-  next_begin_frame_number_++;
+  BeginFrameArgs args = fake_external_begin_frame_source_->CreateBeginFrameArgs(
+      BEGINFRAME_FROM_HERE, now_src());
 
   // Deliver this begin frame super late.
   now_src_->Advance(BeginFrameArgs::DefaultInterval() * 100);
@@ -2861,30 +2856,53 @@
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 1, 2);
 }
 
-TEST_F(SchedulerTest, SynchronousCompositorCommit) {
+TEST_F(SchedulerTest, SynchronousCompositorCommitAndVerifyBeginFrameAcks) {
   scheduler_settings_.using_synchronous_renderer_compositor = true;
   SetUpScheduler(EXTERNAL_BFS);
 
+  // Expect the last ack to be for last BeginFrame, which didn't cause damage.
+  uint64_t last_begin_frame_number =
+      fake_external_begin_frame_source_->next_begin_frame_number() - 1;
+  uint64_t latest_confirmed_sequence_number = last_begin_frame_number;
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(fake_external_begin_frame_source_->source_id(),
+                    last_begin_frame_number, latest_confirmed_sequence_number,
+                    0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
   scheduler_->SetNeedsBeginMainFrame();
   EXPECT_SINGLE_ACTION("AddObserver(this)", client_);
   client_->Reset();
 
   // Next vsync.
-  AdvanceFrame();
+  BeginFrameArgs args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
   EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 2);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
   scheduler_->NotifyBeginMainFrameStarted(base::TimeTicks());
   EXPECT_NO_ACTION(client_);
 
   // Next vsync.
-  AdvanceFrame();
+  args = SendNextBeginFrame();
   EXPECT_SINGLE_ACTION("WillBeginImplFrame", client_);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
   scheduler_->NotifyReadyToCommit();
   EXPECT_SINGLE_ACTION("ScheduledActionCommit", client_);
   client_->Reset();
@@ -2894,12 +2912,22 @@
   client_->Reset();
 
   // Next vsync.
-  AdvanceFrame();
+  args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 2);
   EXPECT_ACTION("ScheduledActionInvalidateCompositorFrameSink", client_, 1, 2);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
 
+  // Not confirmed yet and no damage, since not drawn yet.
+  // TODO(eseckler): In the future, |has_damage = false| will prevent us from
+  // filtering this ack (in CompositorExternalBeginFrameSource) and instead
+  // forwarding the one attached to the later submitted CompositorFrame.
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
   // Android onDraw.
   scheduler_->SetNeedsRedraw();
   bool resourceless_software_draw = false;
@@ -2909,12 +2937,19 @@
   client_->Reset();
 
   // Idle on next vsync.
-  AdvanceFrame();
+  args = SendNextBeginFrame();
   EXPECT_ACTION("WillBeginImplFrame", client_, 0, 3);
   EXPECT_ACTION("RemoveObserver(this)", client_, 1, 3);
   EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 2, 3);
   EXPECT_FALSE(client_->IsInsideBeginImplFrame());
   client_->Reset();
+
+  latest_confirmed_sequence_number = args.sequence_number;
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
 }
 
 TEST_F(SchedulerTest, SynchronousCompositorDoubleCommitWithoutDraw) {
@@ -3339,5 +3374,311 @@
       ScrollHandlerState::SCROLL_AFFECTS_SCROLL_HANDLER, kSlowDuration));
 }
 
+TEST_F(SchedulerTest, BeginFrameAckForFinishedImplFrame) {
+  // Sets up scheduler and sends two BeginFrames, both finished.
+  SetUpScheduler(EXTERNAL_BFS);
+
+  // Expect the last ack to be for last BeginFrame, which didn't cause damage.
+  uint64_t last_begin_frame_number =
+      fake_external_begin_frame_source_->next_begin_frame_number() - 1;
+  uint64_t latest_confirmed_sequence_number = last_begin_frame_number;
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(fake_external_begin_frame_source_->source_id(),
+                    last_begin_frame_number, latest_confirmed_sequence_number,
+                    0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
+  // Run a successful redraw and verify that a new ack is sent.
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  BeginFrameArgs args = SendNextBeginFrame();
+  EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  task_runner().RunPendingTasks();  // Run posted deadline.
+  EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Successful draw caused damage.
+  latest_confirmed_sequence_number = args.sequence_number;
+  has_damage = true;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
+  // Request another redraw, but fail it. Verify that a new ack is sent, but
+  // that its |latest_confirmed_sequence_number| didn't change.
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  args = SendNextBeginFrame();
+  EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  client_->SetDrawWillHappen(false);
+  task_runner().RunPendingTasks();  // Run posted deadline.
+  EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 2);
+  // Failed draw triggers SendBeginMainFrame.
+  EXPECT_ACTION("ScheduledActionSendBeginMainFrame", client_, 1, 2);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Failed draw: no damage and unconfirmed frame.
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest, BeginFrameAckForSkippedImplFrame) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  // To get into a high latency state, this test disables automatic swap acks.
+  client_->SetAutomaticSubmitCompositorFrameAck(false);
+  fake_compositor_timing_history_->SetAllEstimatesTo(kFastDuration);
+
+  // Run a successful redraw that submits a compositor frame but doesn't receive
+  // a swap ack. Verify that a BeginFrameAck is sent for it.
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  BeginFrameArgs args = SendNextBeginFrame();
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  task_runner().RunPendingTasks();  // Run posted deadline.
+  EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Successful draw caused damage.
+  uint64_t latest_confirmed_sequence_number = args.sequence_number;
+  bool has_damage = true;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
+  // Request another redraw that will be skipped because the swap ack is still
+  // missing. Verify that a new BeginFrameAck is sent.
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  args = SendNextBeginFrame();
+  EXPECT_LT(latest_confirmed_sequence_number, args.sequence_number);
+  EXPECT_NO_ACTION(client_);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Skipped draw: no damage and unconfirmed frame.
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest, BeginFrameAckForBeginFrameBeforeLastDeadline) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  // Request tile preparation to schedule a proactive BeginFrame.
+  scheduler_->SetNeedsPrepareTiles();
+  client_->Reset();
+
+  SendNextBeginFrame();
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  // Until tiles were prepared, further proactive BeginFrames are expected.
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Send the next BeginFrame before the previous one's deadline was executed.
+  // This should trigger the previous BeginFrame's deadline synchronously,
+  // during which tiles will be prepared. As a result of that, no further
+  // BeginFrames will be needed, and the new BeginFrame should be dropped.
+  BeginFrameArgs args = SendNextBeginFrame();
+  EXPECT_ACTION("ScheduledActionPrepareTiles", client_, 0, 3);
+  EXPECT_ACTION("RemoveObserver(this)", client_, 1, 3);
+  EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 2, 3);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_FALSE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Latest ack should be for the dropped BeginFrame. Since we don't have
+  // further updates, its |latest_confirmed_sequence_number| should be for the
+  // dropped BeginFrame, too.
+  uint64_t latest_confirmed_sequence_number = args.sequence_number;
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest, BeginFrameAckForDroppedBeginFrame) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  // Last confirmed frame was last BeginFrame.
+  uint64_t latest_confirmed_sequence_number =
+      fake_external_begin_frame_source_->next_begin_frame_number() - 1;
+
+  // Request a single BeginFrame.
+  scheduler_->SetNeedsOneBeginImplFrame();
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // First BeginFrame is handled by StateMachine.
+  BeginFrameArgs first_args = SendNextBeginFrame();
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  // State machine is no longer interested in BeginFrames, but scheduler is
+  // still observing the source.
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  EXPECT_FALSE(scheduler_->BeginFrameNeeded());
+  client_->Reset();
+
+  // Send the next BeginFrame before the previous one's deadline was executed.
+  // The BeginFrame should be dropped immediately, since the state machine is
+  // not expecting any BeginFrames.
+  BeginFrameArgs second_args = SendNextBeginFrame();
+  EXPECT_NO_ACTION(client_);
+  client_->Reset();
+
+  // Latest ack should be for the dropped (and unconfirmed) BeginFrame.
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(second_args.source_id, second_args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+
+  task_runner().RunPendingTasks();  // Run deadline of prior BeginFrame.
+  EXPECT_ACTION("RemoveObserver(this)", client_, 0, 2);
+  EXPECT_ACTION("SendBeginMainFrameNotExpectedSoon", client_, 1, 2);
+  client_->Reset();
+
+  // We'd expect an out-of-order ack for the prior BeginFrame, confirming it.
+  latest_confirmed_sequence_number = first_args.sequence_number;
+  has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(first_args.source_id, first_args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest, BeginFrameAckForLateMissedBeginFrame) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  // Last confirmed frame was last BeginFrame.
+  uint64_t latest_confirmed_sequence_number =
+      fake_external_begin_frame_source_->next_begin_frame_number() - 1;
+
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  // Send a missed BeginFrame with a passed deadline.
+  now_src_->Advance(BeginFrameArgs::DefaultInterval());
+  BeginFrameArgs args = fake_external_begin_frame_source_->CreateBeginFrameArgs(
+      BEGINFRAME_FROM_HERE, now_src());
+  args.type = BeginFrameArgs::MISSED;
+  now_src_->Advance(BeginFrameArgs::DefaultInterval());
+  EXPECT_GT(now_src_->NowTicks(), args.deadline);
+  fake_external_begin_frame_source_->TestOnBeginFrame(args);
+
+  EXPECT_NO_ACTION(client_);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  client_->Reset();
+
+  // Latest ack should be for the missed BeginFrame that was too late: no damage
+  // and unconfirmed frame.
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest, BeginFrameAckForFinishedBeginFrameWithNewSourceId) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  // Send a BeginFrame with a different source_id.
+  now_src_->Advance(BeginFrameArgs::DefaultInterval());
+  uint32_t source_id = fake_external_begin_frame_source_->source_id() + 1;
+  BeginFrameArgs args = CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE,
+                                                       source_id, 1, now_src());
+  fake_external_begin_frame_source_->TestOnBeginFrame(args);
+
+  EXPECT_ACTION("WillBeginImplFrame", client_, 0, 1);
+  EXPECT_TRUE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  task_runner().RunPendingTasks();  // Run posted deadline.
+  EXPECT_ACTION("ScheduledActionDrawIfPossible", client_, 0, 1);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  EXPECT_TRUE(scheduler_->begin_frames_expected());
+  client_->Reset();
+
+  // Successful draw caused damage.
+  uint64_t latest_confirmed_sequence_number = args.sequence_number;
+  bool has_damage = true;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
+TEST_F(SchedulerTest,
+       BeginFrameAckForLateMissedBeginFrameWithDifferentSourceId) {
+  SetUpScheduler(EXTERNAL_BFS);
+
+  scheduler_->SetNeedsRedraw();
+  client_->Reset();
+
+  // Send a missed BeginFrame with a passed deadline and different source_id.
+  now_src_->Advance(BeginFrameArgs::DefaultInterval());
+  uint32_t source_id = fake_external_begin_frame_source_->source_id() + 1;
+  BeginFrameArgs args = CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE,
+                                                       source_id, 1, now_src());
+  args.type = BeginFrameArgs::MISSED;
+  now_src_->Advance(BeginFrameArgs::DefaultInterval());
+  EXPECT_GT(now_src_->NowTicks(), args.deadline);
+  fake_external_begin_frame_source_->TestOnBeginFrame(args);
+
+  EXPECT_NO_ACTION(client_);
+  EXPECT_FALSE(client_->IsInsideBeginImplFrame());
+  client_->Reset();
+
+  // Latest ack should be for the missed BeginFrame that was too late: no damage
+  // and unconfirmed frame. Because the source_id changed, the
+  // |latest_confirmed_sequence_number| should be set to invalid.
+  uint64_t latest_confirmed_sequence_number =
+      BeginFrameArgs::kInvalidFrameNumber;
+  bool has_damage = false;
+  EXPECT_EQ(
+      BeginFrameAck(args.source_id, args.sequence_number,
+                    latest_confirmed_sequence_number, 0, has_damage),
+      fake_external_begin_frame_source_->LastAckForObserver(scheduler_.get()));
+}
+
 }  // namespace
 }  // namespace cc

diff --git a/cc/surfaces/compositor_frame_sink_support.cc b/cc/surfaces/compositor_frame_sink_support.cc
index 6cb2414b..96508cd 100644
--- a/cc/surfaces/compositor_frame_sink_support.cc
+++ b/cc/surfaces/compositor_frame_sink_support.cc

@@ -50,11 +50,6 @@
       reference_tracker_.current_surface_id().is_valid())
     RemoveTopLevelRootReference(reference_tracker_.current_surface_id());
 
-  for (auto& child_frame_sink_id : child_frame_sinks_) {
-    DCHECK(child_frame_sink_id.is_valid());
-    surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                   child_frame_sink_id);
-  }
   // SurfaceFactory's destructor will attempt to return resources which will
   // call back into here and access |client_| so we should destroy
   // |surface_factory_|'s resources early on.
@@ -152,23 +147,6 @@
   }
 }
 
-void CompositorFrameSinkSupport::AddChildFrameSink(
-    const FrameSinkId& child_frame_sink_id) {
-  child_frame_sinks_.insert(child_frame_sink_id);
-  surface_manager_->RegisterFrameSinkHierarchy(frame_sink_id_,
-                                               child_frame_sink_id);
-}
-
-void CompositorFrameSinkSupport::RemoveChildFrameSink(
-    const FrameSinkId& child_frame_sink_id) {
-  auto it = child_frame_sinks_.find(child_frame_sink_id);
-  DCHECK(it != child_frame_sinks_.end());
-  DCHECK(it->is_valid());
-  surface_manager_->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                 child_frame_sink_id);
-  child_frame_sinks_.erase(it);
-}
-
 void CompositorFrameSinkSupport::ForceReclaimResources() {
   surface_factory_.ClearSurface();
 }

diff --git a/cc/surfaces/compositor_frame_sink_support.h b/cc/surfaces/compositor_frame_sink_support.h
index 5feef00..ac60f67 100644
--- a/cc/surfaces/compositor_frame_sink_support.h
+++ b/cc/surfaces/compositor_frame_sink_support.h

@@ -53,8 +53,6 @@
   void Require(const LocalSurfaceId& local_surface_id,
                const SurfaceSequence& sequence);
   void Satisfy(const SurfaceSequence& sequence);
-  void AddChildFrameSink(const FrameSinkId& child_frame_sink_id);
-  void RemoveChildFrameSink(const FrameSinkId& child_frame_sink_id);
   void RequestCopyOfSurface(std::unique_ptr<CopyOutputRequest> request);
   void ForceReclaimResources();
 
@@ -116,9 +114,6 @@
   // compositor frame sink.
   ReferencedSurfaceTracker reference_tracker_;
 
-  // The set of BeginFrame children of this CompositorFrameSink.
-  std::unordered_set<FrameSinkId, FrameSinkIdHash> child_frame_sinks_;
-
   const bool is_root_;
 
   // TODO(staraz): Remove this flag once ui::Compositor no longer needs to call

diff --git a/cc/surfaces/display_scheduler_unittest.cc b/cc/surfaces/display_scheduler_unittest.cc
index e905f3b..a03aeacb 100644
--- a/cc/surfaces/display_scheduler_unittest.cc
+++ b/cc/surfaces/display_scheduler_unittest.cc

@@ -97,13 +97,10 @@
 
   void AdvanceTimeAndBeginFrameForTest() {
     now_src_.Advance(base::TimeDelta::FromMicroseconds(10000));
-    base::TimeTicks frame_time = now_src_.NowTicks();
-    base::TimeDelta interval = BeginFrameArgs::DefaultInterval();
-    base::TimeTicks deadline = frame_time + interval;
     // FakeBeginFrameSource deals with |source_id| and |sequence_number|.
-    fake_begin_frame_source_.TestOnBeginFrame(
-        BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, 0, 1, frame_time, deadline,
-                               interval, BeginFrameArgs::NORMAL));
+    BeginFrameArgs args = fake_begin_frame_source_.CreateBeginFrameArgs(
+        BEGINFRAME_FROM_HERE, &now_src_);
+    fake_begin_frame_source_.TestOnBeginFrame(args);
   }
 
  protected:

diff --git a/cc/test/data/background_filter_on_scaled_layer_sw.png b/cc/test/data/background_filter_on_scaled_layer_sw.png
index 1864648..ca48fa2 100644
--- a/cc/test/data/background_filter_on_scaled_layer_sw.png
+++ b/cc/test/data/background_filter_on_scaled_layer_sw.png
Binary files differ

diff --git a/cc/test/data/rotated_filter_sw.png b/cc/test/data/rotated_filter_sw.png
index be80bedf..b64550e 100644
--- a/cc/test/data/rotated_filter_sw.png
+++ b/cc/test/data/rotated_filter_sw.png
Binary files differ

diff --git a/cc/test/fake_external_begin_frame_source.cc b/cc/test/fake_external_begin_frame_source.cc
index 916d01bd..202b3cfc 100644
--- a/cc/test/fake_external_begin_frame_source.cc
+++ b/cc/test/fake_external_begin_frame_source.cc

@@ -66,16 +66,32 @@
     client_->OnRemoveObserver(obs);
 }
 
+void FakeExternalBeginFrameSource::DidFinishFrame(BeginFrameObserver* obs,
+                                                  const BeginFrameAck& ack) {
+  last_acks_[obs] = ack;
+}
+
 bool FakeExternalBeginFrameSource::IsThrottled() const {
   return true;
 }
 
+BeginFrameArgs FakeExternalBeginFrameSource::CreateBeginFrameArgs(
+    BeginFrameArgs::CreationLocation location,
+    base::SimpleTestTickClock* now_src) {
+  return CreateBeginFrameArgsForTesting(location, source_id(),
+                                        next_begin_frame_number_++, now_src);
+}
+
+BeginFrameArgs FakeExternalBeginFrameSource::CreateBeginFrameArgs(
+    BeginFrameArgs::CreationLocation location) {
+  return CreateBeginFrameArgsForTesting(location, source_id(),
+                                        next_begin_frame_number_++);
+}
+
 void FakeExternalBeginFrameSource::TestOnBeginFrame(
     const BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
   current_args_ = args;
-  current_args_.source_id = source_id();
-  current_args_.sequence_number = next_begin_frame_number_++;
   std::set<BeginFrameObserver*> observers(observers_);
   for (auto* obs : observers)
     obs->OnBeginFrame(current_args_);
@@ -88,10 +104,9 @@
       base::Bind(&FakeExternalBeginFrameSource::TestOnBeginFrame,
                  weak_ptr_factory_.GetWeakPtr()));
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE, base::Bind(begin_frame_task_.callback(),
-                            CreateBeginFrameArgsForTesting(
-                                BEGINFRAME_FROM_HERE, source_id(),
-                                next_begin_frame_number_)),
+      FROM_HERE,
+      base::Bind(begin_frame_task_.callback(),
+                 CreateBeginFrameArgs(BEGINFRAME_FROM_HERE)),
       base::TimeDelta::FromMilliseconds(milliseconds_per_frame_));
   next_begin_frame_number_++;
 }

diff --git a/cc/test/fake_external_begin_frame_source.h b/cc/test/fake_external_begin_frame_source.h
index d02fe0bc..af0c0a9 100644
--- a/cc/test/fake_external_begin_frame_source.h
+++ b/cc/test/fake_external_begin_frame_source.h

@@ -13,6 +13,10 @@
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/begin_frame_source.h"
 
+namespace base {
+class SimpleTestTickClock;
+}  // namespace base
+
 namespace cc {
 
 class FakeExternalBeginFrameSource
@@ -36,13 +40,23 @@
   void AddObserver(BeginFrameObserver* obs) override;
   void RemoveObserver(BeginFrameObserver* obs) override;
   void DidFinishFrame(BeginFrameObserver* obs,
-                      const BeginFrameAck& ack) override {}
+                      const BeginFrameAck& ack) override;
   bool IsThrottled() const override;
 
+  BeginFrameArgs CreateBeginFrameArgs(
+      BeginFrameArgs::CreationLocation location);
+  BeginFrameArgs CreateBeginFrameArgs(BeginFrameArgs::CreationLocation location,
+                                      base::SimpleTestTickClock* now_src);
+  uint64_t next_begin_frame_number() const { return next_begin_frame_number_; }
+
   void TestOnBeginFrame(const BeginFrameArgs& args);
 
   size_t num_observers() const { return observers_.size(); }
 
+  const BeginFrameAck& LastAckForObserver(BeginFrameObserver* obs) {
+    return last_acks_[obs];
+  }
+
  private:
   void PostTestOnBeginFrame();
 
@@ -54,6 +68,7 @@
   uint64_t next_begin_frame_number_ = BeginFrameArgs::kStartingFrameNumber;
   std::set<BeginFrameObserver*> observers_;
   base::CancelableCallback<void(const BeginFrameArgs&)> begin_frame_task_;
+  std::unordered_map<BeginFrameObserver*, BeginFrameAck> last_acks_;
   base::WeakPtrFactory<FakeExternalBeginFrameSource> weak_ptr_factory_;
 };
 

diff --git a/cc/test/fake_raster_source.cc b/cc/test/fake_raster_source.cc
index a3e92c9..10ca00e 100644
--- a/cc/test/fake_raster_source.cc
+++ b/cc/test/fake_raster_source.cc

@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "base/synchronization/waitable_event.h"
+#include "cc/paint/paint_flags.h"
 #include "cc/test/fake_recording_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
@@ -139,7 +140,7 @@
 FakeRasterSource::~FakeRasterSource() {}
 
 void FakeRasterSource::PlaybackToCanvas(
-    PaintCanvas* canvas,
+    SkCanvas* canvas,
     const PlaybackSettings& settings) const {
   if (playback_allowed_event_)
     playback_allowed_event_->Wait();

diff --git a/cc/test/fake_raster_source.h b/cc/test/fake_raster_source.h
index b04cc1f..5545c3e 100644
--- a/cc/test/fake_raster_source.h
+++ b/cc/test/fake_raster_source.h

@@ -6,7 +6,6 @@
 #define CC_TEST_FAKE_RASTER_SOURCE_H_
 
 #include "base/memory/ref_counted.h"
-#include "cc/paint/paint_canvas.h"
 #include "cc/playback/raster_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
@@ -38,7 +37,7 @@
       bool can_use_lcd,
       base::WaitableEvent* playback_allowed_event);
 
-  void PlaybackToCanvas(PaintCanvas* canvas,
+  void PlaybackToCanvas(SkCanvas* canvas,
                         const PlaybackSettings& settings) const override;
 
  protected:

diff --git a/cc/test/fake_scrollbar.cc b/cc/test/fake_scrollbar.cc
index e276563..7ddafd4 100644
--- a/cc/test/fake_scrollbar.cc
+++ b/cc/test/fake_scrollbar.cc

@@ -4,6 +4,7 @@
 
 #include "cc/test/fake_scrollbar.h"
 
+#include "cc/paint/paint_flags.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
@@ -78,16 +79,16 @@
 
   // Fill the scrollbar with a different color each time.
   fill_color_++;
-  SkPaint paint;
-  paint.setAntiAlias(false);
-  paint.setColor(paint_fill_color());
-  paint.setStyle(SkPaint::kFill_Style);
+  PaintFlags flags;
+  flags.setAntiAlias(false);
+  flags.setColor(paint_fill_color());
+  flags.setStyle(PaintFlags::kFill_Style);
 
   // Emulate the how the real scrollbar works by using scrollbar's rect for
   // TRACK and the given content_rect for the THUMB
   SkRect rect = part == TRACK ? RectToSkRect(TrackRect())
                               : RectToSkRect(content_rect);
-  canvas->drawRect(rect, paint);
+  canvas->drawRect(rect, flags);
 }
 
 }  // namespace cc

diff --git a/cc/test/scheduler_test_common.h b/cc/test/scheduler_test_common.h
index 49612059..631ae72e 100644
--- a/cc/test/scheduler_test_common.h
+++ b/cc/test/scheduler_test_common.h

@@ -144,6 +144,8 @@
     return begin_frame_source_ && observing_begin_frame_source_;
   }
 
+  bool BeginFrameNeeded() const { return state_machine_.BeginFrameNeeded(); }
+
   int current_frame_number() const {
     return state_machine_.current_frame_number();
   }

diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc
index 873df15..466d733a 100644
--- a/cc/test/skia_common.cc
+++ b/cc/test/skia_common.cc

@@ -48,7 +48,7 @@
       SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
   SkBitmap bitmap;
   bitmap.installPixels(info, buffer, info.minRowBytes());
-  PaintCanvas canvas(bitmap);
+  SkCanvas canvas(bitmap);
   canvas.clipRect(gfx::RectToSkRect(layer_rect));
   list->Raster(&canvas, NULL, layer_rect, 1.0f);
 }

diff --git a/cc/trees/damage_tracker.cc b/cc/trees/damage_tracker.cc
index 0910b43..ae311dd2 100644
--- a/cc/trees/damage_tracker.cc
+++ b/cc/trees/damage_tracker.cc

@@ -192,7 +192,7 @@
     if (layer == layer->layer_tree_impl()->hud_layer())
       continue;
 
-    RenderSurfaceImpl* render_surface = layer->render_surface();
+    RenderSurfaceImpl* render_surface = layer->GetRenderSurface();
     if (render_surface && render_surface != target_surface)
       ExtendDamageForRenderSurface(render_surface, &damage);
     else

diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 344a6b5..13f8742 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc

@@ -40,13 +40,13 @@
   if (skip_verify_visible_rect_calculations)
     inputs.verify_visible_rect_calculations = false;
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
-  ASSERT_TRUE(root->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
 }
 
 void ClearDamageForAllSurfaces(LayerImpl* root) {
   for (auto* layer : *root->layer_tree_impl()) {
-    if (layer->render_surface())
-      layer->render_surface()->damage_tracker()->DidDrawDamagedArea();
+    if (layer->GetRenderSurface())
+      layer->GetRenderSurface()->damage_tracker()->DidDrawDamagedArea();
   }
 }
 
@@ -71,7 +71,7 @@
   for (size_t i = 0; i < render_surface_layer_list_size; ++i) {
     size_t index = render_surface_layer_list_size - 1 - i;
     RenderSurfaceImpl* target_surface =
-        render_surface_layer_list[index]->render_surface();
+        render_surface_layer_list[index]->GetRenderSurface();
     target_surface->damage_tracker()->UpdateDamageTrackingState(
         target_surface->layer_list(), target_surface,
         target_surface->SurfacePropertyChangedOnlyFromDescendant(),
@@ -195,12 +195,12 @@
 
   LayerImpl* root = CreateAndSetUpTestTreeWithOneSurface();
 
-  EXPECT_EQ(2u, root->render_surface()->layer_list().size());
-  EXPECT_EQ(1, root->render_surface()->layer_list()[0]->id());
-  EXPECT_EQ(2, root->render_surface()->layer_list()[1]->id());
+  EXPECT_EQ(2u, root->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(1, root->GetRenderSurface()->layer_list()[0]->id());
+  EXPECT_EQ(2, root->GetRenderSurface()->layer_list()[1]->id());
 
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
   EXPECT_EQ(gfx::Rect(500, 500).ToString(), root_damage_rect.ToString());
@@ -216,16 +216,17 @@
   LayerImpl* child2 = root->test_properties()->children[1];
 
   gfx::Rect child_damage_rect;
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
-  ASSERT_TRUE(child1->render_surface());
-  EXPECT_FALSE(child2->render_surface());
-  EXPECT_EQ(3u, root->render_surface()->layer_list().size());
-  EXPECT_EQ(2u, child1->render_surface()->layer_list().size());
+  ASSERT_TRUE(child1->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
+  EXPECT_EQ(3u, root->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(2u, child1->GetRenderSurface()->layer_list().size());
 
   // The render surface for child1 only has a content_rect that encloses
   // grand_child1 and grand_child2, because child1 does not draw content.
@@ -248,7 +249,7 @@
   // Damage position on the surface should be: position of update_rect (10, 11)
   // relative to the child (100, 100).
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(110, 111, 12, 13).ToString(),
             root_damage_rect.ToString());
@@ -259,7 +260,7 @@
   child->SetUpdateRect(gfx::Rect(10, 11, 12, 13));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(110, 111, 12, 13).ToString(),
             root_damage_rect.ToString());
@@ -273,7 +274,7 @@
 
   // Damage position on the surface should be: position of update_rect (20, 25)
   // relative to the child (100, 100).
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(120, 125, 1, 2).ToString(), root_damage_rect.ToString());
 }
@@ -292,7 +293,7 @@
   // Damage position on the surface should be: position of layer damage_rect
   // (10, 11) relative to the child (100, 100).
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(110, 111, 12, 13)));
 
@@ -302,7 +303,7 @@
   child->AddDamageRect(gfx::Rect(10, 11, 12, 13));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(110, 111, 12, 13)));
 
@@ -315,7 +316,7 @@
 
   // Damage position on the surface should be: position of layer damage_rect
   // (20, 25) relative to the child (100, 100).
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(120, 125, 1, 2)));
 
@@ -329,7 +330,7 @@
 
   // Damage position on the surface should be: position of layer damage_rect
   // (20, 25) relative to the child (100, 100).
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(120, 125, 1, 2)));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(110, 115, 3, 4)));
@@ -351,7 +352,7 @@
   // damage_rect and update rect (5, 6)
   // relative to the child (100, 100).
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(105, 106, 24, 20)));
 
@@ -362,7 +363,7 @@
   child->SetUpdateRect(gfx::Rect(10, 11, 14, 15));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(110, 111, 14, 15)));
 
@@ -376,7 +377,7 @@
 
   // Damage position on the surface should be: position of unified layer damage
   // rect and update rect (5, 10) relative to the child (100, 100).
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(true, root_damage_rect.Contains(gfx::Rect(105, 110, 17, 18)));
 }
@@ -396,12 +397,12 @@
       0.5f, child->effect_tree_index(), root->layer_tree_impl());
   EmulateDrawingOneFrame(root);
 
-  ASSERT_EQ(2u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
 
   // Damage should be the entire child layer in target_surface space.
   gfx::Rect expected_rect = gfx::Rect(100, 100, 30, 30);
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(expected_rect.ToString(), root_damage_rect.ToString());
 
@@ -414,7 +415,7 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 
@@ -428,7 +429,7 @@
 
   // Expect damage to be the combination of the previous one and the new one.
   expected_rect.Union(gfx::Rect(200, 230, 30, 30));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_FLOAT_RECT_EQ(expected_rect, root_damage_rect);
 }
@@ -446,7 +447,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(290, 290, 16, 18).ToString(),
             root_damage_rect.ToString());
@@ -474,7 +475,7 @@
   // Sanity check that the layer actually moved to (85, 85), damaging its old
   // location and new location.
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(85, 85, 45, 45).ToString(), root_damage_rect.ToString());
 
@@ -493,7 +494,7 @@
   float expected_position = 100.f - 0.5f * expected_width;
   gfx::Rect expected_rect = gfx::ToEnclosingRect(gfx::RectF(
       expected_position, expected_position, expected_width, expected_width));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(expected_rect.ToString(), root_damage_rect.ToString());
 }
@@ -547,7 +548,7 @@
   // don't care whether the damage rect was clamped or is larger than the
   // surface for this test.
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   gfx::Rect damage_we_care_about = gfx::Rect(gfx::Size(500, 500));
   EXPECT_TRUE(root_damage_rect.Contains(damage_we_care_about));
@@ -578,7 +579,7 @@
   // relative to the child (300, 300), but expanded by the blur outsets
   // (15, since the blur radius is 5).
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(286, 287, 33, 34), root_damage_rect);
 }
@@ -603,9 +604,9 @@
   child->layer_tree_impl()->property_trees()->effect_tree.OnFilterAnimated(
       filters, child->effect_tree_index(), child->layer_tree_impl());
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   // gfx::Rect(100, 100, 30, 30), expanded by 6px for the 2px blur filter.
@@ -619,9 +620,9 @@
   child->SetUpdateRect(gfx::Rect(1, 1));
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   // gfx::Rect(100, 100, 1, 1), expanded by 6px for the 2px blur filter.
@@ -654,9 +655,9 @@
   child->layer_tree_impl()->property_trees()->effect_tree.OnFilterAnimated(
       filters, child->effect_tree_index(), child->layer_tree_impl());
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   // Blur outset is 6px for a 2px blur.
@@ -676,9 +677,9 @@
   child->SetUpdateRect(gfx::Rect(30, 30));
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   int expect_width = 30 + 2 * blur_outset;
@@ -710,9 +711,9 @@
   child->layer_tree_impl()->property_trees()->effect_tree.OnFilterAnimated(
       filters, child->effect_tree_index(), child->layer_tree_impl());
   EmulateDrawingOneFrame(root, device_scale_factor);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   // Blur outset is 9px for a 3px blur, scaled up by DSF.
@@ -733,9 +734,9 @@
   child->SetUpdateRect(gfx::Rect(30, 30));
   EmulateDrawingOneFrame(root, device_scale_factor);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
 
   EXPECT_EQ(expected_root_damage_rect, root_damage_rect);
@@ -770,7 +771,7 @@
   EmulateDrawingOneFrame(root);
 
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage position on the surface should be a composition of the damage on
   // the root and on child2.  Damage on the root should be: position of
@@ -790,7 +791,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage position on the surface should be a composition of the damage on
   // the root and on child2.  Damage on the root should be: position of
@@ -808,7 +809,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage on the root should be: position of update_rect (30, 30), not
   // expanded.
@@ -824,7 +825,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage on the root should be: the originally damaged rect (99,99 1x1)
   // plus the rect that can influence with a 2px blur (93,93 13x13) intersected
@@ -841,7 +842,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage on child2 should be: position of update_rect offset by the child's
   // position (11, 11), and not expanded by anything.
@@ -857,7 +858,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   // Damage on child1 should be: position of update_rect offset by the child's
   // position (100, 100), and expanded by the damage.
@@ -890,10 +891,10 @@
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
-  ASSERT_EQ(3u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(3u, root->GetRenderSurface()->layer_list().size());
 
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
 
@@ -906,7 +907,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 
@@ -916,7 +917,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(100, 100, 30, 30).ToString(),
             root_damage_rect.ToString());
@@ -950,10 +951,10 @@
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
-  ASSERT_EQ(3u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(3u, root->GetRenderSurface()->layer_list().size());
 
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
 }
@@ -986,7 +987,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(100, 100, 303, 284).ToString(),
             root_damage_rect.ToString());
@@ -1011,9 +1012,10 @@
   root->layer_tree_impl()->property_trees()->effect_tree.OnOpacityAnimated(
       0.5f, grand_child1->effect_tree_index(), root->layer_tree_impl());
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(200, 200, 6, 8).ToString(), child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(300, 300, 6, 8).ToString(), root_damage_rect.ToString());
@@ -1030,9 +1032,10 @@
   root->layer_tree_impl()->property_trees()->effect_tree.OnOpacityAnimated(
       0.7f, child2->effect_tree_index(), root->layer_tree_impl());
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(200, 200, 6, 8).ToString(), child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(11, 11, 295, 297).ToString(),
@@ -1058,9 +1061,10 @@
   grand_child1->SetPosition(gfx::PointF(195.f, 205.f));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
   // The new surface bounds should be damaged entirely, even though only one of
@@ -1098,9 +1102,10 @@
   root->layer_tree_impl()->property_trees()->transform_tree.OnTransformAnimated(
       translation, child1->transform_tree_index(), root->layer_tree_impl());
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
   // The new surface bounds should be damaged entirely.
@@ -1129,10 +1134,10 @@
   EmulateDrawingOneFrame(root);
 
   // Sanity check that there is only one surface now.
-  ASSERT_FALSE(child1->render_surface());
-  ASSERT_EQ(4u, root->render_surface()->layer_list().size());
+  ASSERT_FALSE(child1->GetRenderSurface());
+  ASSERT_EQ(4u, root->GetRenderSurface()->layer_list().size());
 
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(290, 290, 16, 18).ToString(),
             root_damage_rect.ToString());
@@ -1145,7 +1150,7 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 
@@ -1157,13 +1162,14 @@
   EmulateDrawingOneFrame(root);
 
   // Sanity check that there is a new surface now.
-  ASSERT_TRUE(child1->render_surface());
-  EXPECT_EQ(3u, root->render_surface()->layer_list().size());
-  EXPECT_EQ(2u, child1->render_surface()->layer_list().size());
+  ASSERT_TRUE(child1->GetRenderSurface());
+  EXPECT_EQ(3u, root->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(2u, child1->GetRenderSurface()->layer_list().size());
 
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(190, 190, 16, 18).ToString(),
             child_damage_rect.ToString());
@@ -1182,9 +1188,10 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(child_damage_rect.IsEmpty());
   EXPECT_TRUE(root_damage_rect.IsEmpty());
@@ -1195,9 +1202,10 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(child_damage_rect.IsEmpty());
   EXPECT_TRUE(root_damage_rect.IsEmpty());
@@ -1215,9 +1223,10 @@
   child1->SetUpdateRect(gfx::Rect(1, 2));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &child_damage_rect));
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &child_damage_rect));
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(child_damage_rect.IsEmpty());
   EXPECT_TRUE(root_damage_rect.IsEmpty());
@@ -1263,7 +1272,7 @@
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   gfx::Rect child_damage_rect;
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
   EXPECT_EQ(gfx::Rect(30, 30).ToString(), child_damage_rect.ToString());
 
@@ -1275,7 +1284,7 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
   EXPECT_TRUE(child_damage_rect.IsEmpty());
 
@@ -1285,7 +1294,7 @@
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
   EXPECT_EQ(gfx::Rect(30, 30).ToString(), child_damage_rect.ToString());
 
@@ -1297,7 +1306,7 @@
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
   EXPECT_TRUE(child_damage_rect.IsEmpty());
 
@@ -1310,9 +1319,9 @@
   EmulateDrawingOneFrame(root);
 
   // Sanity check that a render surface still exists.
-  ASSERT_TRUE(child->render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
 
-  EXPECT_TRUE(child->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(child->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &child_damage_rect));
   EXPECT_EQ(gfx::Rect(30, 30).ToString(), child_damage_rect.ToString());
 }
@@ -1326,12 +1335,12 @@
   //
   ClearDamageForAllSurfaces(root);
   child->SetUpdateRect(gfx::Rect(10, 11, 12, 13));
-  root->render_surface()->damage_tracker()->AddDamageNextUpdate(
+  root->GetRenderSurface()->damage_tracker()->AddDamageNextUpdate(
       gfx::Rect(15, 16, 32, 33));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::UnionRects(gfx::Rect(15, 16, 32, 33),
                             gfx::Rect(100 + 10, 100 + 11, 12, 13)).ToString(),
@@ -1341,11 +1350,11 @@
   //         nothing on the layer tree changed.
   //
   ClearDamageForAllSurfaces(root);
-  root->render_surface()->damage_tracker()->AddDamageNextUpdate(
+  root->GetRenderSurface()->damage_tracker()->AddDamageNextUpdate(
       gfx::Rect(30, 31, 14, 15));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(30, 31, 14, 15).ToString(), root_damage_rect.ToString());
 }
@@ -1362,8 +1371,8 @@
   root_ptr->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root_ptr);
 
-  DCHECK_EQ(root_ptr->render_surface(), root_ptr->render_target());
-  RenderSurfaceImpl* target_surface = root_ptr->render_surface();
+  DCHECK_EQ(root_ptr->GetRenderSurface(), root_ptr->render_target());
+  RenderSurfaceImpl* target_surface = root_ptr->GetRenderSurface();
 
   LayerImplList empty_list;
   target_surface->damage_tracker()->UpdateDamageTrackingState(
@@ -1388,7 +1397,7 @@
 
   // Sanity check damage after the first frame; this isnt the actual test yet.
   gfx::Rect root_damage_rect;
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(110, 111, 1, 2).ToString(), root_damage_rect.ToString());
 
@@ -1397,15 +1406,15 @@
   child->SetUpdateRect(gfx::Rect(20, 25, 1, 2));
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(110, 111, 11, 16).ToString(),
             root_damage_rect.ToString());
 
   // If we notify the damage tracker that we drew the damaged area, then damage
   // should be emptied.
-  root->render_surface()->damage_tracker()->DidDrawDamagedArea();
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  root->GetRenderSurface()->damage_tracker()->DidDrawDamagedArea();
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 
@@ -1413,7 +1422,7 @@
   // damage.
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
-  EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 }
@@ -1449,8 +1458,9 @@
     // The expected damage should cover the visible part of the child layer,
     // which is (0, 0, i, i) in the viewport.
     gfx::Rect root_damage_rect;
-    EXPECT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
-        &root_damage_rect));
+    EXPECT_TRUE(
+        root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+            &root_damage_rect));
     gfx::Rect damage_we_care_about = gfx::Rect(i, i);
     EXPECT_LE(damage_we_care_about.right(), root_damage_rect.right());
     EXPECT_LE(damage_we_care_about.bottom(), root_damage_rect.bottom());
@@ -1479,10 +1489,10 @@
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything (ie, we don't have a valid rect).
   gfx::Rect damage_rect;
-  EXPECT_FALSE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_FALSE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_EQ(root->render_surface()->content_rect(),
-            root->render_surface()->GetDamageRect());
+  EXPECT_EQ(root->GetRenderSurface()->content_rect(),
+            root->GetRenderSurface()->GetDamageRect());
 }
 
 TEST_F(DamageTrackerTest, DamageRectTooBigWithFilter) {
@@ -1512,10 +1522,10 @@
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything (ie, we don't have a valid rect).
   gfx::Rect damage_rect;
-  EXPECT_FALSE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  EXPECT_FALSE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_EQ(root->render_surface()->content_rect(),
-            root->render_surface()->GetDamageRect());
+  EXPECT_EQ(root->GetRenderSurface()->content_rect(),
+            root->GetRenderSurface()->GetDamageRect());
 }
 
 TEST_F(DamageTrackerTest, DamageRectTooBigInRenderSurface) {
@@ -1544,11 +1554,11 @@
                                  skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
 
-  auto* surface = child1->render_surface();
+  auto* surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
-  surface = root->render_surface();
+  surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
@@ -1556,19 +1566,20 @@
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything on child1.
   gfx::Rect damage_rect;
-  EXPECT_FALSE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &damage_rect));
-  EXPECT_EQ(child1->render_surface()->content_rect(),
-            child1->render_surface()->GetDamageRect());
+  EXPECT_FALSE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &damage_rect));
+  EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
+            child1->GetRenderSurface()->GetDamageRect());
 
   // However, the root should just use the child1 render surface's content rect
   // as damage.
-  ASSERT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_TRUE(damage_rect.Contains(root->render_surface()->content_rect()));
+  EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
-      gfx::ToEnclosingRect(child1->render_surface()->DrawableContentRect())));
-  EXPECT_EQ(damage_rect, root->render_surface()->GetDamageRect());
+      gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
+  EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 
   // Add new damage, without changing properties, which goes down a different
   // path in the damage tracker.
@@ -1581,30 +1592,31 @@
   ExecuteCalculateDrawProperties(root, device_scale_factor,
                                  skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
-  surface = child1->render_surface();
+  surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
-  surface = root->render_surface();
+  surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
 
   // Child1 should still not have a valid rect, since the union of the damage of
   // its children is not representable by a single rect.
-  EXPECT_FALSE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &damage_rect));
-  EXPECT_EQ(child1->render_surface()->content_rect(),
-            child1->render_surface()->GetDamageRect());
+  EXPECT_FALSE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &damage_rect));
+  EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
+            child1->GetRenderSurface()->GetDamageRect());
 
   // Root should have valid damage and contain both its content rect and the
   // drawable content rect of child1.
-  ASSERT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_TRUE(damage_rect.Contains(root->render_surface()->content_rect()));
+  EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
-      gfx::ToEnclosingRect(child1->render_surface()->DrawableContentRect())));
-  EXPECT_EQ(damage_rect, root->render_surface()->GetDamageRect());
+      gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
+  EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 }
 
 TEST_F(DamageTrackerTest, DamageRectTooBigInRenderSurfaceWithFilter) {
@@ -1639,11 +1651,11 @@
                                  skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
 
-  auto* surface = child1->render_surface();
+  auto* surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
-  surface = root->render_surface();
+  surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
@@ -1651,19 +1663,20 @@
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything on child1.
   gfx::Rect damage_rect;
-  EXPECT_FALSE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &damage_rect));
-  EXPECT_EQ(child1->render_surface()->content_rect(),
-            child1->render_surface()->GetDamageRect());
+  EXPECT_FALSE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &damage_rect));
+  EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
+            child1->GetRenderSurface()->GetDamageRect());
 
   // However, the root should just use the child1 render surface's content rect
   // as damage.
-  ASSERT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_TRUE(damage_rect.Contains(root->render_surface()->content_rect()));
+  EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
-      gfx::ToEnclosingRect(child1->render_surface()->DrawableContentRect())));
-  EXPECT_EQ(damage_rect, root->render_surface()->GetDamageRect());
+      gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
+  EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 
   // Add new damage, without changing properties, which goes down a different
   // path in the damage tracker.
@@ -1676,30 +1689,31 @@
   ExecuteCalculateDrawProperties(root, device_scale_factor,
                                  skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
-  surface = child1->render_surface();
+  surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
-  surface = root->render_surface();
+  surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
 
   // Child1 should still not have a valid rect, since the union of the damage of
   // its children is not representable by a single rect.
-  EXPECT_FALSE(child1->render_surface()->damage_tracker()->GetDamageRectIfValid(
-      &damage_rect));
-  EXPECT_EQ(child1->render_surface()->content_rect(),
-            child1->render_surface()->GetDamageRect());
+  EXPECT_FALSE(
+      child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
+          &damage_rect));
+  EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
+            child1->GetRenderSurface()->GetDamageRect());
 
   // Root should have valid damage and contain both its content rect and the
   // drawable content rect of child1.
-  ASSERT_TRUE(root->render_surface()->damage_tracker()->GetDamageRectIfValid(
+  ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
-  EXPECT_TRUE(damage_rect.Contains(root->render_surface()->content_rect()));
+  EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
-      gfx::ToEnclosingRect(child1->render_surface()->DrawableContentRect())));
-  EXPECT_EQ(damage_rect, root->render_surface()->GetDamageRect());
+      gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
+  EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 }
 
 }  // namespace

diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index 7294e5c..c5128934 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc

@@ -77,8 +77,9 @@
       return false;
     }
   } else {
-    if (property_trees->ComputeTransformFromTarget(
+    if (property_trees->GetFromTarget(
             target_node_id, clip_node->target_effect_id, &clip_to_target)) {
+      PostConcatSurfaceContentsScale(target_effect_node, &clip_to_target);
       *clip_rect_in_target_space =
           MathUtil::ProjectClippedRect(clip_to_target, clip_from_clip_node);
     } else {
@@ -99,15 +100,12 @@
     int target_transform_id,
     int local_transform_id,
     const int target_effect_id) {
-  const EffectTree& effect_tree = property_trees->effect_tree;
   gfx::Transform target_to_local;
-  bool success = property_trees->ComputeTransformFromTarget(
+  bool success = property_trees->GetFromTarget(
       local_transform_id, target_effect_id, &target_to_local);
   if (!success)
     // If transform is not invertible, cannot apply clip.
     return ConditionalClip{false, gfx::RectF()};
-  const EffectNode* target_effect_node = effect_tree.Node(target_effect_id);
-  ConcatInverseSurfaceContentsScale(target_effect_node, &target_to_local);
 
   if (target_transform_id > local_transform_id)
     return ConditionalClip{true,  // is_clipped.
@@ -543,23 +541,16 @@
     }
 
     gfx::Transform target_to_layer;
-    if (transform_node->ancestors_are_invertible) {
-      property_trees->GetFromTarget(transform_node->id,
-                                    layer->render_target_effect_tree_index(),
-                                    &target_to_layer);
-    } else {
-      const EffectNode* target_effect_node =
-          ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
-      bool success = property_trees->ComputeTransformFromTarget(
-          transform_node->id, target_effect_node->id, &target_to_layer);
-      if (!success) {
-        // An animated singular transform may become non-singular during the
-        // animation, so we still need to compute a visible rect. In this
-        // situation, we treat the entire layer as visible.
-        layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
-        continue;
-      }
-      ConcatInverseSurfaceContentsScale(target_effect_node, &target_to_layer);
+    const EffectNode* target_effect_node =
+        ContentsTargetEffectNode(layer->effect_tree_index(), effect_tree);
+    bool success = property_trees->GetFromTarget(
+        transform_node->id, target_effect_node->id, &target_to_layer);
+    if (!success) {
+      // An animated singular transform may become non-singular during the
+      // animation, so we still need to compute a visible rect. In this
+      // situation, we treat the entire layer as visible.
+      layer->set_visible_layer_rect(gfx::Rect(layer_bounds));
+      continue;
     }
     gfx::Transform target_to_content;
     target_to_content.Translate(-layer->offset_to_transform_parent().x(),
@@ -827,16 +818,12 @@
     if (parent_target_transform_node &&
         parent_target_transform_node->id != clip_node->target_transform_id &&
         non_root_surfaces_enabled) {
-      success &= property_trees->ComputeTransformFromTarget(
+      success &= property_trees->GetFromTarget(
           clip_node->target_transform_id, parent_clip_node->target_effect_id,
           &parent_to_current);
       const EffectNode* target_effect_node =
           effect_tree.Node(clip_node->target_effect_id);
       PostConcatSurfaceContentsScale(target_effect_node, &parent_to_current);
-      const EffectNode* parent_target_effect_node =
-          effect_tree.Node(parent_clip_node->target_effect_id);
-      ConcatInverseSurfaceContentsScale(parent_target_effect_node,
-                                        &parent_to_current);
       // If we can't compute a transform, it's because we had to use the inverse
       // of a singular transform. We won't draw in this case, so there's no need
       // to compute clips.

diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index afe4a759..205b95f7 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc

@@ -291,7 +291,7 @@
   // all non-skipped layers to the layer list of their target surface, and
   // add their content rect to their target surface's accumulated content rect.
   for (LayerImpl* layer : *layer_tree_impl) {
-    RenderSurfaceImpl* render_surface = layer->render_surface();
+    RenderSurfaceImpl* render_surface = layer->GetRenderSurface();
     if (render_surface) {
       render_surface->ClearLayerLists();
       ClearMaskLayersAreDrawnRenderSurfaceLayerListMembers(render_surface);
@@ -372,7 +372,7 @@
   // Walk the list backwards, accumulating each surface's content rect into its
   // target's content rect.
   for (LayerImpl* layer : base::Reversed(*render_surface_layer_list)) {
-    RenderSurfaceImpl* render_surface = layer->render_surface();
+    RenderSurfaceImpl* render_surface = layer->GetRenderSurface();
     if (layer_tree_impl->IsRootLayer(layer)) {
       // The root layer's surface content rect is always the entire viewport.
       render_surface->SetContentRectToViewport();
@@ -401,7 +401,7 @@
   // the final list do not get added to the final list.
   for (LayerImpl* layer : *initial_surface_list) {
     bool is_root = layer_tree_impl->IsRootLayer(layer);
-    RenderSurfaceImpl* surface = layer->render_surface();
+    RenderSurfaceImpl* surface = layer->GetRenderSurface();
     RenderSurfaceImpl* target_surface = surface->render_target();
     if (!is_root && (surface->content_rect().IsEmpty() ||
                      target_surface->layer_list().empty())) {
@@ -567,7 +567,7 @@
 
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
-  DCHECK(inputs->root_layer->render_surface());
+  DCHECK(inputs->root_layer->GetRenderSurface());
 }
 
 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(

diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 96939835..31f5343 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc

@@ -743,8 +743,8 @@
   ExecuteCalculateDrawProperties(root);
 
   // Render surface should have been created now.
-  ASSERT_TRUE(child->render_surface());
-  ASSERT_EQ(child->render_surface(), child->render_target());
+  ASSERT_TRUE(child->GetRenderSurface());
+  ASSERT_EQ(child->GetRenderSurface(), child->render_target());
 
   // The child layer's draw transform should refer to its new render surface.
   // The screen-space transform, however, should still refer to the root.
@@ -928,33 +928,33 @@
 
   // Only layers that are associated with render surfaces should have an actual
   // RenderSurface() value.
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_FALSE(child_of_root->render_surface());
-  ASSERT_FALSE(grand_child_of_root->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_FALSE(child_of_root->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_root->GetRenderSurface());
 
-  ASSERT_TRUE(render_surface1->render_surface());
-  ASSERT_FALSE(child_of_rs1->render_surface());
-  ASSERT_FALSE(grand_child_of_rs1->render_surface());
+  ASSERT_TRUE(render_surface1->GetRenderSurface());
+  ASSERT_FALSE(child_of_rs1->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_rs1->GetRenderSurface());
 
-  ASSERT_TRUE(render_surface2->render_surface());
-  ASSERT_FALSE(child_of_rs2->render_surface());
-  ASSERT_FALSE(grand_child_of_rs2->render_surface());
+  ASSERT_TRUE(render_surface2->GetRenderSurface());
+  ASSERT_FALSE(child_of_rs2->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_rs2->GetRenderSurface());
 
   // Verify all render target accessors
-  EXPECT_EQ(root->render_surface(), parent->render_target());
-  EXPECT_EQ(root->render_surface(), child_of_root->render_target());
-  EXPECT_EQ(root->render_surface(), grand_child_of_root->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), parent->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), child_of_root->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), grand_child_of_root->render_target());
 
-  EXPECT_EQ(render_surface1->render_surface(),
+  EXPECT_EQ(render_surface1->GetRenderSurface(),
             render_surface1->render_target());
-  EXPECT_EQ(render_surface1->render_surface(), child_of_rs1->render_target());
-  EXPECT_EQ(render_surface1->render_surface(),
+  EXPECT_EQ(render_surface1->GetRenderSurface(), child_of_rs1->render_target());
+  EXPECT_EQ(render_surface1->GetRenderSurface(),
             grand_child_of_rs1->render_target());
 
-  EXPECT_EQ(render_surface2->render_surface(),
+  EXPECT_EQ(render_surface2->GetRenderSurface(),
             render_surface2->render_target());
-  EXPECT_EQ(render_surface2->render_surface(), child_of_rs2->render_target());
-  EXPECT_EQ(render_surface2->render_surface(),
+  EXPECT_EQ(render_surface2->GetRenderSurface(), child_of_rs2->render_target());
+  EXPECT_EQ(render_surface2->GetRenderSurface(),
             grand_child_of_rs2->render_target());
 
   // Verify layer draw transforms note that draw transforms are described with
@@ -1000,16 +1000,17 @@
   //
   // Draw transform of render surface 1 is described with respect to root.
   EXPECT_TRANSFORMATION_MATRIX_EQ(
-      A * A * S1, render_surface1->render_surface()->draw_transform());
+      A * A * S1, render_surface1->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
-      A * A * S1, render_surface1->render_surface()->screen_space_transform());
+      A * A * S1,
+      render_surface1->GetRenderSurface()->screen_space_transform());
   // Draw transform of render surface 2 is described with respect to render
   // surface 1.
   EXPECT_TRANSFORMATION_MATRIX_EQ(
-      SS1 * A * S2, render_surface2->render_surface()->draw_transform());
+      SS1 * A * S2, render_surface2->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       A * A * A * S2,
-      render_surface2->render_surface()->screen_space_transform());
+      render_surface2->GetRenderSurface()->screen_space_transform());
 
   // Sanity check. If these fail there is probably a bug in the test itself.  It
   // is expected that we correctly set up transforms so that the y-component of
@@ -1080,12 +1081,12 @@
   ExecuteCalculateDrawProperties(root);
 
   // The child's draw transform should have been taken by its surface.
-  ASSERT_TRUE(child->render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_draw_transform,
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_child_screen_space_transform,
-      child->render_surface()->screen_space_transform());
+      child->GetRenderSurface()->screen_space_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), child->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_screen_space_transform,
                                   child->ScreenSpaceTransform());
@@ -1163,10 +1164,10 @@
   grand_child->SetBounds(gfx::Size(10, 10));
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(child->has_render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
   // This is the real test, the rest are sanity checks.
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), child->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
                                   grand_child->DrawTransform());
@@ -1233,7 +1234,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         translate, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(translate, child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(50, 50, 100, 100), child->clip_rect());
   }
@@ -1251,7 +1252,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         scale, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(scale, child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(0, 0, 200, 200), child->clip_rect());
   }
@@ -1269,7 +1270,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         rotate, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(rotate, child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(-4, 0, 104, 104), child->clip_rect());
   }
@@ -1289,7 +1290,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         composite, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(composite, child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(89, 103, 208, 208), child->clip_rect());
   }
@@ -1313,7 +1314,7 @@
         device_scaled_translate,
         child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(device_scaled_translate,
                                     child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(50, 50, 150, 150), child->clip_rect());
@@ -1337,7 +1338,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         page_scaled_translate, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(page_scaled_translate,
                                     child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(50, 50, 200, 200), child->clip_rect());
@@ -1359,7 +1360,7 @@
     EXPECT_TRANSFORMATION_MATRIX_EQ(
         compositeSquared, child->draw_properties().target_space_transform);
     EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                    root->render_surface()->draw_transform());
+                                    root->GetRenderSurface()->draw_transform());
     EXPECT_TRANSFORMATION_MATRIX_EQ(compositeSquared,
                                     child->ScreenSpaceTransform());
     EXPECT_EQ(gfx::Rect(254, 316, 428, 428), child->clip_rect());
@@ -1386,7 +1387,7 @@
   // forced to be created. Render surfaces without children or visible content
   // are unexpected at draw time (e.g. we might try to create a content texture
   // of size 0).
-  ASSERT_TRUE(root->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
   EXPECT_EQ(1U, render_surface_layer_list_impl()->size());
 }
 
@@ -1407,11 +1408,11 @@
   inputs.can_adjust_raster_scales = true;
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
-  // Since the layer is transparent, render_surface1->render_surface() should
+  // Since the layer is transparent, render_surface1->GetRenderSurface() should
   // not have gotten added anywhere.  Also, the drawable content rect should not
   // have been extended by the children.
-  ASSERT_TRUE(root->render_surface());
-  EXPECT_EQ(0U, root->render_surface()->layer_list().size());
+  ASSERT_TRUE(root->GetRenderSurface());
+  EXPECT_EQ(0U, root->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(1U, render_surface_layer_list.size());
   EXPECT_EQ(root->id(), render_surface_layer_list.at(0)->id());
   EXPECT_EQ(gfx::Rect(), root->drawable_content_rect());
@@ -1444,10 +1445,10 @@
   }
   // The layer is fully transparent, but has a background filter, so it
   // shouldn't be skipped and should be drawn.
-  ASSERT_TRUE(root->render_surface());
-  EXPECT_EQ(1U, root->render_surface()->layer_list().size());
+  ASSERT_TRUE(root->GetRenderSurface());
+  EXPECT_EQ(1U, root->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(gfx::RectF(0, 0, 10, 10),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
   EffectTree& effect_tree =
       root->layer_tree_impl()->property_trees()->effect_tree;
   EffectNode* node = effect_tree.Node(render_surface1->effect_tree_index());
@@ -1501,15 +1502,15 @@
   inputs.can_adjust_raster_scales = true;
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
-  ASSERT_TRUE(parent->render_surface());
-  EXPECT_EQ(2U, parent->render_surface()->layer_list().size());
+  ASSERT_TRUE(parent->GetRenderSurface());
+  EXPECT_EQ(2U, parent->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(4U, render_surface_layer_list.size());
 
   // The rectangle enclosing child1 and child2 (0,0 50x50), expanded for the
   // blur (-30,-30 110x110), and then scaled by the scale matrix
   // (-60,-60 220x220).
   EXPECT_EQ(gfx::RectF(-60, -60, 220, 220),
-            parent->render_surface()->DrawableContentRect());
+            parent->GetRenderSurface()->DrawableContentRect());
 }
 
 TEST_F(LayerTreeHostCommonTest, DrawableContentRectForReferenceFilter) {
@@ -1529,9 +1530,9 @@
   // The render surface's size should be unaffected by the offset image filter;
   // it need only have a drawable content rect large enough to contain the
   // contents (at the new offset).
-  ASSERT_TRUE(child->render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
   EXPECT_EQ(gfx::RectF(50, 50, 25, 25),
-            child->render_surface()->DrawableContentRect());
+            child->GetRenderSurface()->DrawableContentRect());
 }
 
 TEST_F(LayerTreeHostCommonTest, DrawableContentRectForReferenceFilterHighDpi) {
@@ -1556,9 +1557,9 @@
   // it need only have a drawable content rect large enough to contain the
   // contents (at the new offset). All coordinates should be scaled by 2,
   // corresponding to the device scale factor.
-  ASSERT_TRUE(child->render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
   EXPECT_EQ(gfx::RectF(100, 100, 50, 50),
-            child->render_surface()->DrawableContentRect());
+            child->GetRenderSurface()->DrawableContentRect());
 }
 
 TEST_F(LayerTreeHostCommonTest, RenderSurfaceForBlendMode) {
@@ -1577,9 +1578,9 @@
   // its own render surface. Also, layer's draw_properties should contain the
   // default blend mode, since the render surface becomes responsible for
   // applying the blend mode.
-  ASSERT_TRUE(child->render_surface());
+  ASSERT_TRUE(child->GetRenderSurface());
   EXPECT_EQ(1.0f, child->draw_opacity());
-  EXPECT_EQ(0.5f, child->render_surface()->draw_opacity());
+  EXPECT_EQ(0.5f, child->GetRenderSurface()->draw_opacity());
   EXPECT_EQ(SkBlendMode::kSrcOver, child->draw_blend_mode());
 }
 
@@ -1602,13 +1603,13 @@
   surface2->test_properties()->force_render_surface = true;
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(surface1->render_surface());
-  ASSERT_FALSE(not_surface->render_surface());
-  ASSERT_TRUE(surface2->render_surface());
-  EXPECT_EQ(0.5f, surface1->render_surface()->draw_opacity());
+  ASSERT_TRUE(surface1->GetRenderSurface());
+  ASSERT_FALSE(not_surface->GetRenderSurface());
+  ASSERT_TRUE(surface2->GetRenderSurface());
+  EXPECT_EQ(0.5f, surface1->GetRenderSurface()->draw_opacity());
   // surface2's draw opacity should include the opacity of not-surface and
   // itself, but not the opacity of surface1.
-  EXPECT_EQ(0.25f, surface2->render_surface()->draw_opacity());
+  EXPECT_EQ(0.25f, surface2->GetRenderSurface()->draw_opacity());
 }
 
 TEST_F(LayerTreeHostCommonTest, DrawOpacityWhenCannotRenderToSeparateSurface) {
@@ -1686,16 +1687,16 @@
     ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
     // The root layer always creates a render surface
-    EXPECT_TRUE(root->has_render_surface());
-    EXPECT_TRUE(render_surface1->has_render_surface());
+    EXPECT_TRUE(root->GetRenderSurface());
+    EXPECT_TRUE(render_surface1->GetRenderSurface());
   }
 
   {
     render_surface1->test_properties()->force_render_surface = false;
     render_surface1->layer_tree_impl()->property_trees()->needs_rebuild = true;
     ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
-    EXPECT_TRUE(root->has_render_surface());
-    EXPECT_FALSE(render_surface1->has_render_surface());
+    EXPECT_TRUE(root->GetRenderSurface());
+    EXPECT_FALSE(render_surface1->GetRenderSurface());
   }
 }
 
@@ -1721,9 +1722,9 @@
   grand_child->test_properties()->should_flatten_transform = false;
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(parent->render_surface());
-  EXPECT_FALSE(child->render_surface());
-  EXPECT_FALSE(grand_child->render_surface());
+  EXPECT_TRUE(parent->GetRenderSurface());
+  EXPECT_FALSE(child->GetRenderSurface());
+  EXPECT_FALSE(grand_child->GetRenderSurface());
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), child->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
@@ -1862,15 +1863,15 @@
   // Case 1: nothing is clipped except the root render surface.
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_TRUE(child2->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_TRUE(child2->GetRenderSurface());
 
   EXPECT_FALSE(root->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(parent->is_clipped());
   EXPECT_FALSE(child1->is_clipped());
   EXPECT_FALSE(child2->is_clipped());
-  EXPECT_FALSE(child2->render_surface()->is_clipped());
+  EXPECT_FALSE(child2->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(grand_child->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_FALSE(leaf_node2->is_clipped());
@@ -1884,15 +1885,15 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_TRUE(child2->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_TRUE(child2->GetRenderSurface());
 
   EXPECT_FALSE(root->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
   EXPECT_TRUE(parent->is_clipped());
   EXPECT_TRUE(child1->is_clipped());
   EXPECT_FALSE(child2->is_clipped());
-  EXPECT_TRUE(child2->render_surface()->is_clipped());
+  EXPECT_TRUE(child2->GetRenderSurface()->is_clipped());
   EXPECT_TRUE(grand_child->is_clipped());
   EXPECT_TRUE(leaf_node1->is_clipped());
   EXPECT_FALSE(leaf_node2->is_clipped());
@@ -1906,15 +1907,15 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_TRUE(child2->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_TRUE(child2->GetRenderSurface());
 
   EXPECT_FALSE(root->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(parent->is_clipped());
   EXPECT_FALSE(child1->is_clipped());
   EXPECT_TRUE(child2->is_clipped());
-  EXPECT_FALSE(child2->render_surface()->is_clipped());
+  EXPECT_FALSE(child2->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(grand_child->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_TRUE(leaf_node2->is_clipped());
@@ -2197,18 +2198,18 @@
   leaf_node4->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(parent);
 
-  ASSERT_TRUE(grand_child1->render_surface());
-  ASSERT_TRUE(grand_child2->render_surface());
-  ASSERT_TRUE(grand_child3->render_surface());
+  ASSERT_TRUE(grand_child1->GetRenderSurface());
+  ASSERT_TRUE(grand_child2->GetRenderSurface());
+  ASSERT_TRUE(grand_child3->GetRenderSurface());
 
   // Surfaces are clipped by their parent, but un-affected by the owning layer's
   // MasksToBounds.
   EXPECT_EQ(gfx::Rect(0, 0, 20, 20),
-            grand_child1->render_surface()->clip_rect());
+            grand_child1->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(0, 0, 20, 20),
-            grand_child2->render_surface()->clip_rect());
+            grand_child2->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(0, 0, 20, 20),
-            grand_child3->render_surface()->clip_rect());
+            grand_child3->GetRenderSurface()->clip_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, ClipRectWhenCannotRenderToSeparateSurface) {
@@ -2254,13 +2255,13 @@
   // bounds in target space. The only thing that changes when surfaces are
   // disabled is that target space is always screen space.
   ExecuteCalculateDrawProperties(root);
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_FALSE(parent->has_render_surface());
-  EXPECT_TRUE(child1->has_render_surface());
-  EXPECT_FALSE(child2->has_render_surface());
-  EXPECT_TRUE(grand_child->has_render_surface());
-  EXPECT_FALSE(leaf_node1->has_render_surface());
-  EXPECT_FALSE(leaf_node2->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_FALSE(parent->GetRenderSurface());
+  EXPECT_TRUE(child1->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
+  EXPECT_TRUE(grand_child->GetRenderSurface());
+  EXPECT_FALSE(leaf_node1->GetRenderSurface());
+  EXPECT_FALSE(leaf_node2->GetRenderSurface());
   EXPECT_FALSE(root->is_clipped());
   EXPECT_FALSE(parent->is_clipped());
   EXPECT_FALSE(child1->is_clipped());
@@ -2268,10 +2269,10 @@
   EXPECT_FALSE(grand_child->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_FALSE(leaf_node2->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
-  EXPECT_FALSE(child1->render_surface()->is_clipped());
-  EXPECT_FALSE(grand_child->render_surface()->is_clipped());
-  EXPECT_EQ(gfx::Rect(100, 100), root->render_surface()->clip_rect());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
+  EXPECT_FALSE(child1->GetRenderSurface()->is_clipped());
+  EXPECT_FALSE(grand_child->GetRenderSurface()->is_clipped());
+  EXPECT_EQ(gfx::Rect(100, 100), root->GetRenderSurface()->clip_rect());
 
   ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(root);
   EXPECT_FALSE(root->is_clipped());
@@ -2281,8 +2282,8 @@
   EXPECT_FALSE(grand_child->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_FALSE(leaf_node2->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
-  EXPECT_EQ(gfx::Rect(100, 100), root->render_surface()->clip_rect());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
+  EXPECT_EQ(gfx::Rect(100, 100), root->GetRenderSurface()->clip_rect());
 
   // Case 2: The root is clipped. In this case, layers that draw into the root
   // render surface are clipped by the root's bounds.
@@ -2292,25 +2293,25 @@
   child1->test_properties()->force_render_surface = true;
   grand_child->test_properties()->force_render_surface = true;
   ExecuteCalculateDrawProperties(root);
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_FALSE(parent->has_render_surface());
-  EXPECT_TRUE(child1->has_render_surface());
-  EXPECT_FALSE(child2->has_render_surface());
-  EXPECT_TRUE(grand_child->has_render_surface());
-  EXPECT_FALSE(leaf_node1->has_render_surface());
-  EXPECT_FALSE(leaf_node2->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_FALSE(parent->GetRenderSurface());
+  EXPECT_TRUE(child1->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
+  EXPECT_TRUE(grand_child->GetRenderSurface());
+  EXPECT_FALSE(leaf_node1->GetRenderSurface());
+  EXPECT_FALSE(leaf_node2->GetRenderSurface());
   EXPECT_TRUE(root->is_clipped());
   EXPECT_TRUE(parent->is_clipped());
   EXPECT_FALSE(child1->is_clipped());
-  EXPECT_TRUE(child1->render_surface()->is_clipped());
+  EXPECT_TRUE(child1->GetRenderSurface()->is_clipped());
   EXPECT_TRUE(child2->is_clipped());
   EXPECT_FALSE(grand_child->is_clipped());
-  EXPECT_FALSE(grand_child->render_surface()->is_clipped());
+  EXPECT_FALSE(grand_child->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_TRUE(leaf_node2->is_clipped());
   EXPECT_EQ(gfx::Rect(100, 100), root->clip_rect());
   EXPECT_EQ(gfx::Rect(100, 100), parent->clip_rect());
-  EXPECT_EQ(gfx::Rect(100, 100), child1->render_surface()->clip_rect());
+  EXPECT_EQ(gfx::Rect(100, 100), child1->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(100, 100), child2->clip_rect());
   EXPECT_EQ(gfx::Rect(100, 100), leaf_node2->clip_rect());
 
@@ -2345,39 +2346,39 @@
   child1->test_properties()->force_render_surface = true;
   grand_child->test_properties()->force_render_surface = true;
   ExecuteCalculateDrawProperties(root);
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_FALSE(parent->has_render_surface());
-  EXPECT_TRUE(child1->has_render_surface());
-  EXPECT_FALSE(child2->has_render_surface());
-  EXPECT_TRUE(grand_child->has_render_surface());
-  EXPECT_FALSE(leaf_node1->has_render_surface());
-  EXPECT_FALSE(leaf_node2->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_FALSE(parent->GetRenderSurface());
+  EXPECT_TRUE(child1->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
+  EXPECT_TRUE(grand_child->GetRenderSurface());
+  EXPECT_FALSE(leaf_node1->GetRenderSurface());
+  EXPECT_FALSE(leaf_node2->GetRenderSurface());
   EXPECT_FALSE(root->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
   EXPECT_TRUE(parent->is_clipped());
   EXPECT_TRUE(child1->is_clipped());
   EXPECT_TRUE(child2->is_clipped());
   EXPECT_FALSE(grand_child->is_clipped());
-  EXPECT_TRUE(grand_child->render_surface()->is_clipped());
+  EXPECT_TRUE(grand_child->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(leaf_node1->is_clipped());
   EXPECT_TRUE(leaf_node2->is_clipped());
-  EXPECT_EQ(gfx::Rect(100, 100), root->render_surface()->clip_rect());
+  EXPECT_EQ(gfx::Rect(100, 100), root->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 400, 400), parent->clip_rect());
   EXPECT_EQ(gfx::Rect(800, 800), child1->clip_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 400, 400), child2->clip_rect());
-  EXPECT_EQ(gfx::Rect(800, 800), grand_child->render_surface()->clip_rect());
+  EXPECT_EQ(gfx::Rect(800, 800), grand_child->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 400, 400), leaf_node2->clip_rect());
 
   ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(root);
   EXPECT_FALSE(root->is_clipped());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
   EXPECT_TRUE(parent->is_clipped());
   EXPECT_TRUE(child1->is_clipped());
   EXPECT_TRUE(child2->is_clipped());
   EXPECT_TRUE(grand_child->is_clipped());
   EXPECT_TRUE(leaf_node1->is_clipped());
   EXPECT_TRUE(leaf_node2->is_clipped());
-  EXPECT_EQ(gfx::Rect(100, 100), root->render_surface()->clip_rect());
+  EXPECT_EQ(gfx::Rect(100, 100), root->GetRenderSurface()->clip_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 400, 400), parent->clip_rect());
   EXPECT_EQ(gfx::Rect(6, 6, 396, 396), child1->clip_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 400, 400), child2->clip_rect());
@@ -2578,33 +2579,33 @@
 
   // Only layers that are associated with render surfaces should have an actual
   // RenderSurface() value.
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_FALSE(child_of_root->render_surface());
-  ASSERT_FALSE(grand_child_of_root->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_FALSE(child_of_root->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_root->GetRenderSurface());
 
-  ASSERT_TRUE(render_surface1->render_surface());
-  ASSERT_FALSE(child_of_rs1->render_surface());
-  ASSERT_FALSE(grand_child_of_rs1->render_surface());
+  ASSERT_TRUE(render_surface1->GetRenderSurface());
+  ASSERT_FALSE(child_of_rs1->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_rs1->GetRenderSurface());
 
-  ASSERT_TRUE(render_surface2->render_surface());
-  ASSERT_FALSE(child_of_rs2->render_surface());
-  ASSERT_FALSE(grand_child_of_rs2->render_surface());
+  ASSERT_TRUE(render_surface2->GetRenderSurface());
+  ASSERT_FALSE(child_of_rs2->GetRenderSurface());
+  ASSERT_FALSE(grand_child_of_rs2->GetRenderSurface());
 
   // Verify all render target accessors
-  EXPECT_EQ(root->render_surface(), root->render_target());
-  EXPECT_EQ(root->render_surface(), child_of_root->render_target());
-  EXPECT_EQ(root->render_surface(), grand_child_of_root->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), root->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), child_of_root->render_target());
+  EXPECT_EQ(root->GetRenderSurface(), grand_child_of_root->render_target());
 
-  EXPECT_EQ(render_surface1->render_surface(),
+  EXPECT_EQ(render_surface1->GetRenderSurface(),
             render_surface1->render_target());
-  EXPECT_EQ(render_surface1->render_surface(), child_of_rs1->render_target());
-  EXPECT_EQ(render_surface1->render_surface(),
+  EXPECT_EQ(render_surface1->GetRenderSurface(), child_of_rs1->render_target());
+  EXPECT_EQ(render_surface1->GetRenderSurface(),
             grand_child_of_rs1->render_target());
 
-  EXPECT_EQ(render_surface2->render_surface(),
+  EXPECT_EQ(render_surface2->GetRenderSurface(),
             render_surface2->render_target());
-  EXPECT_EQ(render_surface2->render_surface(), child_of_rs2->render_target());
-  EXPECT_EQ(render_surface2->render_surface(),
+  EXPECT_EQ(render_surface2->GetRenderSurface(), child_of_rs2->render_target());
+  EXPECT_EQ(render_surface2->GetRenderSurface(),
             grand_child_of_rs2->render_target());
 
   // Verify screen_space_transform_is_animating values
@@ -3016,7 +3017,7 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
   // In target space, not clipped.
   EXPECT_EQ(gfx::Rect(60, 70, 100, 100), root->drawable_content_rect());
   // In layer space, clipped.
@@ -3041,7 +3042,7 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible_layer_rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -3080,7 +3081,7 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible content rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -3137,7 +3138,7 @@
 
   ExecuteCalculateDrawProperties(root);
   EXPECT_EQ(gfx::Rect(50, 50, 10, 10), filter_child->visible_layer_rect());
-  EXPECT_EQ(gfx::Rect(10, 10), filter->render_surface()->content_rect());
+  EXPECT_EQ(gfx::Rect(10, 10), filter->GetRenderSurface()->content_rect());
 
   FilterOperations blur_filter;
   blur_filter.Append(FilterOperation::CreateBlurFilter(4.0f));
@@ -3148,7 +3149,7 @@
 
   EXPECT_EQ(gfx::Rect(38, 38, 34, 34), filter_child->visible_layer_rect());
   EXPECT_EQ(gfx::Rect(-12, -12, 34, 34),
-            filter->render_surface()->content_rect());
+            filter->GetRenderSurface()->content_rect());
 
   gfx::Transform vertical_flip;
   vertical_flip.Scale(1, -1);
@@ -3165,7 +3166,7 @@
 
   EXPECT_EQ(gfx::Rect(50, 40, 10, 20), filter_child->visible_layer_rect());
   EXPECT_EQ(gfx::Rect(0, -10, 10, 20),
-            filter->render_surface()->content_rect());
+            filter->GetRenderSurface()->content_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, VisibleRectWithScalingClippingAndFilters) {
@@ -3190,7 +3191,7 @@
 
   ExecuteCalculateDrawProperties(root);
   EXPECT_EQ(gfx::Rect(50, 50, 10, 10), filter_child->visible_layer_rect());
-  EXPECT_EQ(gfx::Rect(30, 30), filter->render_surface()->content_rect());
+  EXPECT_EQ(gfx::Rect(30, 30), filter->GetRenderSurface()->content_rect());
 
   FilterOperations blur_filter;
   blur_filter.Append(FilterOperation::CreateBlurFilter(4.0f));
@@ -3201,7 +3202,7 @@
 
   EXPECT_EQ(gfx::Rect(38, 38, 34, 34), filter_child->visible_layer_rect());
   EXPECT_EQ(gfx::Rect(-36, -36, 102, 102),
-            filter->render_surface()->content_rect());
+            filter->GetRenderSurface()->content_rect());
 
   gfx::Transform vertical_flip;
   vertical_flip.Scale(1, -1);
@@ -3218,7 +3219,7 @@
 
   EXPECT_EQ(gfx::Rect(50, 40, 10, 20), filter_child->visible_layer_rect());
   EXPECT_EQ(gfx::Rect(0, -30, 30, 60),
-            filter->render_surface()->content_rect());
+            filter->GetRenderSurface()->content_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, ClipRectWithClipParentAndFilters) {
@@ -3316,10 +3317,10 @@
   child3->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(render_surface->render_surface());
+  ASSERT_TRUE(render_surface->GetRenderSurface());
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible content rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -3328,7 +3329,7 @@
   // An unclipped surface grows its DrawableContentRect to include all drawable
   // regions of the subtree.
   EXPECT_EQ(gfx::RectF(5.f, 5.f, 170.f, 170.f),
-            render_surface->render_surface()->DrawableContentRect());
+            render_surface->GetRenderSurface()->DrawableContentRect());
 
   // All layers that draw content into the unclipped surface are also unclipped.
   // Only the viewport clip should apply
@@ -3543,12 +3544,12 @@
       root, gfx::Size(), &render_surface_layer_list_impl);
 
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
-  ASSERT_TRUE(root->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
   EXPECT_FALSE(root->is_clipped());
 
   gfx::Rect empty;
-  EXPECT_EQ(empty, root->render_surface()->clip_rect());
-  EXPECT_TRUE(root->render_surface()->is_clipped());
+  EXPECT_EQ(empty, root->GetRenderSurface()->clip_rect());
+  EXPECT_TRUE(root->GetRenderSurface()->is_clipped());
 
   // Visible content rect calculation will check if the target surface is
   // clipped or not. An empty clip rect does not indicate the render surface
@@ -3702,11 +3703,11 @@
   host_impl.active_tree()->UpdateDrawProperties(update_lcd_text);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(
-      surface_ptr->render_surface()->draw_transform(), translate);
+      surface_ptr->GetRenderSurface()->draw_transform(), translate);
   // surface_sibling draws into the root render surface and occludes
   // surface_child's contents.
   Occlusion actual_occlusion =
-      surface_child_ptr->render_surface()->occlusion_in_content_space();
+      surface_child_ptr->GetRenderSurface()->occlusion_in_content_space();
   Occlusion expected_occlusion(translate, SimpleEnclosedRegion(gfx::Rect()),
                                SimpleEnclosedRegion(gfx::Rect(200, 200)));
   EXPECT_TRUE(expected_occlusion.IsEqual(actual_occlusion));
@@ -3859,10 +3860,10 @@
   child3->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(render_surface->render_surface());
+  ASSERT_TRUE(render_surface->GetRenderSurface());
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible content rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -3871,7 +3872,7 @@
   // A clipped surface grows its DrawableContentRect to include all drawable
   // regions of the subtree, but also gets clamped by the ancestor's clip.
   EXPECT_EQ(gfx::RectF(5.f, 5.f, 95.f, 95.f),
-            render_surface->render_surface()->DrawableContentRect());
+            render_surface->GetRenderSurface()->DrawableContentRect());
 
   // All layers that draw content into the surface have their visible content
   // rect clipped by the surface clip rect.
@@ -3912,11 +3913,11 @@
   child3->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(render_surface1->render_surface());
-  ASSERT_TRUE(render_surface2->render_surface());
+  ASSERT_TRUE(render_surface1->GetRenderSurface());
+  ASSERT_TRUE(render_surface2->GetRenderSurface());
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible content rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -3926,13 +3927,13 @@
   // A clipped surface grows its DrawableContentRect to include all drawable
   // regions of the subtree, but also gets clamped by the ancestor's clip.
   EXPECT_EQ(gfx::RectF(5.f, 5.f, 95.f, 95.f),
-            render_surface1->render_surface()->DrawableContentRect());
+            render_surface1->GetRenderSurface()->DrawableContentRect());
 
   // render_surface1 lives in the "unclipped universe" of render_surface1, and
   // is only implicitly clipped by render_surface1's content rect. So,
   // render_surface2 grows to enclose all drawable content of its subtree.
   EXPECT_EQ(gfx::RectF(5.f, 5.f, 170.f, 170.f),
-            render_surface2->render_surface()->DrawableContentRect());
+            render_surface2->GetRenderSurface()->DrawableContentRect());
 
   // All layers that draw content into render_surface2 think they are unclipped
   // by the surface. So, only the viewport clip applies.
@@ -4038,7 +4039,8 @@
   render_surface1->SetMasksToBounds(true);
 
   ExecuteCalculateDrawProperties(root);
-  EXPECT_EQ(gfx::Rect(50, 50), render_surface2->render_surface()->clip_rect());
+  EXPECT_EQ(gfx::Rect(50, 50),
+            render_surface2->GetRenderSurface()->clip_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, RenderSurfaceContentRectWhenLayerNotDrawn) {
@@ -4054,11 +4056,11 @@
   test_layer->SetBounds(gfx::Size(150, 150));
 
   ExecuteCalculateDrawProperties(root);
-  EXPECT_EQ(gfx::Rect(100, 100), surface->render_surface()->content_rect());
+  EXPECT_EQ(gfx::Rect(100, 100), surface->GetRenderSurface()->content_rect());
 
   test_layer->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root);
-  EXPECT_EQ(gfx::Rect(150, 150), surface->render_surface()->content_rect());
+  EXPECT_EQ(gfx::Rect(150, 150), surface->GetRenderSurface()->content_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, VisibleRectsMultipleSurfaces) {
@@ -4166,10 +4168,10 @@
   child1->test_properties()->transform_origin = gfx::Point3F(25.f, 25.f, 0.f);
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(render_surface->render_surface());
+  ASSERT_TRUE(render_surface->GetRenderSurface());
 
   EXPECT_EQ(gfx::RectF(100.f, 100.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
 
   // Layers that do not draw content should have empty visible content rects.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), root->visible_layer_rect());
@@ -4184,7 +4186,7 @@
                 diagonal_radius * 2,
                 diagonal_radius * 2);
   EXPECT_EQ(gfx::RectF(expected_surface_drawable_content),
-            render_surface->render_surface()->DrawableContentRect());
+            render_surface->GetRenderSurface()->DrawableContentRect());
 
   // All layers that draw content into the unclipped surface are also unclipped.
   EXPECT_EQ(gfx::Rect(0, 0, 50, 50), child1->visible_layer_rect());
@@ -4213,7 +4215,7 @@
   child1->test_properties()->transform_origin = gfx::Point3F(25.f, 25.f, 0.f);
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(render_surface->render_surface());
+  ASSERT_TRUE(render_surface->GetRenderSurface());
 
   // The clipped surface clamps the DrawableContentRect that encloses the
   // rotated layer.
@@ -4225,7 +4227,7 @@
   gfx::RectF expected_surface_drawable_content(
       gfx::IntersectRects(unclipped_surface_content, gfx::Rect(50, 50)));
   EXPECT_EQ(expected_surface_drawable_content,
-            render_surface->render_surface()->DrawableContentRect());
+            render_surface->GetRenderSurface()->DrawableContentRect());
 
   // On the clipped surface, only a quarter  of the child1 is visible, but when
   // rotating it back to  child1's content space, the actual enclosing rect ends
@@ -4271,20 +4273,20 @@
   float device_scale_factor = 2.f;
   ExecuteCalculateDrawProperties(root, device_scale_factor);
 
-  ASSERT_TRUE(render_surface1->render_surface());
-  ASSERT_TRUE(render_surface2->render_surface());
+  ASSERT_TRUE(render_surface1->GetRenderSurface());
+  ASSERT_TRUE(render_surface2->GetRenderSurface());
 
   // drawable_content_rects for all layers and surfaces are scaled by
   // device_scale_factor.
   EXPECT_EQ(gfx::RectF(200.f, 200.f),
-            root->render_surface()->DrawableContentRect());
+            root->GetRenderSurface()->DrawableContentRect());
   EXPECT_EQ(gfx::RectF(10.f, 10.f, 190.f, 190.f),
-            render_surface1->render_surface()->DrawableContentRect());
+            render_surface1->GetRenderSurface()->DrawableContentRect());
 
   // render_surface2 lives in the "unclipped universe" of render_surface1, and
   // is only implicitly clipped by render_surface1.
   EXPECT_EQ(gfx::RectF(10.f, 10.f, 350.f, 350.f),
-            render_surface2->render_surface()->DrawableContentRect());
+            render_surface2->GetRenderSurface()->DrawableContentRect());
 
   EXPECT_EQ(gfx::Rect(10, 10, 100, 100), child1->drawable_content_rect());
   EXPECT_EQ(gfx::Rect(150, 150, 100, 100), child2->drawable_content_rect());
@@ -4376,15 +4378,14 @@
   ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
   // Verify which render surfaces were created.
-  EXPECT_FALSE(front_facing_child->has_render_surface());
-  EXPECT_FALSE(back_facing_child->has_render_surface());
-  EXPECT_TRUE(front_facing_surface->has_render_surface());
-  EXPECT_TRUE(back_facing_surface->has_render_surface());
-  EXPECT_FALSE(
-      front_facing_child_of_front_facing_surface->has_render_surface());
-  EXPECT_FALSE(back_facing_child_of_front_facing_surface->has_render_surface());
-  EXPECT_FALSE(front_facing_child_of_back_facing_surface->has_render_surface());
-  EXPECT_FALSE(back_facing_child_of_back_facing_surface->has_render_surface());
+  EXPECT_FALSE(front_facing_child->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child->GetRenderSurface());
+  EXPECT_TRUE(front_facing_surface->GetRenderSurface());
+  EXPECT_TRUE(back_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(front_facing_child_of_front_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child_of_front_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(front_facing_child_of_back_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child_of_back_facing_surface->GetRenderSurface());
 
   EXPECT_EQ(3u, update_layer_list_impl()->size());
   EXPECT_TRUE(UpdateLayerListImplContains(front_facing_child->id()));
@@ -4485,16 +4486,15 @@
   ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
   // Verify which render surfaces were created and used.
-  EXPECT_FALSE(front_facing_child->has_render_surface());
-  EXPECT_FALSE(back_facing_child->has_render_surface());
-  EXPECT_TRUE(front_facing_surface->has_render_surface());
+  EXPECT_FALSE(front_facing_child->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child->GetRenderSurface());
+  EXPECT_TRUE(front_facing_surface->GetRenderSurface());
   // We expect that a has_render_surface was created but not used.
-  EXPECT_TRUE(back_facing_surface->has_render_surface());
-  EXPECT_FALSE(
-      front_facing_child_of_front_facing_surface->has_render_surface());
-  EXPECT_FALSE(back_facing_child_of_front_facing_surface->has_render_surface());
-  EXPECT_FALSE(front_facing_child_of_back_facing_surface->has_render_surface());
-  EXPECT_FALSE(back_facing_child_of_back_facing_surface->has_render_surface());
+  EXPECT_TRUE(back_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(front_facing_child_of_front_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child_of_front_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(front_facing_child_of_back_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(back_facing_child_of_back_facing_surface->GetRenderSurface());
 
   EXPECT_EQ(3u, update_layer_list_impl()->size());
 
@@ -4560,11 +4560,11 @@
 
   ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
-  EXPECT_FALSE(child->has_render_surface());
-  EXPECT_TRUE(animating_surface->has_render_surface());
-  EXPECT_FALSE(child_of_animating_surface->has_render_surface());
-  EXPECT_FALSE(animating_child->has_render_surface());
-  EXPECT_FALSE(child2->has_render_surface());
+  EXPECT_FALSE(child->GetRenderSurface());
+  EXPECT_TRUE(animating_surface->GetRenderSurface());
+  EXPECT_FALSE(child_of_animating_surface->GetRenderSurface());
+  EXPECT_FALSE(animating_child->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
 
   EXPECT_EQ(1u, update_layer_list_impl()->size());
 
@@ -4620,12 +4620,12 @@
   ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
   // Verify which render surfaces were created and used.
-  EXPECT_TRUE(front_facing_surface->has_render_surface());
+  EXPECT_TRUE(front_facing_surface->GetRenderSurface());
 
   // We expect the render surface to have been created, but remain unused.
-  EXPECT_TRUE(back_facing_surface->has_render_surface());
-  EXPECT_FALSE(child1->has_render_surface());
-  EXPECT_FALSE(child2->has_render_surface());
+  EXPECT_TRUE(back_facing_surface->GetRenderSurface());
+  EXPECT_FALSE(child1->GetRenderSurface());
+  EXPECT_FALSE(child2->GetRenderSurface());
 
   EXPECT_EQ(2u, update_layer_list_impl()->size());
   EXPECT_TRUE(UpdateLayerListImplContains(front_facing_surface->id()));
@@ -4809,7 +4809,7 @@
       device_scale_factor * page_scale_factor);
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_perspective_surface_draw_transform,
-      perspective_surface->render_surface()->draw_transform());
+      perspective_surface->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_perspective_surface_layer_draw_transform,
       perspective_surface->DrawTransform());
@@ -4952,20 +4952,20 @@
       device_scale_factor * child->position().x(),
       device_scale_factor * child->position().y());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_render_surface_draw_transform,
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
 
   gfx::Transform expected_surface_draw_transform;
   expected_surface_draw_transform.Translate(device_scale_factor * 2.f,
                                             device_scale_factor * 2.f);
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_surface_draw_transform,
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
 
   gfx::Transform expected_surface_screen_space_transform;
   expected_surface_screen_space_transform.Translate(device_scale_factor * 2.f,
                                                     device_scale_factor * 2.f);
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_screen_space_transform,
-      child->render_surface()->screen_space_transform());
+      child->GetRenderSurface()->screen_space_transform());
 }
 
 TEST_F(LayerTreeHostCommonTest,
@@ -4987,11 +4987,11 @@
   EXPECT_EQ(2u, render_surface_layer_list_impl()->size());
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(),
-                                  child->render_surface()->draw_transform());
+                                  child->GetRenderSurface()->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
-      gfx::Transform(), child->render_surface()->screen_space_transform());
+      gfx::Transform(), child->GetRenderSurface()->screen_space_transform());
 }
 
 TEST_F(LayerTreeHostCommonTest, LayerSearch) {
@@ -5025,7 +5025,7 @@
   grand_child->SetBounds(gfx::Size(10, 10));
   grand_child->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root);
-  EXPECT_FALSE(child->has_render_surface());
+  EXPECT_FALSE(child->GetRenderSurface());
 }
 
 TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
@@ -5072,7 +5072,7 @@
   // We should have one render surface and two layers. The child
   // layer should be included even though it is transparent.
   ASSERT_EQ(1u, render_surface_layer_list.size());
-  ASSERT_EQ(2u, root_layer->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, root_layer->GetRenderSurface()->layer_list().size());
 
   // If the root itself is hidden, the child should not be drawn even if it has
   // an animating opacity.
@@ -5382,9 +5382,9 @@
   // We should have one render surface and two layers. The grand child has
   // hidden itself.
   ASSERT_EQ(1u, render_surface_layer_list.size());
-  ASSERT_EQ(2u, root_layer->render_surface()->layer_list().size());
-  EXPECT_EQ(1, root_layer->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(2, root_layer->render_surface()->layer_list().at(1)->id());
+  ASSERT_EQ(2u, root_layer->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(1, root_layer->GetRenderSurface()->layer_list().at(0)->id());
+  EXPECT_EQ(2, root_layer->GetRenderSurface()->layer_list().at(1)->id());
 }
 
 TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
@@ -5423,8 +5423,8 @@
   // We should have one render surface and one layers. The child has
   // hidden itself and the grand child.
   ASSERT_EQ(1u, render_surface_layer_list.size());
-  ASSERT_EQ(1u, root_layer->render_surface()->layer_list().size());
-  EXPECT_EQ(1, root_layer->render_surface()->layer_list().at(0)->id());
+  ASSERT_EQ(1u, root_layer->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(1, root_layer->GetRenderSurface()->layer_list().at(0)->id());
 }
 
 void EmptyCopyOutputCallback(std::unique_ptr<CopyOutputResult> result) {}
@@ -5532,24 +5532,24 @@
   EXPECT_EQ(copy_layer->id(), render_surface_layer_list.at(3)->id());
 
   // The root render surface should have 2 contributing layers.
-  ASSERT_EQ(2u, root_layer->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, root_layer->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(root_layer->id(),
-            root_layer->render_surface()->layer_list().at(0)->id());
+            root_layer->GetRenderSurface()->layer_list().at(0)->id());
   EXPECT_EQ(copy_grand_parent_layer->id(),
-            root_layer->render_surface()->layer_list().at(1)->id());
+            root_layer->GetRenderSurface()->layer_list().at(1)->id());
 
   // Nothing actually draws into the copy parent, so only the copy_layer will
   // appear in its list, since it needs to be drawn for the copy request.
-  ASSERT_EQ(1u, copy_parent_layer->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, copy_parent_layer->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(copy_layer->id(),
-            copy_parent_layer->render_surface()->layer_list().at(0)->id());
+            copy_parent_layer->GetRenderSurface()->layer_list().at(0)->id());
 
   // The copy_layer's render surface should have two contributing layers.
-  ASSERT_EQ(2u, copy_layer->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, copy_layer->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(copy_layer->id(),
-            copy_layer->render_surface()->layer_list().at(0)->id());
+            copy_layer->GetRenderSurface()->layer_list().at(0)->id());
   EXPECT_EQ(copy_child_layer->id(),
-            copy_layer->render_surface()->layer_list().at(1)->id());
+            copy_layer->GetRenderSurface()->layer_list().at(1)->id());
 
   // copy_grand_parent, copy_parent shouldn't be drawn because they are hidden,
   // but the copy_layer and copy_child should be drawn for the copy request.
@@ -5570,7 +5570,7 @@
 
   // Though copy_layer is drawn, it shouldn't contribute to drawn surface as its
   // actually hidden.
-  EXPECT_FALSE(copy_layer->render_surface()->contributes_to_drawn_surface());
+  EXPECT_FALSE(copy_layer->GetRenderSurface()->contributes_to_drawn_surface());
 }
 
 TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
@@ -5621,9 +5621,9 @@
 
   // The root render surface should only have 2 contributing layer, since the
   // other layers are empty/clipped away.
-  ASSERT_EQ(2u, root_layer->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, root_layer->GetRenderSurface()->layer_list().size());
   EXPECT_EQ(root_layer->id(),
-            root_layer->render_surface()->layer_list().at(0)->id());
+            root_layer->GetRenderSurface()->layer_list().at(0)->id());
 }
 
 TEST_F(LayerTreeHostCommonTest, VisibleRectInNonRootCopyRequest) {
@@ -5743,8 +5743,8 @@
   clip_child->SetBounds(gfx::Size(10, 10));
   ExecuteCalculateDrawProperties(root);
 
-  ASSERT_TRUE(root->render_surface());
-  ASSERT_TRUE(render_surface->render_surface());
+  ASSERT_TRUE(root->GetRenderSurface());
+  ASSERT_TRUE(render_surface->GetRenderSurface());
 
   // Ensure that we've inherited our clip parent's clip and weren't affected
   // by the intervening clip layer.
@@ -5755,14 +5755,14 @@
   // Ensure that the render surface reports a content rect that has been grown
   // to accomodate for the clip child.
   ASSERT_EQ(gfx::Rect(1, 1, 20, 20),
-            render_surface->render_surface()->content_rect());
+            render_surface->GetRenderSurface()->content_rect());
 
   // The above check implies the two below, but they nicely demonstrate that
   // we've grown, despite the intervening layer's clip.
   ASSERT_TRUE(clip_parent->clip_rect().Contains(
-      render_surface->render_surface()->content_rect()));
+      render_surface->GetRenderSurface()->content_rect()));
   ASSERT_FALSE(intervening->clip_rect().Contains(
-      render_surface->render_surface()->content_rect()));
+      render_surface->GetRenderSurface()->content_rect()));
 }
 
 TEST_F(LayerTreeHostCommonTest, ClipParentWithInterveningRenderSurface) {
@@ -5808,19 +5808,19 @@
   clip_child->SetBounds(gfx::Size(60, 60));
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
-  EXPECT_TRUE(render_surface1->render_surface());
-  EXPECT_TRUE(render_surface2->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(render_surface1->GetRenderSurface());
+  EXPECT_TRUE(render_surface2->GetRenderSurface());
 
   // Since the render surfaces could have expanded, they should not clip (their
   // bounds would no longer be reliable). We should resort to layer clipping
   // in this case.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0),
-            render_surface1->render_surface()->clip_rect());
-  EXPECT_FALSE(render_surface1->render_surface()->is_clipped());
+            render_surface1->GetRenderSurface()->clip_rect());
+  EXPECT_FALSE(render_surface1->GetRenderSurface()->is_clipped());
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0),
-            render_surface2->render_surface()->clip_rect());
-  EXPECT_FALSE(render_surface2->render_surface()->is_clipped());
+            render_surface2->GetRenderSurface()->clip_rect());
+  EXPECT_FALSE(render_surface2->GetRenderSurface()->is_clipped());
 
   // NB: clip rects are in target space.
   EXPECT_EQ(gfx::Rect(0, 0, 40, 40), render_surface1->clip_rect());
@@ -5833,9 +5833,9 @@
   // The content rects of both render surfaces should both have expanded to
   // contain the clip child.
   EXPECT_EQ(gfx::Rect(0, 0, 40, 40),
-            render_surface1->render_surface()->content_rect());
+            render_surface1->GetRenderSurface()->content_rect());
   EXPECT_EQ(gfx::Rect(-1, -1, 40, 40),
-            render_surface2->render_surface()->content_rect());
+            render_surface2->GetRenderSurface()->content_rect());
 
   // The clip child should have inherited the clip parent's clip (projected to
   // the right space, of course), and should have the correctly sized visible
@@ -5891,19 +5891,19 @@
   clip_child->SetBounds(gfx::Size(60, 60));
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
-  EXPECT_TRUE(render_surface1->render_surface());
-  EXPECT_TRUE(render_surface2->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(render_surface1->GetRenderSurface());
+  EXPECT_TRUE(render_surface2->GetRenderSurface());
 
   // Since the render surfaces could have expanded, they should not clip (their
   // bounds would no longer be reliable). We should resort to layer clipping
   // in this case.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0),
-            render_surface1->render_surface()->clip_rect());
-  EXPECT_FALSE(render_surface1->render_surface()->is_clipped());
+            render_surface1->GetRenderSurface()->clip_rect());
+  EXPECT_FALSE(render_surface1->GetRenderSurface()->is_clipped());
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0),
-            render_surface2->render_surface()->clip_rect());
-  EXPECT_FALSE(render_surface2->render_surface()->is_clipped());
+            render_surface2->GetRenderSurface()->clip_rect());
+  EXPECT_FALSE(render_surface2->GetRenderSurface()->is_clipped());
 
   // NB: clip rects are in target space.
   EXPECT_EQ(gfx::Rect(0, 0, 40, 40), render_surface1->clip_rect());
@@ -5916,9 +5916,9 @@
   // The content rects of both render surfaces should both have expanded to
   // contain the clip child.
   EXPECT_EQ(gfx::Rect(0, 0, 40, 40),
-            render_surface1->render_surface()->content_rect());
+            render_surface1->GetRenderSurface()->content_rect());
   EXPECT_EQ(gfx::Rect(2, 2, 40, 40),
-            render_surface2->render_surface()->content_rect());
+            render_surface2->GetRenderSurface()->content_rect());
 
   // The clip child should have inherited the clip parent's clip (projected to
   // the right space, of course), and should have the correctly sized visible
@@ -5960,7 +5960,7 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
 
   // Neither the clip child nor its descendant should have inherited the clip
   // from |intervening|.
@@ -6016,9 +6016,9 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
-  EXPECT_TRUE(render_surface1->render_surface());
-  EXPECT_TRUE(render_surface2->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(render_surface1->GetRenderSurface());
+  EXPECT_TRUE(render_surface2->GetRenderSurface());
 
   EXPECT_EQ(gfx::Rect(0, 0, 5, 5), render_surface1->clip_rect());
   EXPECT_TRUE(render_surface1->is_clipped());
@@ -6026,23 +6026,23 @@
   // The render surface should not clip (it has unclipped descendants), instead
   // it should rely on layer clipping.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0),
-            render_surface1->render_surface()->clip_rect());
-  EXPECT_FALSE(render_surface1->render_surface()->is_clipped());
+            render_surface1->GetRenderSurface()->clip_rect());
+  EXPECT_FALSE(render_surface1->GetRenderSurface()->is_clipped());
 
   // That said, it should have grown to accomodate the unclipped descendant and
   // its own size.
   EXPECT_EQ(gfx::Rect(-1, 0, 6, 5),
-            render_surface1->render_surface()->content_rect());
+            render_surface1->GetRenderSurface()->content_rect());
 
   // This render surface should clip. It has no unclipped descendants.
   EXPECT_EQ(gfx::Rect(0, 0, 10, 10),
-            render_surface2->render_surface()->clip_rect());
-  EXPECT_TRUE(render_surface2->render_surface()->is_clipped());
+            render_surface2->GetRenderSurface()->clip_rect());
+  EXPECT_TRUE(render_surface2->GetRenderSurface()->is_clipped());
   EXPECT_FALSE(render_surface2->is_clipped());
 
   // It also shouldn't have grown to accomodate the clip child.
   EXPECT_EQ(gfx::Rect(0, 0, 5, 5),
-            render_surface2->render_surface()->content_rect());
+            render_surface2->GetRenderSurface()->content_rect());
 
   // Sanity check our num_unclipped_descendants values.
   EXPECT_EQ(1u, render_surface1->test_properties()->num_unclipped_descendants);
@@ -6075,10 +6075,10 @@
   ExecuteCalculateDrawPropertiesAndSaveUpdateLayerList(root);
 
   // Verify which render surfaces were created.
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_FALSE(child1->has_render_surface());
-  EXPECT_TRUE(child2->has_render_surface());
-  EXPECT_FALSE(child3->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_FALSE(child1->GetRenderSurface());
+  EXPECT_TRUE(child2->GetRenderSurface());
+  EXPECT_FALSE(child3->GetRenderSurface());
 }
 
 TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
@@ -6217,16 +6217,18 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(3u, render_surface_layer_list_impl()->size());
-  EXPECT_EQ(2u, render_surface_layer_list_impl()
-                    ->at(0)
-                    ->render_surface()
-                    ->layer_list()
-                    .size());
-  EXPECT_EQ(1u, render_surface_layer_list_impl()
-                    ->at(1)
-                    ->render_surface()
-                    ->layer_list()
-                    .size());
+  EXPECT_EQ(2u,
+            render_surface_layer_list_impl()
+                ->at(0)
+                ->GetRenderSurface()
+                ->layer_list()
+                .size());
+  EXPECT_EQ(1u,
+            render_surface_layer_list_impl()
+                ->at(1)
+                ->GetRenderSurface()
+                ->layer_list()
+                .size());
 
   gfx::Transform rotation_transform;
   rotation_transform.RotateAboutXAxis(180.0);
@@ -6241,11 +6243,12 @@
   // double-sided, but will still be in RSLL as it's in a different 3d rendering
   // context.
   EXPECT_EQ(2u, render_surface_layer_list_impl()->size());
-  EXPECT_EQ(1u, render_surface_layer_list_impl()
-                    ->at(0)
-                    ->render_surface()
-                    ->layer_list()
-                    .size());
+  EXPECT_EQ(1u,
+            render_surface_layer_list_impl()
+                ->at(0)
+                ->GetRenderSurface()
+                ->layer_list()
+                .size());
 }
 
 TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleLayers) {
@@ -6265,10 +6268,11 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(1u, render_surface_layer_list_impl()->size());
-  EXPECT_EQ(grand_child, render_surface_layer_list_impl()
-                             ->at(0)
-                             ->render_surface()
-                             ->layer_list()[0]);
+  EXPECT_EQ(grand_child,
+            render_surface_layer_list_impl()
+                ->at(0)
+                ->GetRenderSurface()
+                ->layer_list()[0]);
 
   // As all layers have identity transform, we shouldn't check for backface
   // visibility.
@@ -6291,11 +6295,12 @@
 
   ExecuteCalculateDrawProperties(root);
   EXPECT_EQ(1u, render_surface_layer_list_impl()->size());
-  EXPECT_EQ(0u, render_surface_layer_list_impl()
-                    ->at(0)
-                    ->render_surface()
-                    ->layer_list()
-                    .size());
+  EXPECT_EQ(0u,
+            render_surface_layer_list_impl()
+                ->at(0)
+                ->GetRenderSurface()
+                ->layer_list()
+                .size());
 
   // We should check for backface visibilty of child as it has a rotation
   // transform. We should also check for grand_child as it uses the backface
@@ -6317,11 +6322,12 @@
 
   ExecuteCalculateDrawProperties(root);
   EXPECT_EQ(1u, render_surface_layer_list_impl()->size());
-  EXPECT_EQ(0u, render_surface_layer_list_impl()
-                    ->at(0)
-                    ->render_surface()
-                    ->layer_list()
-                    .size());
+  EXPECT_EQ(0u,
+            render_surface_layer_list_impl()
+                ->at(0)
+                ->GetRenderSurface()
+                ->layer_list()
+                .size());
 
   // We should check the backface visibility of child as it has a rotation
   // transform and for grand_child as it is in a 3d rendering context and not
@@ -6425,7 +6431,7 @@
   scroll_child->SetBounds(gfx::Size(50, 50));
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
 
   EXPECT_EQ(gfx::Rect(0, 0, 30, 30), scroll_child->clip_rect());
   EXPECT_TRUE(scroll_child->is_clipped());
@@ -6597,7 +6603,7 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
 
   EXPECT_EQ(gfx::Rect(0, 0, 30, 30), scroll_child->clip_rect());
   EXPECT_TRUE(scroll_child->is_clipped());
@@ -6655,17 +6661,17 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
 
   EXPECT_EQ(gfx::Rect(0, 0, 20, 20), scroll_child->clip_rect());
   EXPECT_TRUE(scroll_child->is_clipped());
 
   // Despite the fact that we visited the above layers out of order to get the
   // correct clip, the layer lists should be unaffected.
-  EXPECT_EQ(3u, root->render_surface()->layer_list().size());
-  EXPECT_EQ(scroll_child, root->render_surface()->layer_list().at(0));
-  EXPECT_EQ(scroll_parent, root->render_surface()->layer_list().at(1));
-  EXPECT_EQ(scroll_grandparent, root->render_surface()->layer_list().at(2));
+  EXPECT_EQ(3u, root->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(scroll_child, root->GetRenderSurface()->layer_list().at(0));
+  EXPECT_EQ(scroll_parent, root->GetRenderSurface()->layer_list().at(1));
+  EXPECT_EQ(scroll_grandparent, root->GetRenderSurface()->layer_list().at(2));
 }
 
 TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
@@ -6732,7 +6738,7 @@
 
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
 
   EXPECT_EQ(gfx::Rect(0, 0, 20, 20), scroll_child->clip_rect());
   EXPECT_TRUE(scroll_child->is_clipped());
@@ -6743,9 +6749,9 @@
   EXPECT_EQ(root, render_surface_layer_list_impl()->at(0));
   EXPECT_EQ(render_surface2, render_surface_layer_list_impl()->at(1));
   EXPECT_EQ(render_surface1, render_surface_layer_list_impl()->at(2));
-  EXPECT_TRUE(render_surface_layer_list_impl()->at(0)->render_surface());
-  EXPECT_TRUE(render_surface_layer_list_impl()->at(1)->render_surface());
-  EXPECT_TRUE(render_surface_layer_list_impl()->at(2)->render_surface());
+  EXPECT_TRUE(render_surface_layer_list_impl()->at(0)->GetRenderSurface());
+  EXPECT_TRUE(render_surface_layer_list_impl()->at(1)->GetRenderSurface());
+  EXPECT_TRUE(render_surface_layer_list_impl()->at(2)->GetRenderSurface());
 }
 
 TEST_F(LayerTreeHostCommonTest, FixedPositionWithInterveningRenderSurface) {
@@ -8272,8 +8278,8 @@
     if (!it.represents_contributing_render_surface())
       continue;
 
-    if (layer->render_surface()->MaskLayer())
-      drawn_layers->insert(layer->render_surface()->MaskLayer());
+    if (layer->GetRenderSurface()->MaskLayer())
+      drawn_layers->insert(layer->GetRenderSurface()->MaskLayer());
   }
 }
 
@@ -9000,9 +9006,9 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(1.f, child->Opacity());
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_TRUE(child->has_render_surface());
-  EXPECT_FALSE(grandchild->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(child->GetRenderSurface());
+  EXPECT_FALSE(grandchild->GetRenderSurface());
 }
 
 // Verify that having an animated filter (but no current filter, as these
@@ -9021,12 +9027,12 @@
                                        10.0, 0.1f, 0.2f);
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_TRUE(child->has_render_surface());
-  EXPECT_FALSE(grandchild->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(child->GetRenderSurface());
+  EXPECT_FALSE(grandchild->GetRenderSurface());
 
-  EXPECT_TRUE(root->render_surface()->Filters().IsEmpty());
-  EXPECT_TRUE(child->render_surface()->Filters().IsEmpty());
+  EXPECT_TRUE(root->GetRenderSurface()->Filters().IsEmpty());
+  EXPECT_TRUE(child->GetRenderSurface()->Filters().IsEmpty());
 
   EXPECT_FALSE(root->FilterIsAnimating());
   EXPECT_TRUE(child->FilterIsAnimating());
@@ -9065,12 +9071,12 @@
                                   std::move(animation));
   ExecuteCalculateDrawProperties(root);
 
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_TRUE(child->has_render_surface());
-  EXPECT_FALSE(grandchild->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_TRUE(child->GetRenderSurface());
+  EXPECT_FALSE(grandchild->GetRenderSurface());
 
-  EXPECT_TRUE(root->render_surface()->Filters().IsEmpty());
-  EXPECT_TRUE(child->render_surface()->Filters().IsEmpty());
+  EXPECT_TRUE(root->GetRenderSurface()->Filters().IsEmpty());
+  EXPECT_TRUE(child->GetRenderSurface()->Filters().IsEmpty());
 
   EXPECT_FALSE(root->FilterIsAnimating());
   EXPECT_FALSE(root->HasPotentiallyRunningFilterAnimation());
@@ -9790,11 +9796,11 @@
       transform_tree.Node(significant_transform->transform_tree_index());
   EXPECT_EQ(transform_node->owning_layer_id, significant_transform->id());
 
-  EXPECT_TRUE(root->has_render_surface());
-  EXPECT_FALSE(significant_transform->has_render_surface());
-  EXPECT_TRUE(layer_clips_subtree->has_render_surface());
-  EXPECT_TRUE(render_surface->has_render_surface());
-  EXPECT_FALSE(test_layer->has_render_surface());
+  EXPECT_TRUE(root->GetRenderSurface());
+  EXPECT_FALSE(significant_transform->GetRenderSurface());
+  EXPECT_TRUE(layer_clips_subtree->GetRenderSurface());
+  EXPECT_TRUE(render_surface->GetRenderSurface());
+  EXPECT_FALSE(test_layer->GetRenderSurface());
 
   ClipTree& clip_tree = root->layer_tree_impl()->property_trees()->clip_tree;
   ClipNode* clip_node = clip_tree.Node(render_surface->clip_tree_index());
@@ -10005,13 +10011,13 @@
 
   ExecuteCalculateDrawProperties(root);
   EXPECT_EQ(gfx::Rect(50, 50),
-            unclipped_surface->render_surface()->content_rect());
+            unclipped_surface->GetRenderSurface()->content_rect());
   EXPECT_EQ(gfx::Rect(50, 50),
-            unclipped_desc_surface->render_surface()->content_rect());
+            unclipped_desc_surface->GetRenderSurface()->content_rect());
   EXPECT_EQ(gfx::Rect(50, 50),
-            unclipped_desc_surface2->render_surface()->content_rect());
+            unclipped_desc_surface2->GetRenderSurface()->content_rect());
   EXPECT_EQ(gfx::Rect(50, 50),
-            clipped_surface->render_surface()->content_rect());
+            clipped_surface->GetRenderSurface()->content_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, ClipBetweenClipChildTargetAndClipParentTarget) {
@@ -10053,7 +10059,7 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(gfx::Rect(10, 10),
-            unclipped_desc_surface->render_surface()->content_rect());
+            unclipped_desc_surface->GetRenderSurface()->content_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, VisibleRectForDescendantOfScaledSurface) {
@@ -10131,6 +10137,9 @@
   unclipped_desc_surface->test_properties()->force_render_surface = true;
   clip_child->SetBounds(gfx::Size(100, 100));
   clip_child->SetDrawsContent(true);
+  gfx::Transform translate;
+  translate.Translate(10, 10);
+  unclipped_desc_surface->test_properties()->transform = translate;
 
   clip_child->test_properties()->clip_parent = clip_parent;
   clip_parent->test_properties()->clip_children =
@@ -10139,13 +10148,13 @@
 
   float device_scale_factor = 1.f;
   ExecuteCalculateDrawProperties(root, device_scale_factor);
-  EXPECT_EQ(gfx::Rect(20, 20), clip_child->clip_rect());
-  EXPECT_EQ(gfx::Rect(20, 20), clip_child->visible_layer_rect());
+  EXPECT_EQ(gfx::Rect(-10, -10, 20, 20), clip_child->clip_rect());
+  EXPECT_EQ(gfx::Rect(10, 10), clip_child->visible_layer_rect());
 
   device_scale_factor = 2.f;
   ExecuteCalculateDrawProperties(root, device_scale_factor);
-  EXPECT_EQ(gfx::Rect(40, 40), clip_child->clip_rect());
-  EXPECT_EQ(gfx::Rect(20, 20), clip_child->visible_layer_rect());
+  EXPECT_EQ(gfx::Rect(-20, -20, 40, 40), clip_child->clip_rect());
+  EXPECT_EQ(gfx::Rect(10, 10), clip_child->visible_layer_rect());
 }
 
 TEST_F(LayerTreeHostCommonTest, ClipChildVisibleRect) {
@@ -10401,7 +10410,7 @@
   ExecuteCalculateDrawProperties(root);
 
   EXPECT_EQ(gfx::RectF(),
-            render_surface1->render_surface()->DrawableContentRect());
+            render_surface1->GetRenderSurface()->DrawableContentRect());
 
   bool is_inf_or_nan = std::isinf(child->DrawTransform().matrix().get(0, 0)) ||
                        std::isnan(child->DrawTransform().matrix().get(0, 0));
@@ -10687,7 +10696,7 @@
   scroll_parent2.scroll_clip_layer_bounds = root1->bounds();
   scroll_parent2.bounds = parent2->bounds();
   scroll_parent2.max_scroll_offset_affected_by_page_scale = true;
-  scroll_parent2.is_inner_viewport_scroll_layer = true;
+  scroll_parent2.scrolls_inner_viewport = true;
   scroll_parent2.user_scrollable_horizontal = true;
   scroll_parent2.user_scrollable_vertical = true;
   scroll_parent2.transform_id = parent2->transform_tree_index();

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 234ad1d..132616e 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc

@@ -693,7 +693,8 @@
   for (size_t i = 0; i < render_surface_layer_list_size; ++i) {
     size_t surface_index = render_surface_layer_list_size - 1 - i;
     LayerImpl* render_surface_layer = render_surface_layer_list[surface_index];
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
     DCHECK(render_surface);
     render_surface->damage_tracker()->UpdateDamageTrackingState(
         render_surface->layer_list(), render_surface,
@@ -832,7 +833,8 @@
     size_t surface_index = render_surface_layer_list_size - 1 - i;
     LayerImpl* render_surface_layer =
         (*frame->render_surface_layer_list)[surface_index];
-    RenderSurfaceImpl* render_surface = render_surface_layer->render_surface();
+    RenderSurfaceImpl* render_surface =
+        render_surface_layer->GetRenderSurface();
 
     bool should_draw_into_render_pass =
         active_tree_->IsRootLayer(render_surface_layer) ||
@@ -892,13 +894,13 @@
            LayerIterator::Begin(frame->render_surface_layer_list);
        it != end; ++it) {
     auto target_render_pass_id =
-        it.target_render_surface_layer()->render_surface()->GetRenderPassId();
+        it.target_render_surface_layer()->GetRenderSurface()->GetRenderPassId();
     RenderPass* target_render_pass =
         FindRenderPassById(frame->render_passes, target_render_pass_id);
 
     AppendQuadsData append_quads_data;
 
-    RenderSurfaceImpl* render_surface = it->render_surface();
+    RenderSurfaceImpl* render_surface = it->GetRenderSurface();
     if (it.represents_target_render_surface()) {
       if (render_surface->HasCopyRequest()) {
         active_tree()
@@ -1719,7 +1721,7 @@
   // TODO(boliu): If we did a temporary software renderer frame, propogate the
   // damage forward to the next frame.
   for (size_t i = 0; i < frame->render_surface_layer_list->size(); i++) {
-    auto* surface = (*frame->render_surface_layer_list)[i]->render_surface();
+    auto* surface = (*frame->render_surface_layer_list)[i]->GetRenderSurface();
     surface->damage_tracker()->DidDrawDamagedArea();
   }
   active_tree_->ResetAllChangeTracking();
@@ -2600,11 +2602,9 @@
   // notifications. We use the viewport's main scroll layer to represent the
   // viewport in scrolling code.
   bool scrolls_inner_viewport =
-      impl_scroll_node && InnerViewportScrollLayer() &&
-      InnerViewportScrollLayer()->scroll_tree_index() == impl_scroll_node->id;
+      impl_scroll_node && impl_scroll_node->scrolls_inner_viewport;
   bool scrolls_outer_viewport =
-      impl_scroll_node && OuterViewportScrollLayer() &&
-      OuterViewportScrollLayer()->scroll_tree_index() == impl_scroll_node->id;
+      impl_scroll_node && impl_scroll_node->scrolls_outer_viewport;
   if (!impl_scroll_node || scrolls_inner_viewport || scrolls_outer_viewport) {
     if (auto* mainScrollLayer = viewport()->MainScrollLayer())
       impl_scroll_node = scroll_tree.Node(mainScrollLayer->scroll_tree_index());
@@ -3048,11 +3048,9 @@
   // element that's not a descendant of the document.rootScroller. In that case
   // we want to scroll the inner viewport -- to allow panning while zoomed --
   // but also move browser controls if needed.
-  bool scrolls_inner_viewport_layer =
-      InnerViewportScrollLayer() &&
-      InnerViewportScrollLayer()->scroll_tree_index() == scroll_node->id;
+  bool scrolls_inner_viewport = scroll_node->scrolls_inner_viewport;
 
-  if (scrolls_main_viewport_scroll_layer || scrolls_inner_viewport_layer) {
+  if (scrolls_main_viewport_scroll_layer || scrolls_inner_viewport) {
     Viewport::ScrollResult result = viewport()->ScrollBy(
         delta, viewport_point, scroll_state->is_direct_manipulation(),
         !wheel_scrolling_, scrolls_main_viewport_scroll_layer);
@@ -3078,7 +3076,7 @@
     return;
   }
 
-  if (!scrolls_main_viewport_scroll_layer && !scrolls_inner_viewport_layer) {
+  if (!scrolls_main_viewport_scroll_layer && !scrolls_inner_viewport) {
     // If the applied delta is within 45 degrees of the input
     // delta, bail out to make it easier to scroll just one layer
     // in one direction without affecting any of its parents.

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 81c7bb0..a82de3169 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -3615,8 +3615,8 @@
   EXPECT_TRUE(layer1->did_draw_called());
   EXPECT_TRUE(layer2->did_draw_called());
 
-  EXPECT_NE(root->render_surface(), layer1->render_surface());
-  EXPECT_TRUE(layer1->render_surface());
+  EXPECT_NE(root->GetRenderSurface(), layer1->GetRenderSurface());
+  EXPECT_TRUE(layer1->GetRenderSurface());
 }
 
 class MissingTextureAnimatingLayer : public DidDrawCheckLayer {
@@ -6887,7 +6887,7 @@
                                     gfx::Size(1, 1), false, false);
     test_blending_draw_quad->visible_rect = quad_visible_rect_;
     EXPECT_EQ(blend_, test_blending_draw_quad->ShouldDrawWithBlending());
-    EXPECT_EQ(has_render_surface_, !!render_surface());
+    EXPECT_EQ(has_render_surface_, !!GetRenderSurface());
   }
 
   void SetExpectation(bool blend, bool has_render_surface) {

diff --git a/cc/trees/layer_tree_host_pixeltest_filters.cc b/cc/trees/layer_tree_host_pixeltest_filters.cc
index 5190efd4..1f5f2b7 100644
--- a/cc/trees/layer_tree_host_pixeltest_filters.cc
+++ b/cc/trees/layer_tree_host_pixeltest_filters.cc

@@ -770,11 +770,11 @@
     // This is intended to test render pass removal optimizations.
     FakeContentLayerClient client;
     client.set_bounds(child_rect.size());
-    SkPaint paint;
-    paint.setColor(SK_ColorGREEN);
-    client.add_draw_rect(child_rect, paint);
-    paint.setColor(SK_ColorBLUE);
-    client.add_draw_rect(gfx::Rect(100, 50), paint);
+    PaintFlags flags;
+    flags.setColor(SK_ColorGREEN);
+    client.add_draw_rect(child_rect, flags);
+    flags.setColor(SK_ColorBLUE);
+    client.add_draw_rect(gfx::Rect(100, 50), flags);
     scoped_refptr<PictureLayer> child = PictureLayer::Create(&client);
     child->SetBounds(child_rect.size());
     child->SetIsDrawable(true);

diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
index 0f49bc7b..bd43e52f 100644
--- a/cc/trees/layer_tree_host_pixeltest_masks.cc
+++ b/cc/trees/layer_tree_host_pixeltest_masks.cc

@@ -103,7 +103,7 @@
   mask->SetBounds(mask_bounds);
 
   sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(200, 200);
-  PaintCanvas* canvas = surface->getCanvas();
+  SkCanvas* canvas = surface->getCanvas();
   canvas->scale(SkIntToScalar(4), SkIntToScalar(4));
   MaskContentLayerClient client(mask_bounds);
   scoped_refptr<DisplayItemList> mask_display_list =

diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index ac7202f..e5f4583 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc

@@ -1065,29 +1065,29 @@
     LayerImpl* child_impl = impl->active_tree()->LayerById(child_->id());
     switch (impl->active_tree()->source_frame_number()) {
       case 0:
-        EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
-        EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         EndTest();
         PostSetNeedsCommitToMainThread();
         break;
       case 4:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         EndTest();
         break;
     }
@@ -1518,13 +1518,13 @@
         index_++;
         EXPECT_FALSE(impl->sync_tree()
                          ->root_layer_for_testing()
-                         ->render_surface()
+                         ->GetRenderSurface()
                          ->MaskLayer());
         break;
       case 1:
         EXPECT_TRUE(impl->sync_tree()
                         ->root_layer_for_testing()
-                        ->render_surface()
+                        ->GetRenderSurface()
                         ->MaskLayer());
         EndTest();
         break;
@@ -2615,12 +2615,13 @@
 
     // Both layers should be drawing into the root render surface.
     ASSERT_EQ(1u, render_surface_layer_list.size());
-    ASSERT_EQ(root->render_surface(),
-              render_surface_layer_list[0]->render_surface());
-    ASSERT_EQ(2u, root->render_surface()->layer_list().size());
+    ASSERT_EQ(root->GetRenderSurface(),
+              render_surface_layer_list[0]->GetRenderSurface());
+    ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
 
     // The root render surface is the size of the viewport.
-    EXPECT_EQ(gfx::Rect(0, 0, 60, 60), root->render_surface()->content_rect());
+    EXPECT_EQ(gfx::Rect(0, 0, 60, 60),
+              root->GetRenderSurface()->content_rect());
 
     // The max tiling scale of the child should be scaled.
     EXPECT_FLOAT_EQ(1.5f, child->MaximumTilingContentsScale());
@@ -5584,7 +5585,7 @@
       LayerImpl* grand_child_impl =
           host_impl->sync_tree()->LayerById(grand_child_->id());
       EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                grand_child_impl->render_surface()->EffectTreeIndex());
+                grand_child_impl->GetRenderSurface()->EffectTreeIndex());
     }
   }
 
@@ -5598,12 +5599,12 @@
       case 1:
       case 2:
         EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                  grand_child_impl->render_surface()->EffectTreeIndex());
+                  grand_child_impl->GetRenderSurface()->EffectTreeIndex());
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                  grand_child_impl->render_surface()->EffectTreeIndex());
+                  grand_child_impl->GetRenderSurface()->EffectTreeIndex());
         EndTest();
     }
   }

diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index fddf0ce..5873138c 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc

@@ -55,7 +55,7 @@
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        impl->active_tree()->root_layer_for_testing()->render_surface();
+        impl->active_tree()->root_layer_for_testing()->GetRenderSurface();
     gfx::Rect root_damage;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&root_damage));
@@ -118,7 +118,7 @@
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        impl->active_tree()->root_layer_for_testing()->render_surface();
+        impl->active_tree()->root_layer_for_testing()->GetRenderSurface();
     gfx::Rect root_damage;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&root_damage));
@@ -260,7 +260,7 @@
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
 
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer_for_testing()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->GetRenderSurface();
     gfx::Rect root_damage;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&root_damage));
@@ -386,7 +386,7 @@
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer_for_testing()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->GetRenderSurface();
     gfx::Rect root_damage;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&root_damage));
@@ -471,7 +471,7 @@
                                    DrawResult draw_result) override {
     EXPECT_EQ(DRAW_SUCCESS, draw_result);
     RenderSurfaceImpl* root_surface =
-        host_impl->active_tree()->root_layer_for_testing()->render_surface();
+        host_impl->active_tree()->root_layer_for_testing()->GetRenderSurface();
     gfx::Rect root_damage;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&root_damage));

diff --git a/cc/trees/layer_tree_host_unittest_occlusion.cc b/cc/trees/layer_tree_host_unittest_occlusion.cc
index 3cc21929..3202bb9 100644
--- a/cc/trees/layer_tree_host_unittest_occlusion.cc
+++ b/cc/trees/layer_tree_host_unittest_occlusion.cc

@@ -106,13 +106,13 @@
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer_for_testing();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    RenderSurfaceImpl* surface = child->render_surface();
+    RenderSurfaceImpl* surface = child->GetRenderSurface();
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
-    EXPECT_TRUE(child->has_render_surface());
-    EXPECT_EQ(child->render_surface(), child->render_target());
+    EXPECT_TRUE(child->GetRenderSurface());
+    EXPECT_EQ(child->GetRenderSurface(), child->render_target());
 
     EXPECT_OCCLUSION_EQ(
         Occlusion(surface->draw_transform(), SimpleEnclosedRegion(),
@@ -173,14 +173,14 @@
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer_for_testing();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    RenderSurfaceImpl* surface = child->render_surface();
+    RenderSurfaceImpl* surface = child->GetRenderSurface();
     LayerImpl* mask = surface->MaskLayer();
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
-    EXPECT_TRUE(child->has_render_surface());
-    EXPECT_EQ(child->render_surface(), child->render_target());
+    EXPECT_TRUE(child->GetRenderSurface());
+    EXPECT_EQ(child->GetRenderSurface(), child->render_target());
 
     gfx::Transform transform = surface->draw_transform();
     transform.PreconcatTransform(child->DrawTransform());
@@ -245,7 +245,7 @@
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    LayerImpl* mask = child->render_surface()->MaskLayer();
+    LayerImpl* mask = child->GetRenderSurface()->MaskLayer();
 
     gfx::Transform scale;
     scale.Scale(2, 2);

diff --git a/cc/trees/layer_tree_host_unittest_video.cc b/cc/trees/layer_tree_host_unittest_video.cc
index 51e90ce..ae48abaa 100644
--- a/cc/trees/layer_tree_host_unittest_video.cc
+++ b/cc/trees/layer_tree_host_unittest_video.cc

@@ -48,7 +48,7 @@
                                    LayerTreeHostImpl::FrameData* frame,
                                    DrawResult draw_result) override {
     LayerImpl* root_layer = host_impl->active_tree()->root_layer_for_testing();
-    RenderSurfaceImpl* root_surface = root_layer->render_surface();
+    RenderSurfaceImpl* root_surface = root_layer->GetRenderSurface();
     gfx::Rect damage_rect;
     EXPECT_TRUE(
         root_surface->damage_tracker()->GetDamageRectIfValid(&damage_rect));

diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index dad33f4..5d91fc7 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc

@@ -277,7 +277,7 @@
 }
 
 RenderSurfaceImpl* LayerTreeImpl::RootRenderSurface() const {
-  return layer_list_.empty() ? nullptr : layer_list_[0]->render_surface();
+  return layer_list_.empty() ? nullptr : layer_list_[0]->GetRenderSurface();
 }
 
 bool LayerTreeImpl::LayerListIsEmpty() const {
@@ -1049,7 +1049,7 @@
                  "IsActive", IsActiveTree(), "SourceFrameNumber",
                  source_frame_number_);
     OcclusionTracker occlusion_tracker(
-        layer_list_[0]->render_surface()->content_rect());
+        layer_list_[0]->GetRenderSurface()->content_rect());
     occlusion_tracker.set_minimum_tracking_size(
         settings().minimum_occlusion_tracking_size);
 
@@ -1070,7 +1070,7 @@
         const RenderSurfaceImpl* occlusion_surface =
             occlusion_tracker.OcclusionSurfaceForContributingSurface();
         gfx::Transform draw_transform;
-        RenderSurfaceImpl* render_surface = it->render_surface();
+        RenderSurfaceImpl* render_surface = it->GetRenderSurface();
         if (occlusion_surface) {
           // We are calculating transform between two render surfaces. So, we
           // need to apply the surface contents scale at target and remove the
@@ -1793,7 +1793,7 @@
     const LayerImpl* layer) {
   const PropertyTrees* property_trees =
       layer->layer_tree_impl()->property_trees();
-  RenderSurfaceImpl* render_surface = layer->render_surface();
+  RenderSurfaceImpl* render_surface = layer->GetRenderSurface();
   DCHECK(render_surface);
   return layer->is_drawn_render_surface_layer_list_member()
              ? render_surface->screen_space_transform()
@@ -1838,7 +1838,7 @@
     }
     const LayerImpl* clip_node_owner =
         layer->layer_tree_impl()->LayerById(clip_node->owning_layer_id);
-    RenderSurfaceImpl* render_surface = clip_node_owner->render_surface();
+    RenderSurfaceImpl* render_surface = clip_node_owner->GetRenderSurface();
     if (render_surface &&
         !PointHitsRect(screen_space_point,
                        SurfaceScreenSpaceTransform(clip_node_owner),

diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 0b13432..81d2800c 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc

@@ -136,7 +136,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::PointF test_point(101.f, 101.f);
@@ -205,7 +205,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(2u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, root_layer()->GetRenderSurface()->layer_list().size());
 
   // Hit testing for a point inside HUD, but outside root should return null
   gfx::PointF test_point(101.f, 101.f);
@@ -257,7 +257,7 @@
       skip_verify_visible_rect_calculations);
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
   ASSERT_FALSE(root_layer()->ScreenSpaceTransform().IsInvertible());
 
   // Hit testing any point should not hit the layer. If the invertible matrix is
@@ -312,7 +312,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::PointF test_point(49.f, 49.f);
@@ -357,7 +357,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
 
   // Hit testing for points outside the layer.
   // These corners would have been inside the un-transformed layer, but they
@@ -529,7 +529,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
 
   // Hit testing for points outside the layer.
   // These corners would have been inside the un-transformed layer, but they
@@ -587,8 +587,8 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
-  ASSERT_EQ(456, root_layer()->render_surface()->layer_list().at(0)->id());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(456, root_layer()->GetRenderSurface()->layer_list().at(0)->id());
 
   // Hit testing for a point outside the layer should return a null pointer.
   // Despite the child layer being very large, it should be clipped to the root
@@ -766,8 +766,8 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
-  ASSERT_EQ(456, root_layer()->render_surface()->layer_list().at(0)->id());
+  ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(456, root_layer()->GetRenderSurface()->layer_list().at(0)->id());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::PointF test_point(69.f, 69.f);
@@ -847,7 +847,7 @@
   ASSERT_TRUE(grand_child1);
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
 
-  RenderSurfaceImpl* root_render_surface = root->render_surface();
+  RenderSurfaceImpl* root_render_surface = root->GetRenderSurface();
   ASSERT_EQ(4u, root_render_surface->layer_list().size());
   ASSERT_EQ(1, root_render_surface->layer_list().at(0)->id());  // root layer
   ASSERT_EQ(2, root_render_surface->layer_list().at(1)->id());  // child1
@@ -1194,17 +1194,17 @@
   ASSERT_TRUE(child1);
   ASSERT_TRUE(child2);
   ASSERT_TRUE(grand_child1);
-  ASSERT_TRUE(child1->render_surface());
-  ASSERT_TRUE(child2->render_surface());
-  ASSERT_TRUE(grand_child1->render_surface());
+  ASSERT_TRUE(child1->GetRenderSurface());
+  ASSERT_TRUE(child2->GetRenderSurface());
+  ASSERT_TRUE(grand_child1->GetRenderSurface());
   ASSERT_EQ(4u, RenderSurfaceLayerList().size());
   // The root surface has the root layer, and child1's and child2's render
   // surfaces.
-  ASSERT_EQ(3u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(3u, root->GetRenderSurface()->layer_list().size());
   // The child1 surface has the child1 layer and grand_child1's render surface.
-  ASSERT_EQ(2u, child1->render_surface()->layer_list().size());
-  ASSERT_EQ(1u, child2->render_surface()->layer_list().size());
-  ASSERT_EQ(1u, grand_child1->render_surface()->layer_list().size());
+  ASSERT_EQ(2u, child1->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(1u, child2->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(1u, grand_child1->GetRenderSurface()->layer_list().size());
   ASSERT_EQ(1, RenderSurfaceLayerList().at(0)->id());  // root layer
   ASSERT_EQ(2, RenderSurfaceLayerList()[1]->id());     // child1
   ASSERT_EQ(4, RenderSurfaceLayerList().at(2)->id());  // grand_child1
@@ -1270,7 +1270,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
 
   // Hit checking for any point should return a null pointer for a layer without
   // any touch event handler regions.
@@ -1354,7 +1354,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
   ASSERT_FALSE(root->ScreenSpaceTransform().IsInvertible());
 
   // Hit checking any point should not hit the touch handler region on the
@@ -1421,7 +1421,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
 
   // Hit checking for a point outside the layer should return a null pointer.
   gfx::PointF test_point(49.f, 49.f);
@@ -1506,7 +1506,7 @@
   // its layout size is 50x50, positioned at 25x25.
   LayerImpl* test_layer = root->test_properties()->children[0];
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
 
   // Check whether the child layer fits into the root after scaled.
   EXPECT_EQ(gfx::Rect(test_layer->bounds()), test_layer->visible_layer_rect());
@@ -1633,8 +1633,8 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
-  ASSERT_EQ(456, root->render_surface()->layer_list().at(0)->id());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(456, root->GetRenderSurface()->layer_list().at(0)->id());
 
   // Hit checking for a point outside the layer should return a null pointer.
   // Despite the child layer being very large, it should be clipped to the root
@@ -1786,9 +1786,9 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(2u, root->render_surface()->layer_list().size());
-  ASSERT_EQ(123, root->render_surface()->layer_list().at(0)->id());
-  ASSERT_EQ(1234, root->render_surface()->layer_list().at(1)->id());
+  ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(123, root->GetRenderSurface()->layer_list().at(0)->id());
+  ASSERT_EQ(1234, root->GetRenderSurface()->layer_list().at(1)->id());
 
   gfx::PointF test_point(35.f, 35.f);
   LayerImpl* result_layer =
@@ -1844,7 +1844,7 @@
   // As test_layer doesn't draw content, the layer list of root's render surface
   // should contain only the root layer.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
 
   // Hit testing for a point outside the test layer should return null pointer.
   // We also implicitly check that the updated screen space transform of a layer
@@ -1902,7 +1902,7 @@
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(1u, root->render_surface()->layer_list().size());
+  ASSERT_EQ(1u, root->GetRenderSurface()->layer_list().size());
 
   LayerSelection input;
 

diff --git a/cc/trees/occlusion_tracker.cc b/cc/trees/occlusion_tracker.cc
index 7db0e99..78f5cc66 100644
--- a/cc/trees/occlusion_tracker.cc
+++ b/cc/trees/occlusion_tracker.cc

@@ -118,8 +118,8 @@
 }
 
 void OcclusionTracker::EnterRenderTarget(const LayerImpl* new_target) {
-  DCHECK(new_target->has_render_surface());
-  RenderSurfaceImpl* new_target_surface = new_target->render_surface();
+  DCHECK(new_target->GetRenderSurface());
+  RenderSurfaceImpl* new_target_surface = new_target->GetRenderSurface();
   if (!stack_.empty() && stack_.back().target == new_target_surface)
     return;
 
@@ -181,7 +181,7 @@
   // Make sure we know about the target surface.
   EnterRenderTarget(finished_target);
 
-  RenderSurfaceImpl* surface = finished_target->render_surface();
+  RenderSurfaceImpl* surface = finished_target->GetRenderSurface();
 
   // Readbacks always happen on render targets so we only need to check
   // for readbacks here.
@@ -255,8 +255,8 @@
 void OcclusionTracker::LeaveToRenderTarget(const LayerImpl* new_target) {
   DCHECK(!stack_.empty());
   size_t last_index = stack_.size() - 1;
-  DCHECK(new_target->has_render_surface());
-  RenderSurfaceImpl* new_surface = new_target->render_surface();
+  DCHECK(new_target->GetRenderSurface());
+  RenderSurfaceImpl* new_surface = new_target->GetRenderSurface();
   bool surface_will_be_at_top_after_pop =
       stack_.size() > 1 && stack_[last_index - 1].target == new_surface;
 

diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 8c3120d8..2e0d1b6 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc

@@ -77,7 +77,7 @@
 
   gfx::Rect UnoccludedSurfaceContentRect(const LayerImpl* layer,
                                          const gfx::Rect& content_rect) const {
-    RenderSurfaceImpl* surface = layer->render_surface();
+    RenderSurfaceImpl* surface = layer->GetRenderSurface();
     return this->GetCurrentOcclusionForContributingSurface(
                      surface->draw_transform())
         .GetUnoccludedContentRect(content_rect);

diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index 577903d..af6e451 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc

@@ -1209,7 +1209,7 @@
   gfx::SizeF scroll_bounds =
       gfx::SizeF(scroll_node->bounds.width(), scroll_node->bounds.height());
 
-  if (scroll_node->is_inner_viewport_scroll_layer) {
+  if (scroll_node->scrolls_inner_viewport) {
     scroll_bounds.Enlarge(
         property_trees()->inner_viewport_scroll_bounds_delta().x(),
         property_trees()->inner_viewport_scroll_bounds_delta().y());
@@ -1259,10 +1259,10 @@
   gfx::Size scroll_clip_layer_bounds = scroll_node->scroll_clip_layer_bounds;
 
   gfx::Vector2dF scroll_clip_layer_bounds_delta;
-  if (scroll_node->is_inner_viewport_scroll_layer) {
+  if (scroll_node->scrolls_inner_viewport) {
     scroll_clip_layer_bounds_delta.Add(
         property_trees()->inner_viewport_container_bounds_delta());
-  } else if (scroll_node->is_outer_viewport_scroll_layer) {
+  } else if (scroll_node->scrolls_outer_viewport) {
     scroll_clip_layer_bounds_delta.Add(
         property_trees()->outer_viewport_container_bounds_delta());
   }
@@ -2120,20 +2120,4 @@
   return screen_space_transform;
 }
 
-bool PropertyTrees::ComputeTransformFromTarget(
-    int transform_id,
-    int effect_id,
-    gfx::Transform* transform) const {
-  transform->MakeIdentity();
-  if (transform_id == TransformTree::kInvalidNodeId)
-    return true;
-
-  const EffectNode* effect_node = effect_tree.Node(effect_id);
-
-  bool success = GetFromTarget(transform_id, effect_id, transform);
-  transform->Scale(effect_node->surface_contents_scale.x(),
-                   effect_node->surface_contents_scale.y());
-  return success;
-}
-
 }  // namespace cc

diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index e392a0b..8c9d158 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h

@@ -654,10 +654,6 @@
       int transform_id,
       int effect_id) const;
 
-  bool ComputeTransformFromTarget(int transform_id,
-                                  int effect_id,
-                                  gfx::Transform* transform) const;
-
  private:
   gfx::Vector2dF inner_viewport_container_bounds_delta_;
   gfx::Vector2dF outer_viewport_container_bounds_delta_;

diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index af02c5f..d620e0f 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc

@@ -751,10 +751,10 @@
       // need to have their local transform updated when the inner / outer
       // viewport bounds change, but do not unconditionally move by that delta
       // like fixed position nodes.
-      if (scroll_ancestor->is_inner_viewport_scroll_layer) {
+      if (scroll_ancestor->scrolls_inner_viewport) {
         data_for_children->property_trees->transform_tree
             .AddNodeAffectedByInnerViewportBoundsDelta(node->id);
-      } else if (scroll_ancestor->is_outer_viewport_scroll_layer) {
+      } else if (scroll_ancestor->scrolls_outer_viewport) {
         data_for_children->property_trees->transform_tree
             .AddNodeAffectedByOuterViewportBoundsDelta(node->id);
       }
@@ -1178,9 +1178,9 @@
     }
 
     node.scroll_clip_layer_bounds = clip_bounds;
-    node.is_inner_viewport_scroll_layer =
+    node.scrolls_inner_viewport =
         layer == data_from_ancestor.inner_viewport_scroll_layer;
-    node.is_outer_viewport_scroll_layer =
+    node.scrolls_outer_viewport =
         layer == data_from_ancestor.outer_viewport_scroll_layer;
 
     node.bounds = layer->bounds();

diff --git a/cc/trees/scroll_node.cc b/cc/trees/scroll_node.cc
index 18b5d42..ef3498a 100644
--- a/cc/trees/scroll_node.cc
+++ b/cc/trees/scroll_node.cc

@@ -21,8 +21,8 @@
           MainThreadScrollingReason::kNotScrollingOnMain),
       contains_non_fast_scrollable_region(false),
       max_scroll_offset_affected_by_page_scale(false),
-      is_inner_viewport_scroll_layer(false),
-      is_outer_viewport_scroll_layer(false),
+      scrolls_inner_viewport(false),
+      scrolls_outer_viewport(false),
       should_flatten(false),
       user_scrollable_horizontal(false),
       user_scrollable_vertical(false),
@@ -41,10 +41,8 @@
          bounds == other.bounds &&
          max_scroll_offset_affected_by_page_scale ==
              other.max_scroll_offset_affected_by_page_scale &&
-         is_inner_viewport_scroll_layer ==
-             other.is_inner_viewport_scroll_layer &&
-         is_outer_viewport_scroll_layer ==
-             other.is_outer_viewport_scroll_layer &&
+         scrolls_inner_viewport == other.scrolls_inner_viewport &&
+         scrolls_outer_viewport == other.scrolls_outer_viewport &&
          offset_to_transform_parent == other.offset_to_transform_parent &&
          should_flatten == other.should_flatten &&
          user_scrollable_horizontal == other.user_scrollable_horizontal &&

diff --git a/cc/trees/scroll_node.h b/cc/trees/scroll_node.h
index 3e4f4e9..19e29f4 100644
--- a/cc/trees/scroll_node.h
+++ b/cc/trees/scroll_node.h

@@ -47,8 +47,8 @@
   gfx::Size bounds;
 
   bool max_scroll_offset_affected_by_page_scale;
-  bool is_inner_viewport_scroll_layer;
-  bool is_outer_viewport_scroll_layer;
+  bool scrolls_inner_viewport;
+  bool scrolls_outer_viewport;
 
   // This offset is used when |scrollable| is false and there isn't a transform
   // node already present that covers this offset.

diff --git a/chrome/VERSION b/chrome/VERSION
index 933627eb..03c5666 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION

@@ -1,4 +1,4 @@
 MAJOR=58
 MINOR=0
-BUILD=3023
+BUILD=3025
 PATCH=0

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d85c1954..8dd229a5 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn

@@ -161,6 +161,7 @@
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//components/autofill/android:autofill_java",
+    "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/content/browser/android:dom_distiller_content_java",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
@@ -281,6 +282,7 @@
     "//chrome/browser/android/policy/policy_auditor.cc",
     "//chrome/browser/android/shortcut_info.h",
     "//chrome/browser/android/tab_android.h",
+    "//chrome/browser/android/webapk/chrome_webapk_host.h",
     "//chrome/browser/banners/app_banner_settings_helper.h",
     "//chrome/browser/notifications/notification_platform_bridge_android.cc",
     "//chrome/browser/ntp_snippets/ntp_snippets_metrics.h",
@@ -386,6 +388,8 @@
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",
+    "//components/background_task_scheduler:background_task_scheduler_java",
+    "//components/background_task_scheduler:background_task_scheduler_javatests",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
     "//components/gcm_driver/android:gcm_driver_java",

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index e3af3bb7..7667e2af 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml

@@ -780,6 +780,11 @@
             android:exported="false"
             android:permission="android.permission.BIND_JOB_SERVICE"/>
 
+        <!-- Background Task Scheduler job service -->
+        <service android:name="org.chromium.components.background_task_scheduler.BackgroundTaskJobService"
+            android:exported="false"
+            android:permission="android.permission.BIND_JOB_SERVICE"/>
+
         <!-- GcmTaskService implementation to wake Chrome on scheduled events -->
         <service android:name="org.chromium.chrome.browser.ChromeBackgroundService"
             android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"

diff --git a/chrome/android/java/res/OWNERS b/chrome/android/java/res/OWNERS
index 2ea0d4cbc..a2a58dc 100644
--- a/chrome/android/java/res/OWNERS
+++ b/chrome/android/java/res/OWNERS

@@ -10,3 +10,5 @@
 dgn@chromium.org
 mvanouwerkerk@chromium.org
 peconn@chromium.org
+
+# COMPONENT: UI>Browser>Mobile

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/OWNERS b/chrome/android/java/src/org/chromium/chrome/browser/compositor/OWNERS
index c0500c0..759e488f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/OWNERS
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/OWNERS

@@ -1,3 +1,5 @@
 changwan@chromium.org
 dtrainor@chromium.org
 mdjones@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>CompositedUI

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/OWNERS b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/OWNERS
index dc3518e..4b48d6e0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/OWNERS
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/OWNERS

@@ -1,3 +1,5 @@
 changwan@chromium.org
 dtrainor@chromium.org
 twellington@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>CompositedUI

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/OWNERS b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/OWNERS
index e31c9547..bdcbcd3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/OWNERS
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/OWNERS

@@ -3,3 +3,5 @@
 
 per-file ContextualSearchSceneLayer.java=donnd@chromium.org
 per-file ContextualSearchSceneLayer.java=twellington@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>CompositedUI

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index cdbb845f..3d1f078 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -143,6 +143,15 @@
             mConnection.notifyPageLoadMetric(mSession, PageLoadMetrics.FIRST_CONTENTFUL_PAINT,
                     navigationStartTick, firstContentfulPaintMs);
         }
+
+        @Override
+        public void onLoadEventStart(
+                WebContents webContents, long navigationStartTick, long loadEventStartMs) {
+            if (webContents != mTab.getWebContents()) return;
+
+            mConnection.notifyPageLoadMetric(mSession, PageLoadMetrics.LOAD_EVENT_START,
+                    navigationStartTick, loadEventStartMs);
+        }
     }
 
     private static class CustomTabCreator extends ChromeTabCreator {
@@ -540,6 +549,11 @@
                         mIntentDataProvider.isOpenedByChrome(),
                         getFullscreenManager().getBrowserVisibilityDelegate()),
                 false, false);
+
+        if (mIntentDataProvider.shouldEnableEmbeddedMediaExperience()) {
+            tab.enableEmbeddedMediaExperience(true);
+        }
+
         initializeMainTab(tab);
         return tab;
     }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
index d8d3459..8055c102 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -62,6 +62,10 @@
     public static final String EXTRA_MEDIA_VIEWER_URL =
             "org.chromium.chrome.browser.customtabs.MEDIA_VIEWER_URL";
 
+    /** Extra that enables embedded media experience. */
+    public static final String EXTRA_ENABLE_EMBEDDED_MEDIA_EXPERIENCE =
+            "org.chromium.chrome.browser.customtabs.EXTRA_ENABLE_EMBEDDED_MEDIA_EXPERIENCE";
+
     /** Indicates that the Custom Tab should style itself as an info page. */
     public static final String EXTRA_IS_INFO_PAGE =
             "org.chromium.chrome.browser.customtabs.IS_INFO_PAGE";
@@ -98,6 +102,7 @@
     private final int mTitleVisibilityState;
     private final boolean mIsMediaViewer;
     private final String mMediaViewerUrl;
+    private final boolean mEnableEmbeddedMediaExperience;
     private final boolean mIsInfoPage;
     private final int mInitialBackgroundColor;
     private final boolean mDisableStar;
@@ -185,6 +190,9 @@
                 && IntentUtils.safeGetBooleanExtra(intent, EXTRA_IS_MEDIA_VIEWER, false);
         mMediaViewerUrl = mIsMediaViewer
                 ? IntentUtils.safeGetStringExtra(intent, EXTRA_MEDIA_VIEWER_URL) : null;
+        mEnableEmbeddedMediaExperience = mIsTrustedIntent
+                && IntentUtils.safeGetBooleanExtra(
+                           intent, EXTRA_ENABLE_EMBEDDED_MEDIA_EXPERIENCE, false);
         mIsInfoPage = mIsTrustedIntent
                 && IntentUtils.safeGetBooleanExtra(intent, EXTRA_IS_INFO_PAGE, false);
         mDisableStar = IntentUtils.safeGetBooleanExtra(intent, EXTRA_DISABLE_STAR_BUTTON, false);
@@ -499,6 +507,13 @@
     }
 
     /**
+     * @return See {@link #EXTRA_ENABLE_EMBEDDED_MEDIA_EXPERIENCE}
+     */
+    boolean shouldEnableEmbeddedMediaExperience() {
+        return mEnableEmbeddedMediaExperience;
+    }
+
+    /**
      * @return If the Custom Tab is an info page.
      * See {@link #EXTRA_IS_INFO_PAGE}.
      */

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
index f6bfd8e..95e1553 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java

@@ -73,6 +73,7 @@
 
     private static final String DEFAULT_MIME_TYPE = "*/*";
     private static final String MIME_TYPE_DELIMITER = "/";
+    private static final String MIME_TYPE_VIDEO = "video";
 
     private static final String EXTRA_IS_OFF_THE_RECORD =
             "org.chromium.chrome.browser.download.IS_OFF_THE_RECORD";
@@ -420,6 +421,8 @@
         intent.setData(contentUri);
         intent.putExtra(CustomTabIntentDataProvider.EXTRA_IS_MEDIA_VIEWER, true);
         intent.putExtra(CustomTabIntentDataProvider.EXTRA_MEDIA_VIEWER_URL, fileUri.toString());
+        intent.putExtra(CustomTabIntentDataProvider.EXTRA_ENABLE_EMBEDDED_MEDIA_EXPERIENCE,
+                isMimeTypeVideo(mimeType));
         intent.putExtra(
                 CustomTabIntentDataProvider.EXTRA_INITIAL_BACKGROUND_COLOR, mediaColor);
         intent.putExtra(
@@ -699,4 +702,13 @@
         return ApiCompatibilityUtils.getColorStateList(
                 context.getResources(), R.color.white_mode_tint);
     }
+
+    private static boolean isMimeTypeVideo(String mimeType) {
+        if (TextUtils.isEmpty(mimeType)) return false;
+
+        String[] pieces = mimeType.split(MIME_TYPE_DELIMITER);
+        if (pieces.length != 2) return false;
+
+        return MIME_TYPE_VIDEO.equals(pieces[0]);
+    }
 }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
index 2de24ac..d5768286e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -260,7 +260,7 @@
         DeferredStartupHandler.getInstance().addDeferredTask(new Runnable() {
             @Override
             public void run() {
-                ChromeWebApkHost.initCanUseGooglePlayToInstallWebApk();
+                ChromeWebApkHost.initGooglePlayInstallState();
             }
         });
     }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java
index b7bd230..b2f89fd4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java

@@ -18,6 +18,7 @@
 public class PageLoadMetrics {
     public static final String FIRST_CONTENTFUL_PAINT = "firstContentfulPaint";
     public static final String NAVIGATION_START = "navigationStart";
+    public static final String LOAD_EVENT_START = "loadEventStart";
 
     /** Observer for page load metrics. */
     public interface Observer {
@@ -30,6 +31,16 @@
          */
         public void onFirstContentfulPaint(
                 WebContents webContents, long navigationStartTick, long firstContentfulPaintMs);
+
+        /**
+         * Called when the load event start metric is available.
+         *
+         * @param webContents the WebContents this metrics is related to.
+         * @param navigationStartTick Absolute navigation start time, as TimeTicks.
+         * @param loadEventStartMs Time to load event start from navigation start.
+         */
+        public void onLoadEventStart(
+                WebContents webContents, long navigationStartTick, long loadEventStartMs);
     }
 
     private static ObserverList<Observer> sObservers;
@@ -59,5 +70,15 @@
         }
     }
 
+    @CalledByNative
+    static void onLoadEventStart(
+            WebContents webContents, long navigationStartTick, long loadEventStartMs) {
+        ThreadUtils.assertOnUiThread();
+        if (sObservers == null) return;
+        for (Observer observer : sObservers) {
+            observer.onLoadEventStart(webContents, navigationStartTick, loadEventStartMs);
+        }
+    }
+
     private PageLoadMetrics() {}
 }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index bcc2c8b..bee3f48 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -1060,7 +1060,7 @@
         if (mNativeInitialized && mBottomSheet == null && mUrlHasFocus && currentTab != null
                 && !currentTab.isIncognito()) {
             mAutocomplete.startZeroSuggest(currentTab.getProfile(), mUrlBar.getQueryText(),
-                    currentTab.getUrl(), mUrlFocusedFromFakebox);
+                    mToolbarDataProvider.getCurrentUrl(), mUrlFocusedFromFakebox);
         }
     }
 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/OWNERS b/chrome/android/java/src/org/chromium/chrome/browser/share/OWNERS
index 4eb7497..71f893d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/share/OWNERS
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/OWNERS

@@ -1 +1,3 @@
 dtrainor@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>Share

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index c6901165..fe031a1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -3027,6 +3027,15 @@
         nativeSetWebappManifestScope(mNativeTabAndroid, scope);
     }
 
+    /**
+     * Configures web preferences for viewing downloaded media.
+     * @param enabled Whether embedded media experience should be enabled.
+     */
+    public void enableEmbeddedMediaExperience(boolean enabled) {
+        if (mNativeTabAndroid == 0) return;
+        nativeEnableEmbeddedMediaExperience(mNativeTabAndroid, enabled);
+    }
+
     private native void nativeInit();
     private native void nativeDestroy(long nativeTabAndroid);
     private native void nativeInitWebContents(long nativeTabAndroid, boolean incognito,
@@ -3057,4 +3066,5 @@
             TabContentManager tabContentManager);
     private native boolean nativeHasPrerenderedUrl(long nativeTabAndroid, String url);
     private native void nativeSetWebappManifestScope(long nativeTabAndroid, String scope);
+    private native void nativeEnableEmbeddedMediaExperience(long nativeTabAndroid, boolean enabled);
 }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java
index 67c25af..c961537 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarDataProvider.java

@@ -17,6 +17,11 @@
     Tab getTab();
 
     /**
+     * @return The current url for the current tab.
+     */
+    String getCurrentUrl();
+
+    /**
      * @return The NewTabPage shown for the current Tab or null if one is not being shown.
      */
     NewTabPage getNewTabPageForCurrentTab();

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
index e628967..f9dd2d3a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarLayout.java

@@ -135,6 +135,11 @@
             }
 
             @Override
+            public String getCurrentUrl() {
+                return null;
+            }
+
+            @Override
             public String getText() {
                 return null;
             }

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
index 2ee3680..8aa2bd7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

@@ -78,6 +78,12 @@
     }
 
     @Override
+    public String getCurrentUrl() {
+        // TODO(yusufo) : Consider using this for all calls from getTab() for accessing url.
+        return getTab() != null ? getTab().getUrl() : null;
+    }
+
+    @Override
     public NewTabPage getNewTabPageForCurrentTab() {
         Tab currentTab = getTab();
         if (currentTab != null && currentTab.getNativePage() instanceof NewTabPage) {

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
index 20b26f4..019517d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

@@ -13,6 +13,7 @@
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
+import android.view.ViewTreeObserver.OnPreDrawListener;
 import android.widget.FrameLayout;
 
 import com.google.vr.ndk.base.AndroidCompat;
@@ -41,6 +42,9 @@
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.MotionEventSynthesizer;
+import org.chromium.content.browser.WindowAndroidChangedObserver;
+import org.chromium.content.browser.WindowAndroidProvider;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.UiUtils;
@@ -53,7 +57,8 @@
  * This view extends from GvrLayout which wraps a GLSurfaceView that renders VR shell.
  */
 @JNINamespace("vr_shell")
-public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Callback {
+public class VrShellImpl
+        extends GvrLayout implements VrShell, SurfaceHolder.Callback, WindowAndroidProvider {
     private static final String TAG = "VrShellImpl";
 
     // TODO(mthiesse): These values work well for Pixel/Pixel XL in VR, but we need to come up with
@@ -109,6 +114,8 @@
     private float mLastContentHeight;
     private float mLastContentDpr;
 
+    private MotionEventSynthesizer mMotionEventSynthesizer;
+
     public VrShellImpl(ChromeActivity activity, VrShellDelegate delegate,
             CompositorViewHolder compositorViewHolder) {
         super(activity);
@@ -173,6 +180,7 @@
                 if (mNativePage != null) {
                     UiUtils.removeViewFromParent(mNativePage.getView());
                     mNativePage = null;
+                    mMotionEventSynthesizer = null;
                     if (tab.getNativePage() == null) {
                         nativeRestoreContentSurface(mNativeVrShell);
                         mRenderToSurfaceLayout.setVisibility(View.INVISIBLE);
@@ -187,14 +195,17 @@
                             new FrameLayout.LayoutParams(
                                     LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
                     mNativePage.getView().invalidate();
+                    mMotionEventSynthesizer =
+                            new MotionEventSynthesizer(mNativePage.getView(), VrShellImpl.this);
                 }
                 setContentCssSize(mLastContentWidth, mLastContentHeight, mLastContentDpr);
                 if (tab.getNativePage() == null && mTab.getContentViewCore() != null) {
                     mTab.getContentViewCore().onAttachedToWindow();
                     mTab.getContentViewCore().getContainerView().requestFocus();
-                    nativeSwapContents(mNativeVrShell, mTab.getContentViewCore().getWebContents());
+                    nativeSwapContents(
+                            mNativeVrShell, mTab.getContentViewCore().getWebContents(), null);
                 } else {
-                    nativeSwapContents(mNativeVrShell, null);
+                    nativeSwapContents(mNativeVrShell, null, mMotionEventSynthesizer);
                 }
             }
 
@@ -241,6 +252,7 @@
             @Override
             protected void dispatchDraw(Canvas canvas) {
                 if (mSurface == null) return;
+                // TODO(mthiesse): Support mSurface.lockHardwareCanvas(); crbug.com/692775
                 final Canvas surfaceCanvas = mSurface.lockCanvas(null);
                 super.dispatchDraw(surfaceCanvas);
                 mSurface.unlockCanvasAndPost(surfaceCanvas);
@@ -252,6 +264,18 @@
             }
         };
         mRenderToSurfaceLayout.setVisibility(View.INVISIBLE);
+        // We need a pre-draw listener to invalidate the native page because scrolling usually
+        // doesn't trigger an onDraw call, so our texture won't get updated.
+        mRenderToSurfaceLayout.getViewTreeObserver().addOnPreDrawListener(new OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                if (mRenderToSurfaceLayout.isDirty()) {
+                    mRenderToSurfaceLayout.invalidate();
+                    if (mNativePage != null) mNativePage.getView().invalidate();
+                }
+                return true;
+            }
+        });
         addView(mRenderToSurfaceLayout);
     }
 
@@ -558,11 +582,29 @@
         mTab.reload();
     }
 
+    @CalledByNative
+    public float getNativePageScrollRatio() {
+        return mOriginalWindowAndroid.getDisplay().getDipScale()
+                / mContentVrWindowAndroid.getDisplay().getDipScale();
+    }
+
+    @Override
+    public WindowAndroid getWindowAndroid() {
+        return mContentVrWindowAndroid;
+    }
+
+    @Override
+    public void addWindowAndroidChangedObserver(WindowAndroidChangedObserver observer) {}
+
+    @Override
+    public void removeWindowAndroidChangedObserver(WindowAndroidChangedObserver observer) {}
+
     private native long nativeInit(WebContents uiWebContents, long nativeContentWindowAndroid,
             long nativeUiWindowAndroid, boolean forWebVR, VrShellDelegate delegate, long gvrApi,
             boolean reprojectedRendering);
     private native void nativeSetSurface(long nativeVrShell, Surface surface);
-    private native void nativeSwapContents(long nativeVrShell, WebContents webContents);
+    private native void nativeSwapContents(
+            long nativeVrShell, WebContents webContents, MotionEventSynthesizer eventSynthesizer);
     private native void nativeLoadUIContent(long nativeVrShell);
     private native void nativeDestroy(long nativeVrShell);
     private native void nativeOnTriggerEvent(long nativeVrShell);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
index caeddde..7abec8c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java

@@ -15,6 +15,7 @@
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.GooglePlayInstallState;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
@@ -27,7 +28,7 @@
     private static final String TAG = "ChromeWebApkHost";
 
     /** Whether installing WebAPks from Google Play is possible. */
-    private static Boolean sCanUseGooglePlayInstall;
+    private static Integer sGooglePlayInstallState;
 
     private static Boolean sEnabledForTesting;
 
@@ -57,34 +58,39 @@
     }
 
     /**
-     * Initializes {@link sCanUseGooglePlayInstall}. It checks whether:
+     * Initializes {@link sGooglePlayInstallState}. It checks whether:
      * 1) WebAPKs are enabled.
      * 2) Google Play Service is available on the device.
      * 3) Google Play install is enabled by Chrome.
      * 4) Google Play is up-to-date and with gServices flags turned on.
-     * It calls the Google Play Install API to update {@link sCanUseGooglePlayInstall}
+     * It calls the Google Play Install API to update {@link sGooglePlayInstallState}
      * asynchronously.
      */
-    public static void initCanUseGooglePlayToInstallWebApk() {
-        if (!isGooglePlayInstallEnabledByChromeFeature()
-                || !ExternalAuthUtils.getInstance().canUseGooglePlayServices(
-                        ContextUtils.getApplicationContext(),
-                        new UserRecoverableErrorHandler.Silent())) {
-            sCanUseGooglePlayInstall = false;
+    public static void initGooglePlayInstallState() {
+        if (!isGooglePlayInstallEnabledByChromeFeature()) {
+            sGooglePlayInstallState = GooglePlayInstallState.DISABLED_BY_VARIATIONS;
+            return;
+        }
+
+        if (!ExternalAuthUtils.getInstance().canUseGooglePlayServices(
+                    ContextUtils.getApplicationContext(),
+                    new UserRecoverableErrorHandler.Silent())) {
+            sGooglePlayInstallState = GooglePlayInstallState.NO_PLAY_SERVICES;
             return;
         }
 
         ChromeApplication application = (ChromeApplication) ContextUtils.getApplicationContext();
         GooglePlayWebApkInstallDelegate delegate = application.getGooglePlayWebApkInstallDelegate();
         if (delegate == null) {
-            sCanUseGooglePlayInstall = false;
+            sGooglePlayInstallState = GooglePlayInstallState.DISABLED_OTHER;
             return;
         }
 
         Callback<Boolean> callback = new Callback<Boolean>() {
             @Override
             public void onResult(Boolean success) {
-                sCanUseGooglePlayInstall = success;
+                sGooglePlayInstallState = success ? GooglePlayInstallState.SUPPORTED
+                                                  : GooglePlayInstallState.DISABLED_BY_PLAY;
             }
         };
         delegate.canInstallWebApk(callback);
@@ -96,11 +102,7 @@
      * calls the Google Play Install API to update {@link sCanUseGooglePlayInstall} asynchronously.
      */
     public static boolean canUseGooglePlayToInstallWebApk() {
-        if (sCanUseGooglePlayInstall == null) {
-            sCanUseGooglePlayInstall = false;
-            initCanUseGooglePlayToInstallWebApk();
-        }
-        return sCanUseGooglePlayInstall;
+        return getGooglePlayInstallState() == GooglePlayInstallState.SUPPORTED;
     }
 
     /**
@@ -122,6 +124,15 @@
                 && (canUseGooglePlayToInstallWebApk() || nativeCanInstallFromUnknownSources());
     }
 
+    @CalledByNative
+    private static int getGooglePlayInstallState() {
+        if (sGooglePlayInstallState == null) {
+            sGooglePlayInstallState = GooglePlayInstallState.DISABLED_OTHER;
+            initGooglePlayInstallState();
+        }
+        return sGooglePlayInstallState;
+    }
+
     /**
      * Check the cached value to figure out if the feature is enabled. We have to use the cached
      * value because native library may not yet been loaded.

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 482ef77..cab70c9 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni

@@ -1338,6 +1338,7 @@
   "javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/PauseOnHeadsetUnplugTest.java",
+  "javatests/src/org/chromium/chrome/browser/metrics/PageLoadMetricsTest.java",
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilderTest.java",

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/OWNERS b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/OWNERS
index 6000f0e..18cf74d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/OWNERS
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/OWNERS

@@ -1,2 +1,4 @@
 changwan@chromium.org
 dtrainor@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>CompositedUI

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index 4c239b6..fd2d93a5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

@@ -989,13 +989,14 @@
     }
 
     /**
-     * Tests that Time To First Contentful Paint is sent.
+     * Tests that Time To First Contentful Paint and Load Event Start timings are sent.
      */
     @SmallTest
     @RetryOnFailure
     public void testPageLoadMetricIsSent() {
         final AtomicReference<Long> firstContentfulPaintMs = new AtomicReference<>(-1L);
         final AtomicReference<Long> activityStartTimeMs = new AtomicReference<>(-1L);
+        final AtomicReference<Long> loadEventStartMs = new AtomicReference<>(-1L);
 
         CustomTabsCallback cb = new CustomTabsCallback() {
             @Override
@@ -1009,9 +1010,16 @@
 
                 long firstContentfulPaint =
                         args.getLong(PageLoadMetrics.FIRST_CONTENTFUL_PAINT, -1);
-                assertTrue(firstContentfulPaint > 0);
-                assertTrue(firstContentfulPaint <= (current - navigationStart));
-                firstContentfulPaintMs.set(firstContentfulPaint);
+                if (firstContentfulPaint > 0) {
+                    assertTrue(firstContentfulPaint <= (current - navigationStart));
+                    firstContentfulPaintMs.set(firstContentfulPaint);
+                }
+
+                long loadEventStart = args.getLong(PageLoadMetrics.LOAD_EVENT_START, -1);
+                if (loadEventStart > 0) {
+                    assertTrue(loadEventStart <= (current - navigationStart));
+                    loadEventStartMs.set(loadEventStart);
+                }
             }
         };
 
@@ -1031,6 +1039,12 @@
                     return firstContentfulPaintMs.get() > 0;
                 }
             });
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+                @Override
+                public boolean isSatisfied() {
+                    return loadEventStartMs.get() > 0;
+                }
+            });
         } catch (InterruptedException e) {
             fail();
         }

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java
index 8c82769..77300942 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/RouterTestUtils.java

@@ -5,20 +5,15 @@
 package org.chromium.chrome.browser.media;
 
 import android.app.Dialog;
-import android.app.Instrumentation;
-import android.os.SystemClock;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentManager;
-import android.view.MotionEvent;
 import android.view.View;
 
 import org.chromium.base.Log;
-import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.browser.test.util.TestTouchUtils;
 
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
@@ -110,88 +105,4 @@
             return null;
         }
     }
-
-    /**
-     * Click a button. Unlike {@link RouterTestUtils#mouseSingleClickView} this directly accesses
-     * the view and does not send motion events though the message queue. As such it doesn't require
-     * the view to have been created by the instrumented activity, but gives less flexibility than
-     * mouseSingleClickView. For example, if the view is hierachical, then clickButton will always
-     * act on specified view, whereas mouseSingleClickView will send the events to the appropriate
-     * child view. It is hence only really appropriate for simple views such as buttons.
-     *
-     * @param button the button to be clicked.
-     */
-    public static void clickButton(final View button) {
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-                @Override
-            public void run() {
-                // Post the actual click to the button's message queue, to ensure that it has been
-                // inflated before the click is received.
-                button.post(new Runnable() {
-                        @Override
-                    public void run() {
-                        button.performClick();
-                    }
-                });
-            }
-        });
-    }
-
-    private static void sendMouseAction(Instrumentation instrumentation, int action, long downTime,
-            float x, float y) {
-        long eventTime = SystemClock.uptimeMillis();
-        MotionEvent.PointerCoords coords[] = new MotionEvent.PointerCoords[1];
-        coords[0] = new MotionEvent.PointerCoords();
-        coords[0].x = x;
-        coords[0].y = y;
-        MotionEvent.PointerProperties properties[] = new MotionEvent.PointerProperties[1];
-        properties[0] = new MotionEvent.PointerProperties();
-        properties[0].id = 0;
-        properties[0].toolType = MotionEvent.TOOL_TYPE_FINGER;
-        MotionEvent event = MotionEvent.obtain(downTime, eventTime, action, 1, properties, coords,
-                0, 0, 0.0f, 0.0f, 0, 0, 0, 0);
-        instrumentation.sendPointerSync(event);
-        instrumentation.waitForIdleSync();
-    }
-
-    /**
-     * Sends (synchronously) a single mouse click to an absolute screen coordinates.
-     *
-     * @param instrumentation Instrumentation object used by the test.
-     * @param x Screen absolute x location.
-     * @param y Screen absolute y location.
-     */
-    private static void mouseSingleClick(Instrumentation instrumentation, float x, float y) {
-        long downTime = SystemClock.uptimeMillis();
-        sendMouseAction(instrumentation, MotionEvent.ACTION_DOWN, downTime, x, y);
-        sendMouseAction(instrumentation, MotionEvent.ACTION_UP, downTime, x, y);
-    }
-
-    /**
-     * Sends (synchronously) a single mouse click to the View at the specified coordinates.
-     *
-     * @param instrumentation Instrumentation object used by the test.
-     * @param v The view the coordinates are relative to.
-     * @param x Relative x location to the view.
-     * @param y Relative y location to the view.
-     */
-    public static void mouseSingleClickView(Instrumentation instrumentation, View v, int x,
-            int y) {
-        int location[] = TestTouchUtils.getAbsoluteLocationFromRelative(v, x, y);
-        int absoluteX = location[0];
-        int absoluteY = location[1];
-        mouseSingleClick(instrumentation, absoluteX, absoluteY);
-    }
-
-    /**
-     * Sends (synchronously) a single mouse click to the center of the View.
-     *
-     * @param instrumentation Instrumentation object used by the test.
-     * @param v The view the coordinates are relative to.
-     */
-    public static void mouseSingleClickView(Instrumentation instrumentation, View v) {
-        int x = v.getWidth() / 2;
-        int y = v.getHeight() / 2;
-        mouseSingleClickView(instrumentation, v, x, y);
-    }
 }

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
index ba919a6b..beaa0cec 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java

@@ -21,6 +21,7 @@
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.test.util.ClickUtils;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content.browser.test.util.UiUtils;
@@ -311,7 +312,7 @@
                 getActivity(), chromecastName, MAX_VIEW_TIME_MS, VIEW_RETRY_MS);
         assertNotNull("Test route not found", testRouteButton);
 
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
     }
 
     protected void checkDisconnected() {
@@ -356,7 +357,7 @@
 
         assertNotNull("No disconnect button", disconnectButton);
 
-        RouterTestUtils.clickButton(disconnectButton);
+        ClickUtils.clickButton(disconnectButton);
     }
 
     /*
@@ -563,7 +564,7 @@
                              ((float) (rect.top + rect.bottom)) / 2)
                 + core.getTopControlsHeightPix();
         // Click using a virtual mouse, since a touch may result in a disambiguation pop-up.
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), tab.getView(), clickX, clickY);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), tab.getView(), clickX, clickY);
     }
 
 

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java
index 9818d25..124bae6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java

@@ -22,6 +22,7 @@
 import org.chromium.chrome.browser.media.RouterTestUtils;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
+import org.chromium.content.browser.test.util.ClickUtils;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
@@ -213,7 +214,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT);
         String sessionId = getJavaScriptVariable(webContents, "startedConnection.id");
         assertFalse(sessionId.length() == 0);
@@ -233,7 +234,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT);
         String sessionId = getJavaScriptVariable(webContents, "startedConnection.id");
         assertFalse(sessionId.length() == 0);
@@ -253,7 +254,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT);
         String sessionId = getJavaScriptVariable(webContents, "startedConnection.id");
         assertFalse(sessionId.length() == 0);
@@ -273,7 +274,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         checkStartFailed(
                 webContents, "UnknownError", "No provider supports createRoute with source");
     }
@@ -289,7 +290,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         checkStartFailed(
                 webContents, "UnknownError", "Unknown sink");
     }
@@ -305,7 +306,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT);
         String sessionId = getJavaScriptVariable(webContents, "startedConnection.id");
 
@@ -330,7 +331,7 @@
         executeJavaScriptApi(webContents, START_SESSION_SCRIPT);
         View testRouteButton = RouterTestUtils.waitForRouteButton(
                 getActivity(), TEST_SINK_NAME, VIEW_TIMEOUT_MS, VIEW_RETRY_MS);
-        RouterTestUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
+        ClickUtils.mouseSingleClickView(getInstrumentation(), testRouteButton);
         executeJavaScriptApi(webContents, CHECK_SESSION_SCRIPT);
         String sessionId = getJavaScriptVariable(webContents, "startedConnection.id");
 

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/PageLoadMetricsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/PageLoadMetricsTest.java
new file mode 100644
index 0000000..c8ff4de
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/metrics/PageLoadMetricsTest.java

@@ -0,0 +1,117 @@
+// Copyright 2017 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.
+
+package org.chromium.chrome.browser.metrics;
+
+import android.support.test.filters.SmallTest;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.content_public.browser.WebContents;
+import org.chromium.net.test.EmbeddedTestServer;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for {@link PageLoadMetrics}
+ */
+@RetryOnFailure
+public class PageLoadMetricsTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+    public PageLoadMetricsTest() {
+        super(ChromeActivity.class);
+    }
+
+    private static final int PAGE_LOAD_METRICS_TIMEOUT_MS = 3000;
+    private static final String TEST_PAGE = "/chrome/test/data/android/google.html";
+    private static final String TEST_PAGE_TITLE = "The Google";
+
+    private String mTestPage;
+    private EmbeddedTestServer mTestServer;
+    private PageLoadMetricsObserver mMetricsObserver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+        mTestPage = mTestServer.getURL(TEST_PAGE);
+
+        mMetricsObserver = new PageLoadMetricsObserver(getActivity().getActivityTab());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                PageLoadMetrics.removeObserver(mMetricsObserver);
+            }
+        });
+
+        mTestServer.stopAndDestroyServer();
+        super.tearDown();
+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+
+    private static class PageLoadMetricsObserver implements PageLoadMetrics.Observer {
+        private final Tab mTab;
+        private final CountDownLatch mFirstContentfulPaintLatch = new CountDownLatch(1);
+        private final CountDownLatch mLoadEventStartLatch = new CountDownLatch(1);
+
+        public PageLoadMetricsObserver(Tab tab) {
+            mTab = tab;
+        }
+
+        @Override
+        public void onFirstContentfulPaint(
+                WebContents webContents, long navigationStartTick, long firstContentfulPaintMs) {
+            if (webContents != mTab.getWebContents()) return;
+
+            if (firstContentfulPaintMs > 0) mFirstContentfulPaintLatch.countDown();
+        }
+
+        @Override
+        public void onLoadEventStart(
+                WebContents webContents, long navigationStartTick, long loadEventStartMs) {
+            if (webContents != mTab.getWebContents()) return;
+
+            if (loadEventStartMs > 0) mLoadEventStartLatch.countDown();
+        }
+
+        public boolean waitForFirstContentfulPaintEvent() throws InterruptedException {
+            return mFirstContentfulPaintLatch.await(
+                    PAGE_LOAD_METRICS_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        }
+
+        public boolean waitForLoadEventStartEvent() throws InterruptedException {
+            return mLoadEventStartLatch.await(PAGE_LOAD_METRICS_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    @SmallTest
+    public void testPageLoadMetricEmitted() throws InterruptedException {
+        assertFalse("Tab shouldn't be loading anything before we add observer",
+                getActivity().getActivityTab().isLoading());
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                PageLoadMetrics.addObserver(mMetricsObserver);
+            }
+        });
+
+        loadUrl(mTestPage);
+
+        assertTrue("First Contentful Paint should be reported",
+                mMetricsObserver.waitForFirstContentfulPaintEvent());
+        assertTrue("Load event start event should be reported",
+                mMetricsObserver.waitForLoadEventStartEvent());
+    }
+}

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
index 6f0890ec..bef85e8b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/WebVrTest.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.vr_shell;
 
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_DAYDREAM_VIEW;
+import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_WEBVR_SUPPORTED;
 
 import android.support.test.filters.SmallTest;
 
@@ -12,10 +13,8 @@
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
-// TODO(bsheedy): Factor out the code used from RouterTestUtils into a new
-// file like org.chromium.base.test.util.ClickUtils or similar
-import org.chromium.chrome.browser.media.RouterTestUtils;
 import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.content.browser.test.util.ClickUtils;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
@@ -46,6 +45,7 @@
  * which can then grab the results and pass/fail the instrumentation test.
  */
 @CommandLineFlags.Add("enable-webvr")
+@Restriction(RESTRICTION_TYPE_WEBVR_SUPPORTED)
 public class WebVrTest extends ChromeTabbedActivityTestBase {
     private static final String TAG = "WebVrTest";
     private static final String TEST_DIR = "chrome/test/data/android/webvr_instrumentation";
@@ -98,7 +98,7 @@
      * to fulfil WebVR's gesture requirement for presenting.
      */
     private void enterVrTap() {
-        RouterTestUtils.mouseSingleClickView(
+        ClickUtils.mouseSingleClickView(
                 getInstrumentation(), getActivity().getWindow().getDecorView().getRootView());
     }
 

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/OWNERS b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/OWNERS
index 6000f0e..18cf74d 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/OWNERS
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/OWNERS

@@ -1,2 +1,4 @@
 changwan@chromium.org
 dtrainor@chromium.org
+
+# COMPONENT: UI>Browser>Mobile>CompositedUI

diff --git a/chrome/app/android/OWNERS b/chrome/app/android/OWNERS
index 89353372..3f5cb6d0 100644
--- a/chrome/app/android/OWNERS
+++ b/chrome/app/android/OWNERS

@@ -2,3 +2,4 @@
 michaelbai@chromium.org
 yfriedman@chromium.org
 
+# COMPONENT: Internals>PlatformIntegration

diff --git a/chrome/app/chrome_crash_reporter_client_win.cc b/chrome/app/chrome_crash_reporter_client_win.cc
index 39693f36..0ee2f24 100644
--- a/chrome/app/chrome_crash_reporter_client_win.cc
+++ b/chrome/app/chrome_crash_reporter_client_win.cc

@@ -324,16 +324,11 @@
   return false;
 }
 
-// TODO(grt): Remove |exe_path| from crash_reporter::CrashReporterClient.
-bool ChromeCrashReporterClient::GetIsPerUserInstall(
-    const base::string16& exe_path) {
+bool ChromeCrashReporterClient::GetIsPerUserInstall() {
   return !install_static::InstallDetails::Get().system_level();
 }
 
-// TODO(grt): Remove |is_per_user_install| from
-// crash_reporter::CrashReporterClient.
-bool ChromeCrashReporterClient::GetShouldDumpLargerDumps(
-    bool is_per_user_install) {
+bool ChromeCrashReporterClient::GetShouldDumpLargerDumps() {
   // Capture larger dumps for Google Chrome "beta", "dev", and "canary"
   // channels. Stable channel and Chromium builds are on channel "", and use
   // smaller dumps.

diff --git a/chrome/app/chrome_crash_reporter_client_win.h b/chrome/app/chrome_crash_reporter_client_win.h
index a683826..e62c8db5 100644
--- a/chrome/app/chrome_crash_reporter_client_win.h
+++ b/chrome/app/chrome_crash_reporter_client_win.h

@@ -32,8 +32,8 @@
                                bool* is_rtl_locale) override;
   bool AboutToRestart() override;
   bool GetDeferredUploadsSupported(bool is_per_user_install) override;
-  bool GetIsPerUserInstall(const base::string16& exe_path) override;
-  bool GetShouldDumpLargerDumps(bool is_per_user_install) override;
+  bool GetIsPerUserInstall() override;
+  bool GetShouldDumpLargerDumps() override;
   int GetResultCodeRespawnFailed() override;
 
   bool GetCrashDumpLocation(base::string16* crash_dir) override;

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index e89f3dfb..6970012f 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd

@@ -151,6 +151,9 @@
           Chromium OS
         </message>
       </if>
+      <message name="IDS_SHORT_PRODUCT_LOGO_ALT_TEXT" desc="Alt text for the Chromium logo image.">
+        Chromium logo
+      </message>
       <if expr="is_win">
         <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
           New window
@@ -777,15 +780,33 @@
       <message name="IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS" desc="Text shown in the settings reset dialog explaining that some of the user's settings may have been modified by unwanted software or extensions.">
         The following Chromium settings may have been modified by unwanted software or extensions:
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
         Do you want to restore Chromium's default search engine?
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+        Do you want to restore Chromium's default search engine? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+        Do you want to restore Chromium's default search engine? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
         Do you want to restore Chromium's default startup page?
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+        Do you want to restore Chromium's default startup page? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+        Do you want to restore Chromium's default startup page? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
         Do you want to restore Chromium's default homepage?
       </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+        Do you want to restore Chromium's default homepage? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+        Do you want to restore Chromium's default homepage? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
 
       <!-- Sync/sign-in error messages -->
       <if expr="not chromeos">
@@ -1226,10 +1247,6 @@
                  desc="The title at the top of the window guiding user through making Chrome default in Metro.">
           Chromium is almost ready.
         </message>
-        <message name="IDS_METRO_FLOW_LOGO_STRING_ALT"
-                 desc="Alt text for the faded Chrome logo image.">
-          Chromium logo
-        </message>
       </if>
 
       <!-- Welcome page (chrome://welcome) strings -->

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dd970ea..3904c793 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd

@@ -1929,10 +1929,14 @@
 
       <!-- Touch Bar-->
       <if expr="is_macosx">
-        <message name="IDS_TOUCH_BAR_SEARCH"
-                   desc="Text for the search button in the touch bar. Pressing the button will bring focus to the omnibox.">
+        <message name="IDS_TOUCH_BAR_GOOGLE_SEARCH"
+                   desc="Text for the search button in the touch bar when Google is the default search provider. Pressing the button will bring focus to the omnibox.">
           Search or type URL
         </message>
+        <message name="IDS_TOUCH_BAR_SEARCH"
+                   desc="Text for the search button in the touch bar when Google is not the default search provider. Pressing the button will bring focus to the omnibox.">
+          Search $1
+        </message>
 
       </if>
 
@@ -5601,6 +5605,30 @@
           </message>
       </if>
       <if expr="use_ash">
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR" desc="Title of the flag which specifies the shelf coloring in Chrome OS system UI.">
+          Shelf Color in Chrome OS system UI
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION" desc="Description of the flag which specifies the shelf coloring in Chrome OS system UI.">
+          Specify the Shelf Color scheme in Chrome OS system UI
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_VIBRANT" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Light &amp; Vibrant
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_VIBRANT" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Normal &amp; Vibrant
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_DARK_VIBRANT" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Dark &amp; Vibrant
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_MUTED" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Light &amp; Muted
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_MUTED" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Normal &amp; Muted
+        </message>
+        <message name="IDS_FLAGS_ASH_SHELF_COLOR_DARK_MUTED" desc="A shelf coloring style to be used by Chrome OS UI.">
+          Dark &amp; Muted
+        </message>
         <message name="IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME" desc="Title for the flag which can be used for window backdrops in TouchView.">
           Window backdrops in TouchView
         </message>
@@ -6991,6 +7019,12 @@
       <message name="IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_DESCRIPTION" desc="Description of the flag to enable the new answers in suggest types in the omnibox.">
         Enables new types of answers in the omnibox suggest drop-down: currency conversions, dictionary definitions, sports scores, translations, and when is.
       </message>
+      <message name="IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_NAME" desc="Name of the flag option to enable the redirect of omnibox zero suggest requests to a backend maintained by Chrome.">
+        Experimental contextual omnibox suggestion
+      </message>
+      <message name="IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_DESCRIPTION" desc="Description of the flag option to enable the redirect of omnibox zero suggest requests to a backend maintained by Chrome.">
+        Change omnibox contextual suggestions to an experimental source. Note that this is not an on/off switch for contextual omnibox and it only applies to suggestions provided before the user starts typing a URL or a search query (i.e. zero suggest).
+      </message>
 
       <!--Tooltip strings-->
       <message name="IDS_TOOLTIP_BACK" desc="The tooltip for back button">
@@ -8051,14 +8085,14 @@
       <message name="IDS_SETTINGS_RESET_PROMPT_HOMEPAGE_SETTING_NAME" desc="The text referring to Chrome's homepage setting. This will be displayed in a bulleted list of settings when informing the user that some of their settings may have been modified by unwanted software or extensions.">
         Homepage
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset the settings that were shown in a list and that may have been modified by unwanted software or extensions.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset the settings that were shown in a list and that may have been modified by unwanted software or extensions.">
         Do you want to restore these settings to their original defaults?
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SINGLE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown to inform the user about the number of extensions that will be disabled as part of the reset operation.">
-        This will also disable one extension.
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset the settings that were shown in a list and that may have been modified by unwanted software or extensions. Also informs the user about the number of extensions that will disabled.">
+        Do you want to restore these settings to their original defaults? This will also disable one extension.
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown to inform the user about the number of extensions that will be disabled as part of the reset operation.">
-        This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset the settings that were shown in a list and that may have been modified by unwanted software or extensions. Also informs the user about the number of extensions that will disabled.">
+        Do you want to restore these settings to their original defaults? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
       </message>
       <message name="IDS_SETTINGS_RESET_PROMPT_DETAILS_SECTION_SETTINGS_EXPLANATION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is displayed in the details section of the dialog before listing the current values of the settings that will be reset if the user clicks the accept button.">
         The following settings will be restored to their default values.

diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 1f01702..a8948fb 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd

@@ -153,6 +153,9 @@
           Chrome OS
         </message>
       </if>
+      <message name="IDS_SHORT_PRODUCT_LOGO_ALT_TEXT" desc="Alt text for the Chrome logo image.">
+        Chrome logo
+      </message>
       <if expr="is_win">
         <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
           New window
@@ -778,15 +781,33 @@
       <message name="IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS" desc="Text shown in the settings reset dialog explaining that some of the user's settings may have been modified by unwanted software or extensions.">
         The following Chrome settings may have been modified by unwanted software or extensions:
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
         Do you want to restore Chrome's default search engine?
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+        Do you want to restore Chrome's default search engine? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their search engine.">
+        Do you want to restore Chrome's default search engine? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
         Do you want to restore Chrome's default startup page?
       </message>
-      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+        Do you want to restore Chrome's default startup page? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their startup page.">
+        Do you want to restore Chrome's default startup page? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_NO_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
         Do you want to restore Chrome's default homepage?
       </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_ONE_EXTENSION" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+        Do you want to restore Chrome's default homepage? This will also disable one extension.
+      </message>
+      <message name="IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_MULTIPLE_EXTENSIONS" desc="The settings reset dialog asks users if they want to restore some of their settings to their original default values. This text is shown at the bottom of the dialog when asking if the user wants to reset their homepage.">
+        Do you want to restore Chrome's default homepage? This will also disable <ph name="NUM_EXTENSIONS">$1<ex>3</ex></ph> extensions.
+      </message>
 
       <!-- Sync/sign-in error messages -->
       <if expr="not chromeos">
@@ -1227,10 +1248,6 @@
                  desc="The title at the top of the window guiding user through making Chrome default in Metro.">
           Chrome is almost ready.
         </message>
-        <message name="IDS_METRO_FLOW_LOGO_STRING_ALT"
-                 desc="Alt text for the faded Chrome logo image.">
-          Chrome logo
-        </message>
       </if>
 
       <!-- Welcome page (chrome://welcome) strings -->

diff --git a/chrome/app/vector_icons/BUILD.gn b/chrome/app/vector_icons/BUILD.gn
index 1311436..7d8e89e0 100644
--- a/chrome/app/vector_icons/BUILD.gn
+++ b/chrome/app/vector_icons/BUILD.gn

@@ -9,6 +9,7 @@
   icon_directory = "."
 
   icons = [
+    "apps.icon",
     "autologin.icon",
     "bluetooth_connected.icon",
     "browser_tools.icon",
@@ -18,9 +19,12 @@
     "caret_down.icon",
     "caret_up.1x.icon",
     "caret_up.icon",
+    "cookie.icon",
     "crashed_tab.icon",
     "credit_card.1x.icon",
     "credit_card.icon",
+    "extension.icon",
+    "extension_crashed.icon",
     "file_download.icon",
     "file_download_incognito.1x.icon",
     "file_download_incognito.icon",
@@ -31,6 +35,7 @@
     "folder_managed.icon",
     "folder_supervised.1x.icon",
     "folder_supervised.icon",
+    "globe.icon",
     "incognito.1x.icon",
     "incognito.icon",
     "laptop.icon",
@@ -42,6 +47,8 @@
     "navigate_stop.icon",
     "overflow_chevron.1x.icon",
     "overflow_chevron.icon",
+    "paintbrush.icon",
+    "sad_tab.icon",
     "smartphone.icon",
     "tab.icon",
     "tab_audio.1x.icon",

diff --git a/chrome/app/vector_icons/OWNERS b/chrome/app/vector_icons/OWNERS
new file mode 100644
index 0000000..658a9f5
--- /dev/null
+++ b/chrome/app/vector_icons/OWNERS

@@ -0,0 +1 @@
+estade@chromium.org

diff --git a/ui/gfx/vector_icons/apps.icon b/chrome/app/vector_icons/apps.icon
similarity index 100%
rename from ui/gfx/vector_icons/apps.icon
rename to chrome/app/vector_icons/apps.icon

diff --git a/chrome/app/vector_icons/cookie.icon b/chrome/app/vector_icons/cookie.icon
new file mode 100644
index 0000000..a4e6887a
--- /dev/null
+++ b/chrome/app/vector_icons/cookie.icon

@@ -0,0 +1,59 @@
+// Copyright 2015 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.
+
+MOVE_TO, 31, 15,
+LINE_TO, 31, 14,
+CUBIC_TO, 31, 12.04f, 30, 11, 28, 11,
+LINE_TO, 27, 11,
+CUBIC_TO, 26.45f, 11, 26, 10.55f, 26, 10,
+LINE_TO, 26, 6,
+CUBIC_TO, 26, 4.04f, 24, 4, 24, 4,
+CUBIC_TO, 12.6f, 4, 3.42f, 13.54f, 4.03f, 25.08f,
+CUBIC_TO, 4.56f, 35.17f, 12.83f, 43.44f, 22.92f, 43.97f,
+CUBIC_TO, 34.46f, 44.58f, 44, 35.4f, 44, 24,
+LINE_TO, 44, 22,
+CUBIC_TO, 44, 20.9f, 43.11f, 20, 42, 20,
+LINE_TO, 38, 20,
+CUBIC_TO, 37.45f, 20, 37, 19.55f, 37, 19,
+LINE_TO, 37, 18,
+CUBIC_TO, 37, 16.13f, 36.04f, 15.04f, 34, 15,
+LINE_TO, 31, 15,
+LINE_TO, 31, 15,
+CLOSE,
+MOVE_TO, 11.59f, 24.94f,
+CUBIC_TO, 9.47f, 25.35f, 7.66f, 23.53f, 8.06f, 21.41f,
+CUBIC_TO, 8.28f, 20.24f, 9.24f, 19.28f, 10.41f, 19.06f,
+CUBIC_TO, 12.53f, 18.66f, 14.35f, 20.47f, 13.94f, 22.59f,
+CUBIC_TO, 13.72f, 23.76f, 12.76f, 24.72f, 11.59f, 24.94f,
+LINE_TO, 11.59f, 24.94f,
+CLOSE,
+MOVE_TO, 15.06f, 14.59f,
+CUBIC_TO, 14.66f, 12.47f, 16.47f, 10.66f, 18.59f, 11.06f,
+CUBIC_TO, 19.76f, 11.28f, 20.72f, 12.24f, 20.94f, 13.41f,
+CUBIC_TO, 21.35f, 15.53f, 19.53f, 17.35f, 17.41f, 16.94f,
+CUBIC_TO, 16.24f, 16.72f, 15.28f, 15.76f, 15.06f, 14.59f,
+LINE_TO, 15.06f, 14.59f,
+CLOSE,
+MOVE_TO, 22.59f, 38.94f,
+CUBIC_TO, 20.47f, 39.35f, 18.66f, 37.53f, 19.06f, 35.41f,
+CUBIC_TO, 19.28f, 34.24f, 20.24f, 33.28f, 21.41f, 33.06f,
+CUBIC_TO, 23.53f, 32.66f, 25.35f, 34.47f, 24.94f, 36.59f,
+CUBIC_TO, 24.72f, 37.76f, 23.76f, 38.72f, 22.59f, 38.94f,
+LINE_TO, 22.59f, 38.94f,
+CLOSE,
+MOVE_TO, 23, 28,
+CUBIC_TO, 21.34f, 28, 20, 26.66f, 20, 25,
+CUBIC_TO, 20, 23.34f, 21.34f, 22, 23, 22,
+CUBIC_TO, 24.66f, 22, 26, 23.34f, 26, 25,
+CUBIC_TO, 26, 26.66f, 24.66f, 28, 23, 28,
+LINE_TO, 23, 28,
+CLOSE,
+MOVE_TO, 33, 32,
+CUBIC_TO, 31.34f, 32, 30, 30.66f, 30, 29,
+CUBIC_TO, 30, 27.34f, 31.34f, 26, 33, 26,
+CUBIC_TO, 34.66f, 26, 36, 27.34f, 36, 29,
+CUBIC_TO, 36, 30.66f, 34.66f, 32, 33, 32,
+LINE_TO, 33, 32,
+CLOSE,
+END

diff --git a/ui/vector_icons/extension.icon b/chrome/app/vector_icons/extension.icon
similarity index 100%
rename from ui/vector_icons/extension.icon
rename to chrome/app/vector_icons/extension.icon

diff --git a/ui/gfx/vector_icons/extension_crashed.icon b/chrome/app/vector_icons/extension_crashed.icon
similarity index 100%
rename from ui/gfx/vector_icons/extension_crashed.icon
rename to chrome/app/vector_icons/extension_crashed.icon

diff --git a/ui/gfx/vector_icons/globe.icon b/chrome/app/vector_icons/globe.icon
similarity index 100%
rename from ui/gfx/vector_icons/globe.icon
rename to chrome/app/vector_icons/globe.icon

diff --git a/ui/gfx/vector_icons/paintbrush.icon b/chrome/app/vector_icons/paintbrush.icon
similarity index 100%
rename from ui/gfx/vector_icons/paintbrush.icon
rename to chrome/app/vector_icons/paintbrush.icon

diff --git a/ui/gfx/vector_icons/sad_tab.icon b/chrome/app/vector_icons/sad_tab.icon
similarity index 100%
rename from ui/gfx/vector_icons/sad_tab.icon
rename to chrome/app/vector_icons/sad_tab.icon

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 21c5460..560bcaf 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn

@@ -264,6 +264,8 @@
     "conflicts/module_event_sink_impl_win.h",
     "conflicts/module_info_util_win.cc",
     "conflicts/module_info_util_win.h",
+    "conflicts/module_info_win.cc",
+    "conflicts/module_info_win.h",
     "content_settings/chrome_content_settings_utils.cc",
     "content_settings/chrome_content_settings_utils.h",
     "content_settings/cookie_settings_factory.cc",
@@ -1707,6 +1709,8 @@
       "safe_browsing/settings_reset_prompt/extension_info.h",
       "safe_browsing/settings_reset_prompt/settings_reset_prompt_config.cc",
       "safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h",
+      "safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc",
+      "safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h",
       "safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc",
       "safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h",
       "search/hotword_audio_history_handler.cc",
@@ -4370,8 +4374,8 @@
       "chromeos/input_method/mock_input_method_engine.h",
       "chromeos/input_method/mock_input_method_manager_impl.cc",
       "chromeos/input_method/mock_input_method_manager_impl.h",
-      "chromeos/login/screens/mock_device_disabled_screen_actor.cc",
-      "chromeos/login/screens/mock_device_disabled_screen_actor.h",
+      "chromeos/login/screens/mock_device_disabled_screen_view.cc",
+      "chromeos/login/screens/mock_device_disabled_screen_view.h",
       "chromeos/login/session/user_session_manager_test_api.cc",
       "chromeos/login/session/user_session_manager_test_api.h",
       "chromeos/login/test/js_checker.cc",

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index c50a88c..e203935 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc

@@ -50,6 +50,7 @@
 #include "components/ntp_snippets/ntp_snippets_constants.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/offline_pages/core/offline_page_feature.h"
+#include "components/omnibox/browser/features.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_switches.h"
 #include "components/password_manager/core/common/password_manager_features.h"
@@ -388,6 +389,24 @@
     switches::kTopChromeMDMaterialHybrid },
 };
 
+#if defined(USE_ASH)
+const FeatureEntry::Choice kAshShelfColorChoices[] = {
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+    {IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_VIBRANT, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorLightVibrant},
+    {IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_VIBRANT, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorNormalVibrant},
+    {IDS_FLAGS_ASH_SHELF_COLOR_DARK_VIBRANT, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorDarkVibrant},
+    {IDS_FLAGS_ASH_SHELF_COLOR_LIGHT_MUTED, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorLightMuted},
+    {IDS_FLAGS_ASH_SHELF_COLOR_NORMAL_MUTED, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorNormalMuted},
+    {IDS_FLAGS_ASH_SHELF_COLOR_DARK_MUTED, ash::switches::kAshShelfColor,
+     ash::switches::kAshShelfColorDarkMuted},
+};
+#endif  // USE_ASH
+
 #if defined(OS_CHROMEOS)
 const FeatureEntry::Choice kAshMaterialDesignInkDropAnimationSpeed[] = {
     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
@@ -1049,6 +1068,9 @@
         IDS_FLAGS_ASH_ENABLE_MIRRORED_SCREEN_DESCRIPTION, kOsCrOS,
         SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
     },
+    {"ash-shelf-color", IDS_FLAGS_ASH_SHELF_COLOR,
+     IDS_FLAGS_ASH_SHELF_COLOR_DESCRIPTION, kOsCrOS,
+     MULTI_VALUE_TYPE(kAshShelfColorChoices)},
 #endif  // USE_ASH
 #if defined(OS_CHROMEOS)
     {"material-design-ink-drop-animation-speed",
@@ -2286,6 +2308,10 @@
      SINGLE_VALUE_TYPE(ash::switches::kAshAdjustableLargeCursor)},
 #endif  // OS_CHROMEOS
 
+    {"enable-zero-suggest-redirect-to-chrome",
+     IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_NAME,
+     IDS_FLAGS_ENABLE_ZERO_SUGGEST_REDIRECT_TO_CHROME_DESCRIPTION, kOsDesktop,
+     FEATURE_VALUE_TYPE(features::kZeroSuggestRedirectToChrome)},
     {"new-omnibox-answer-types", IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_NAME,
      IDS_FLAGS_NEW_OMNIBOX_ANSWER_TYPES_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},

diff --git a/chrome/browser/android/OWNERS b/chrome/browser/android/OWNERS
index 04a5388..50c422c 100644
--- a/chrome/browser/android/OWNERS
+++ b/chrome/browser/android/OWNERS

@@ -12,3 +12,5 @@
 # This is For simple changes of adding/removing features.  For more structural
 # changes, use the normal OWNERS rules.
 per-file chrome_feature_list.*=*
+
+# COMPONENT: UI>Browser>Mobile

diff --git a/chrome/browser/android/compositor/OWNERS b/chrome/browser/android/compositor/OWNERS
index 1f3e09e..4e6c10a 100644
--- a/chrome/browser/android/compositor/OWNERS
+++ b/chrome/browser/android/compositor/OWNERS

@@ -5,4 +5,6 @@
 per-file *contextual_search*=mdjones@chromium.org
 per-file *contextual_search*=twellington@chromium.org
 
-per-file *crushed_sprite*=twellington@chromium.org
\ No newline at end of file
+per-file *crushed_sprite*=twellington@chromium.org
+
+# COMPONENT: UI>Browser>Mobile

diff --git a/chrome/browser/android/offline_pages/background_loader_offliner.cc b/chrome/browser/android/offline_pages/background_loader_offliner.cc
index 2bf511a6..34459c7 100644
--- a/chrome/browser/android/offline_pages/background_loader_offliner.cc
+++ b/chrome/browser/android/offline_pages/background_loader_offliner.cc

@@ -123,6 +123,12 @@
   ResetState();
 }
 
+bool BackgroundLoaderOffliner::HandleTimeout(const SavePageRequest& request) {
+  // TODO(romax) Decide if we want to also take a snapshot on the last timeout
+  // for the background loader offliner.
+  return false;
+}
+
 void BackgroundLoaderOffliner::DidStopLoading() {
   if (!pending_request_.get()) {
     DVLOG(1) << "DidStopLoading called even though no pending request.";

diff --git a/chrome/browser/android/offline_pages/background_loader_offliner.h b/chrome/browser/android/offline_pages/background_loader_offliner.h
index f9c9002c..b298195 100644
--- a/chrome/browser/android/offline_pages/background_loader_offliner.h
+++ b/chrome/browser/android/offline_pages/background_loader_offliner.h

@@ -38,6 +38,7 @@
   bool LoadAndSave(const SavePageRequest& request,
                    const CompletionCallback& callback) override;
   void Cancel() override;
+  bool HandleTimeout(const SavePageRequest& request) override;
 
   // WebContentsObserver implementation.
   void DidStopLoading() override;

diff --git a/chrome/browser/android/offline_pages/prerender_adapter.cc b/chrome/browser/android/offline_pages/prerender_adapter.cc
index f780cfc..e959380 100644
--- a/chrome/browser/android/offline_pages/prerender_adapter.cc
+++ b/chrome/browser/android/offline_pages/prerender_adapter.cc

@@ -102,4 +102,15 @@
   }
 }
 
+void PrerenderAdapter::OnPrerenderNetworkBytesChanged(
+    prerender::PrerenderHandle* handle) {
+  if (IsActive()) {
+    DCHECK_EQ(active_handle_.get(), handle);
+    prerender::PrerenderContents* contents = handle->contents();
+    if (!contents)
+      return;
+    observer_->OnPrerenderNetworkBytesChanged(contents->network_bytes());
+  }
+}
+
 }  // namespace offline_pages

diff --git a/chrome/browser/android/offline_pages/prerender_adapter.h b/chrome/browser/android/offline_pages/prerender_adapter.h
index ca378d7..23b9037 100644
--- a/chrome/browser/android/offline_pages/prerender_adapter.h
+++ b/chrome/browser/android/offline_pages/prerender_adapter.h

@@ -40,6 +40,11 @@
     // WebContents (via |GetWebContents()|) have become invalidated.
     virtual void OnPrerenderStop() = 0;
 
+    // Signals that a resource finished loading and altered the running byte
+    // count. |bytes| is the cumulative number of bytes received for this
+    // handle.
+    virtual void OnPrerenderNetworkBytesChanged(int64_t bytes) = 0;
+
    protected:
     Observer();
     virtual ~Observer();
@@ -83,6 +88,8 @@
   void OnPrerenderStopLoading(prerender::PrerenderHandle* handle) override;
   void OnPrerenderDomContentLoaded(prerender::PrerenderHandle* handle) override;
   void OnPrerenderStop(prerender::PrerenderHandle* handle) override;
+  void OnPrerenderNetworkBytesChanged(
+      prerender::PrerenderHandle* handle) override;
 
  private:
   // At most one prerender request may be active for this adapter and this

diff --git a/chrome/browser/android/offline_pages/prerender_adapter_unittest.cc b/chrome/browser/android/offline_pages/prerender_adapter_unittest.cc
index 2587ea30..dffa3e5 100644
--- a/chrome/browser/android/offline_pages/prerender_adapter_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerender_adapter_unittest.cc

@@ -113,6 +113,7 @@
   void OnPrerenderStopLoading() override;
   void OnPrerenderDomContentLoaded() override;
   void OnPrerenderStop() override;
+  void OnPrerenderNetworkBytesChanged(int64_t bytes) override;
 
   void SetUp() override;
 
@@ -130,6 +131,9 @@
     return observer_dom_content_loaded_called_;
   }
   bool observer_stop_called() const { return observer_stop_called_; }
+  int64_t observer_network_bytes_changed() const {
+    return observer_network_bytes_changed_;
+  }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
@@ -140,6 +144,7 @@
   bool observer_stop_loading_called_;
   bool observer_dom_content_loaded_called_;
   bool observer_stop_called_;
+  int64_t observer_network_bytes_changed_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderAdapterTest);
 };
@@ -149,7 +154,8 @@
       prerender_manager_(nullptr),
       observer_stop_loading_called_(false),
       observer_dom_content_loaded_called_(false),
-      observer_stop_called_(false) {}
+      observer_stop_called_(false),
+      observer_network_bytes_changed_(0) {}
 
 PrerenderAdapterTest::~PrerenderAdapterTest() {
   if (prerender_manager_)
@@ -168,6 +174,10 @@
   observer_stop_called_ = true;
 }
 
+void PrerenderAdapterTest::OnPrerenderNetworkBytesChanged(int64_t bytes) {
+  observer_network_bytes_changed_ = bytes;
+}
+
 void PrerenderAdapterTest::SetUp() {
   if (base::SysInfo::IsLowEndDevice())
     return;
@@ -229,6 +239,11 @@
       ->last_prerender_contents()
       ->ReportDomContentEvent();
   EXPECT_TRUE(observer_dom_content_loaded_called());
+
+  // Expect byte count reported to Observer.
+  prerender_contents_factory()->last_prerender_contents()->AddNetworkBytes(153);
+  EXPECT_EQ(153LL, observer_network_bytes_changed());
+
   prerender_contents_factory()->last_prerender_contents()->ReportOnLoadEvent();
   EXPECT_TRUE(observer_stop_loading_called());
   prerender_contents_factory()->last_prerender_contents()->StopWithStatus(

diff --git a/chrome/browser/android/offline_pages/prerendering_loader.cc b/chrome/browser/android/offline_pages/prerendering_loader.cc
index f6e1b6e..0b2f878 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader.cc
+++ b/chrome/browser/android/offline_pages/prerendering_loader.cc

@@ -79,7 +79,8 @@
 PrerenderingLoader::PrerenderingLoader(content::BrowserContext* browser_context)
     : state_(State::IDLE),
       snapshot_controller_(nullptr),
-      browser_context_(browser_context) {
+      browser_context_(browser_context),
+      is_lowbar_met_(false) {
   adapter_.reset(new PrerenderAdapter(this));
 }
 
@@ -88,7 +89,8 @@
 }
 
 bool PrerenderingLoader::LoadPage(const GURL& url,
-                                  const LoadPageCallback& callback) {
+                                  const LoadPageCallback& load_done_callback,
+                                  const ProgressCallback& progress_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!IsIdle()) {
     DVLOG(1)
@@ -115,7 +117,8 @@
       new SnapshotController(base::ThreadTaskRunnerHandle::Get(), this,
                              kOfflinePageDclDelayMs,
                              kOfflinePageOnloadDelayMs));
-  callback_ = callback;
+  load_done_callback_ = load_done_callback;
+  progress_callback_ = progress_callback;
   session_contents_.swap(new_web_contents);
   state_ = State::LOADING;
   return true;
@@ -157,11 +160,14 @@
   if (!adapter_->GetWebContents()) {
     // Without a WebContents object at this point, we are done.
     HandleLoadingStopped();
-  } else if (kConsiderDclForSnapshot) {
-    // Inform SnapshotController of DomContentLoaded event so it can
-    // determine when to consider it really LOADED (e.g., some multiple
-    // second delay from this event).
-    snapshot_controller_->DocumentAvailableInMainFrame();
+  } else {
+    is_lowbar_met_ = true;
+    if (kConsiderDclForSnapshot) {
+      // Inform SnapshotController of DomContentLoaded event so it can
+      // determine when to consider it really LOADED (e.g., some multiple
+      // second delay from this event).
+      snapshot_controller_->DocumentAvailableInMainFrame();
+    }
   }
 }
 
@@ -170,11 +176,20 @@
   HandleLoadingStopped();
 }
 
+void PrerenderingLoader::OnPrerenderNetworkBytesChanged(int64_t bytes) {
+  if (state_ == State::LOADING)
+    progress_callback_.Run(bytes);
+}
+
 void PrerenderingLoader::StartSnapshot() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   HandleLoadEvent();
 }
 
+bool PrerenderingLoader::IsLowbarMet() {
+  return is_lowbar_met_;
+}
+
 void PrerenderingLoader::HandleLoadEvent() {
   // If still loading, check if the load succeeded or not, then update
   // the internal state (LOADED for success or IDLE for failure) and post
@@ -190,8 +205,8 @@
   if (web_contents) {
     state_ = State::LOADED;
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(callback_, Offliner::RequestStatus::LOADED, web_contents));
+        FROM_HERE, base::Bind(load_done_callback_,
+                              Offliner::RequestStatus::LOADED, web_contents));
   } else {
     // No WebContents means that the load failed (and it stopped).
     HandleLoadingStopped();
@@ -244,8 +259,9 @@
   snapshot_controller_.reset(nullptr);
   session_contents_.reset(nullptr);
   state_ = State::IDLE;
+  is_lowbar_met_ = false;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::Bind(callback_, request_status, nullptr));
+      FROM_HERE, base::Bind(load_done_callback_, request_status, nullptr));
 }
 
 void PrerenderingLoader::CancelPrerender() {
@@ -255,6 +271,7 @@
   snapshot_controller_.reset(nullptr);
   session_contents_.reset(nullptr);
   state_ = State::IDLE;
+  is_lowbar_met_ = false;
 }
 
 }  // namespace offline_pages

diff --git a/chrome/browser/android/offline_pages/prerendering_loader.h b/chrome/browser/android/offline_pages/prerendering_loader.h
index df54110..7e45fef 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader.h
+++ b/chrome/browser/android/offline_pages/prerendering_loader.h

@@ -32,6 +32,8 @@
   typedef base::Callback<void(Offliner::RequestStatus, content::WebContents*)>
       LoadPageCallback;
 
+  typedef base::Callback<void(int64_t)> ProgressCallback;
+
   explicit PrerenderingLoader(content::BrowserContext* browser_context);
   ~PrerenderingLoader() override;
 
@@ -43,7 +45,9 @@
   // once - first for a successful load and then if canceled after the
   // load (which may be from resources being reclaimed) at which point
   // the retrieved WebContents should no longer be used.
-  virtual bool LoadPage(const GURL& url, const LoadPageCallback& callback);
+  virtual bool LoadPage(const GURL& url,
+                        const LoadPageCallback& load_done_callback,
+                        const ProgressCallback& progress_callback);
 
   // Stops (completes or cancels) the load request. Must be called when
   // LoadPageCallback is done with consuming the contents. May be called
@@ -70,10 +74,14 @@
   void OnPrerenderStopLoading() override;
   void OnPrerenderDomContentLoaded() override;
   void OnPrerenderStop() override;
+  void OnPrerenderNetworkBytesChanged(int64_t bytes) override;
 
   // SnapshotController::Client implementation:
   void StartSnapshot() override;
 
+  // Returns true if the lowbar of snapshotting a page is met.
+  virtual bool IsLowbarMet();
+
  private:
   // State of the loader (only one request may be active at a time).
   enum class State {
@@ -114,7 +122,13 @@
 
   // Callback to call when the active load request completes, fails, or is
   // canceled.
-  LoadPageCallback callback_;
+  LoadPageCallback load_done_callback_;
+
+  // Callback to call when we know more bytes have loaded from the network.
+  ProgressCallback progress_callback_;
+
+  // True if the lowbar of snapshotting a page is met.
+  bool is_lowbar_met_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderingLoader);
 };

diff --git a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
index 929d78b1..3036d9d6 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc

@@ -168,7 +168,8 @@
   EXPECT_FALSE(loader()->IsLoaded());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
 
   test_adapter()->GetObserver()->OnPrerenderDomContentLoaded();
   // Skip SnapshotController's wait time and emulate StartSnapshot call.
@@ -193,7 +194,8 @@
   EXPECT_FALSE(loader()->IsLoaded());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
 
   PumpLoop();
   EXPECT_FALSE(loader()->IsIdle());
@@ -224,7 +226,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -247,7 +250,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -272,7 +276,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -297,7 +302,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -319,7 +325,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -341,7 +348,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
@@ -356,14 +364,16 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_TRUE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
   EXPECT_FALSE(loader()->IsLoaded());
 
   // Now try another load while first is still active.
   EXPECT_FALSE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_FALSE(loader()->IsIdle());
 }
 
@@ -373,7 +383,8 @@
   EXPECT_TRUE(loader()->IsIdle());
   EXPECT_FALSE(loader()->LoadPage(
       gurl,
-      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
+      base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this)),
+      base::Bind([](int64_t bytes) {})));
   EXPECT_TRUE(loader()->IsIdle());
 }
 

diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.cc b/chrome/browser/android/offline_pages/prerendering_offliner.cc
index 31c0813..e7ee1f9 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.cc

@@ -10,19 +10,25 @@
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offliner_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/offline_pages/core/background/offliner_policy.h"
 #include "components/offline_pages/core/background/save_page_request.h"
 #include "components/offline_pages/core/client_namespace_constants.h"
+#include "components/offline_pages/core/downloads/download_ui_adapter.h"
 #include "components/offline_pages/core/offline_page_model.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 
 namespace offline_pages {
+namespace {
+const char kDownloadUIAdapterKey[] = "download-ui-adapter";
+}
 
 PrerenderingOffliner::PrerenderingOffliner(
     content::BrowserContext* browser_context,
     const OfflinerPolicy* policy,
     OfflinePageModel* offline_page_model)
     : browser_context_(browser_context),
+      policy_(policy),
       offline_page_model_(offline_page_model),
       pending_request_(nullptr),
       is_low_end_device_(base::SysInfo::IsLowEndDevice()),
@@ -31,6 +37,20 @@
 
 PrerenderingOffliner::~PrerenderingOffliner() {}
 
+void PrerenderingOffliner::OnNetworkProgress(const SavePageRequest& request,
+                                             int64_t bytes) {
+  if (!pending_request_)
+    return;
+
+  DownloadUIAdapter* ui_adapter = static_cast<DownloadUIAdapter*>(
+      offline_page_model_->GetUserData(kDownloadUIAdapterKey));
+
+  if (!ui_adapter)
+    return;
+
+  ui_adapter->UpdateProgress(request.request_id(), bytes);
+}
+
 void PrerenderingOffliner::OnLoadPageDone(
     const SavePageRequest& request,
     Offliner::RequestStatus load_status,
@@ -178,7 +198,9 @@
   // Kick off load page attempt.
   bool accepted = GetOrCreateLoader()->LoadPage(
       request.url(), base::Bind(&PrerenderingOffliner::OnLoadPageDone,
-                                weak_ptr_factory_.GetWeakPtr(), request));
+                                weak_ptr_factory_.GetWeakPtr(), request),
+      base::Bind(&PrerenderingOffliner::OnNetworkProgress,
+                 weak_ptr_factory_.GetWeakPtr(), request));
   if (!accepted) {
     pending_request_.reset(nullptr);
   } else {
@@ -200,6 +222,20 @@
   }
 }
 
+bool PrerenderingOffliner::HandleTimeout(const SavePageRequest& request) {
+  if (pending_request_) {
+    DCHECK(request.request_id() == pending_request_->request_id());
+    if (GetOrCreateLoader()->IsLowbarMet() &&
+        (request.started_attempt_count() + 1 >= policy_->GetMaxStartedTries() ||
+         request.completed_attempt_count() + 1 >=
+             policy_->GetMaxCompletedTries())) {
+      GetOrCreateLoader()->StartSnapshot();
+      return true;
+    }
+  }
+  return false;
+}
+
 void PrerenderingOffliner::SetLoaderForTesting(
     std::unique_ptr<PrerenderingLoader> loader) {
   DCHECK(!loader_);

diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.h b/chrome/browser/android/offline_pages/prerendering_offliner.h
index 45eca74..9b1104c 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.h
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.h

@@ -37,6 +37,7 @@
   bool LoadAndSave(const SavePageRequest& request,
                    const CompletionCallback& callback) override;
   void Cancel() override;
+  bool HandleTimeout(const SavePageRequest& request) override;
 
   // Allows a loader to be injected for testing. This may only be done once
   // and must be called before any of the Offliner interface methods are called.
@@ -57,6 +58,9 @@
       const SavePageCallback& save_callback);
 
  private:
+  // Progress callback for PrerenderingLoader::LoadPage().
+  void OnNetworkProgress(const SavePageRequest& request, int64_t bytes);
+
   // Callback logic for PrerenderingLoader::LoadPage().
   void OnLoadPageDone(const SavePageRequest& request,
                       Offliner::RequestStatus load_status,
@@ -76,6 +80,8 @@
   // Not owned.
   content::BrowserContext* browser_context_;
   // Not owned.
+  const OfflinerPolicy* policy_;
+  // Not owned.
   OfflinePageModel* offline_page_model_;
   // Lazily created.
   std::unique_ptr<PrerenderingLoader> loader_;

diff --git a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
index b9a3f70c..8cfd398d 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc

@@ -16,6 +16,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/offline_pages/core/background/offliner.h"
+#include "components/offline_pages/core/background/offliner_policy.h"
 #include "components/offline_pages/core/background/save_page_request.h"
 #include "components/offline_pages/core/stub_offline_page_model.h"
 #include "components/prefs/pref_service.h"
@@ -39,12 +40,17 @@
       : PrerenderingLoader(browser_context),
         can_prerender_(true),
         mock_loading_(false),
-        mock_loaded_(false) {}
+        mock_loaded_(false),
+        mock_is_lowbar_met_(false),
+        start_snapshot_called_(false) {}
   ~MockPrerenderingLoader() override {}
 
-  bool LoadPage(const GURL& url, const LoadPageCallback& callback) override {
+  bool LoadPage(const GURL& url,
+                const LoadPageCallback& load_done_callback,
+                const ProgressCallback& progress_callback) override {
     mock_loading_ = can_prerender_;
-    load_page_callback_ = callback;
+    load_page_callback_ = load_done_callback;
+    progress_callback_ = progress_callback;
     return mock_loading_;
   }
 
@@ -55,6 +61,9 @@
 
   bool IsIdle() override { return !mock_loading_ && !mock_loaded_; }
   bool IsLoaded() override { return mock_loaded_; }
+  bool IsLowbarMet() override { return mock_is_lowbar_met_; }
+
+  void StartSnapshot() override { start_snapshot_called_ = true; }
 
   void CompleteLoadingAsFailed() {
     DCHECK(mock_loading_);
@@ -89,12 +98,19 @@
 
   void DisablePrerendering() { can_prerender_ = false; }
   const LoadPageCallback& load_page_callback() { return load_page_callback_; }
+  void set_is_lowbar_met(bool is_lowbar_met) {
+    mock_is_lowbar_met_ = is_lowbar_met;
+  }
+  bool start_snapshot_called() { return start_snapshot_called_; }
 
  private:
   bool can_prerender_;
   bool mock_loading_;
   bool mock_loaded_;
+  bool mock_is_lowbar_met_;
+  bool start_snapshot_called_;
   LoadPageCallback load_page_callback_;
+  ProgressCallback progress_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MockPrerenderingLoader);
 };
@@ -162,6 +178,7 @@
   MockOfflinePageModel* model() { return model_; }
   bool completion_callback_called() { return completion_callback_called_; }
   Offliner::RequestStatus request_status() { return request_status_; }
+  OfflinerPolicy* policy() { return policy_; }
 
  private:
   void OnCompletion(const SavePageRequest& request,
@@ -175,6 +192,7 @@
   MockOfflinePageModel* model_;
   bool completion_callback_called_;
   Offliner::RequestStatus request_status_;
+  OfflinerPolicy* policy_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderingOfflinerTest);
 };
@@ -188,7 +206,8 @@
 
 void PrerenderingOfflinerTest::SetUp() {
   model_ = new MockOfflinePageModel();
-  offliner_.reset(new PrerenderingOffliner(profile(), nullptr, model_));
+  policy_ = new OfflinerPolicy();
+  offliner_.reset(new PrerenderingOffliner(profile(), policy_, model_));
   std::unique_ptr<MockPrerenderingLoader> mock_loader(
       new MockPrerenderingLoader(nullptr));
   loader_ = mock_loader.get();
@@ -399,4 +418,70 @@
   EXPECT_FALSE(loader()->IsIdle());
 }
 
+TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndCompletedTriesMet) {
+  offliner()->SetLowEndDeviceForTesting(false);
+
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+  loader()->set_is_lowbar_met(true);
+  EXPECT_TRUE(offliner()->HandleTimeout(request));
+  EXPECT_TRUE(loader()->start_snapshot_called());
+}
+
+TEST_F(PrerenderingOfflinerTest,
+       HandleTimeoutWithLowbarAndCompletedTriesMetLowEndDevice) {
+  offliner()->SetLowEndDeviceForTesting(true);
+
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+  loader()->set_is_lowbar_met(true);
+  EXPECT_TRUE(offliner()->HandleTimeout(request));
+  EXPECT_TRUE(loader()->start_snapshot_called());
+}
+
+TEST_F(PrerenderingOfflinerTest,
+       HandleTimeoutCompletedTriesMetWithoutLowbarMet) {
+  offliner()->SetLowEndDeviceForTesting(false);
+
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  request.set_completed_attempt_count(policy()->GetMaxCompletedTries() - 1);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+  loader()->set_is_lowbar_met(false);
+  EXPECT_FALSE(offliner()->HandleTimeout(request));
+  EXPECT_FALSE(loader()->start_snapshot_called());
+}
+
+TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithLowbarAndStartedTriesMet) {
+  offliner()->SetLowEndDeviceForTesting(false);
+
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  request.set_started_attempt_count(policy()->GetMaxStartedTries() - 1);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+  loader()->set_is_lowbar_met(true);
+  EXPECT_TRUE(offliner()->HandleTimeout(request));
+  EXPECT_TRUE(loader()->start_snapshot_called());
+}
+
+TEST_F(PrerenderingOfflinerTest, HandleTimeoutWithOnlyLowbarMet) {
+  offliner()->SetLowEndDeviceForTesting(false);
+
+  base::Time creation_time = base::Time::Now();
+  SavePageRequest request(kRequestId, kHttpUrl, kClientId, creation_time,
+                          kUserRequested);
+  EXPECT_TRUE(offliner()->LoadAndSave(request, callback()));
+  loader()->set_is_lowbar_met(true);
+  EXPECT_FALSE(offliner()->HandleTimeout(request));
+  EXPECT_FALSE(loader()->start_snapshot_called());
+}
+
 }  // namespace offline_pages

diff --git a/chrome/browser/android/offline_pages/recent_tab_helper.cc b/chrome/browser/android/offline_pages/recent_tab_helper.cc
index a2019a31..064036a 100644
--- a/chrome/browser/android/offline_pages/recent_tab_helper.cc
+++ b/chrome/browser/android/offline_pages/recent_tab_helper.cc

@@ -117,6 +117,8 @@
   // If this tab helper is not enabled, immediately give the job back to
   // RequestCoordinator.
   if (!EnsureInitialized()) {
+    DVLOG(1) << "Snapshots disabled; ignored download request for: "
+             << web_contents()->GetLastCommittedURL().spec();
     ReportDownloadStatusToRequestCoordinator(new_downloads_snapshot_info.get(),
                                              false);
     return;
@@ -132,6 +134,8 @@
   // request to download the page will be immediately dismissed. See
   // https://crbug.com/686283.
   if (downloads_ongoing_snapshot_info_) {
+    DVLOG(1) << "Ongoing request exist; ignored download request for: "
+             << web_contents()->GetLastCommittedURL().spec();
     ReportDownloadStatusToRequestCoordinator(new_downloads_snapshot_info.get(),
                                              true);
     return;
@@ -143,11 +147,15 @@
   // If the page is not yet ready for a snapshot return now as it will be
   // started later, once page loading advances.
   if (PageQuality::POOR == snapshot_controller_->current_page_quality()) {
+    DVLOG(1) << "Waiting for loading page to serve download request for: "
+             << web_contents()->GetLastCommittedURL().spec();
     downloads_snapshot_on_hold_ = true;
     return;
   }
 
   // Otherwise start saving the snapshot now.
+  DVLOG(1) << "Starting download request for: "
+           << web_contents()->GetLastCommittedURL().spec();
   SaveSnapshotForDownloads(false);
 }
 
@@ -185,15 +193,23 @@
     content::NavigationHandle* navigation_handle) {
   if (!navigation_handle->IsInMainFrame() ||
       !navigation_handle->HasCommitted() || navigation_handle->IsSamePage()) {
+    DVLOG_IF(1, navigation_handle->IsInMainFrame())
+        << "Main frame navigation ignored (reasons: "
+        << !navigation_handle->HasCommitted() << ", "
+        << navigation_handle->IsSamePage()
+        << ") to: " << web_contents()->GetLastCommittedURL().spec();
     return;
   }
 
   if (!EnsureInitialized())
     return;
+  DVLOG(1) << "Navigation acknowledged to: "
+           << web_contents()->GetLastCommittedURL().spec();
 
-  // If there is an ongoing downloads request, lets allow Background Offliner to
-  // continue downloading this page.
+  // If there is an ongoing downloads request, lets make Background Offliner
+  // take over downloading that page.
   if (downloads_ongoing_snapshot_info_) {
+    DVLOG(1) << " - Passing ongoing downloads request to Background Offliner";
     ReportDownloadStatusToRequestCoordinator(
         downloads_ongoing_snapshot_info_.get(), false);
   }
@@ -211,6 +227,7 @@
       OfflinePageModel::CanSaveURL(web_contents()->GetLastCommittedURL()) &&
       OfflinePageUtils::GetOfflinePageFromWebContents(web_contents()) ==
           nullptr;
+  DVLOG_IF(1, !can_save) << " - Page can not be saved";
 
   UMA_HISTOGRAM_BOOLEAN("OfflinePages.CanSaveRecentPage", can_save);
 
@@ -218,6 +235,7 @@
     snapshot_controller_->Stop();
   last_n_listen_to_tab_hidden_ = can_save && !delegate_->IsLowEndDevice() &&
                                  IsOffliningRecentPagesEnabled();
+  DVLOG_IF(1, !last_n_listen_to_tab_hidden_) << " - Last_n is disabled";
 }
 
 void RecentTabHelper::DocumentAvailableInMainFrame() {
@@ -233,9 +251,12 @@
 void RecentTabHelper::WebContentsDestroyed() {
   // If there is an ongoing downloads request, lets allow Background Offliner to
   // continue downloading this page.
-  if (downloads_ongoing_snapshot_info_)
+  if (downloads_ongoing_snapshot_info_) {
+    DVLOG(1) << "WebContents destroyed; passing ongoing downloads request to "
+                "Background Offliner";
     ReportDownloadStatusToRequestCoordinator(
         downloads_ongoing_snapshot_info_.get(), false);
+  }
   // And cancel any ongoing snapshots.
   CancelInFlightSnapshots();
 }
@@ -247,16 +268,26 @@
   if (!IsOffliningRecentPagesEnabled())
     return;
 
-  // Return immediately if last_n is not listening to tab hidden events or if a
-  // last_n snapshot is currently being saved.
-  if (!last_n_listen_to_tab_hidden_ || last_n_ongoing_snapshot_info_)
+  // Return immediately if last_n is not listening to tab hidden events, if a
+  // last_n snapshot is currently being saved or if the tab is closing.
+  if (!last_n_listen_to_tab_hidden_ || last_n_ongoing_snapshot_info_) {
+    DVLOG(1) << "Will not snapshot for last_n (reasons: "
+             << !last_n_listen_to_tab_hidden_ << ", "
+             << !!last_n_ongoing_snapshot_info_
+             << ") for: " << web_contents()->GetLastCommittedURL().spec();
     return;
+  }
 
   // Do not save if page quality is too low.
   // Note: we assume page quality for a page can only increase.
-  if (snapshot_controller_->current_page_quality() == PageQuality::POOR)
+  if (snapshot_controller_->current_page_quality() == PageQuality::POOR) {
+    DVLOG(1) << "Will not snapshot for last_n (page quality too low) for: "
+             << web_contents()->GetLastCommittedURL().spec();
     return;
+  }
 
+  DVLOG(1) << "Starting last_n snapshot for: "
+           << web_contents()->GetLastCommittedURL().spec();
   last_n_ongoing_snapshot_info_ =
       base::MakeUnique<SnapshotProgressInfo>(GetRecentPagesClientId());
   DCHECK(last_n_ongoing_snapshot_info_->IsForLastN());
@@ -278,6 +309,8 @@
   // that allow for a navigation event to start a snapshot:
   // 1) There is a request on hold waiting for the page to be minimally loaded.
   if (snapshots_enabled_ && downloads_snapshot_on_hold_) {
+    DVLOG(1) << "Resuming downloads snapshot request for: "
+             << web_contents()->GetLastCommittedURL().spec();
     downloads_snapshot_on_hold_ = false;
     SaveSnapshotForDownloads(false);
     return;
@@ -290,6 +323,8 @@
        downloads_latest_saved_snapshot_info_ &&
        downloads_latest_saved_snapshot_info_->expected_page_quality <
            snapshot_controller_->current_page_quality())) {
+    DVLOG(1) << "Upgrading last downloads snapshot for: "
+             << web_contents()->GetLastCommittedURL().spec();
     SaveSnapshotForDownloads(true);
     return;
   }
@@ -334,6 +369,8 @@
     const std::vector<int64_t>& page_ids) {
   DCHECK(snapshot_info);
 
+  DVLOG_IF(1, !page_ids.empty()) << "Deleting " << page_ids.size()
+                                 << " offline pages...";
   page_model_->DeletePagesByOfflineId(
       page_ids, base::Bind(&RecentTabHelper::ContinueSnapshotAfterPurge,
                            weak_ptr_factory_.GetWeakPtr(), snapshot_info));
@@ -374,6 +411,9 @@
 void RecentTabHelper::ReportSnapshotCompleted(
     SnapshotProgressInfo* snapshot_info,
     bool success) {
+  DVLOG(1) << (snapshot_info->IsForLastN() ? "Last_n" : "Downloads")
+           << " snapshot " << (success ? "succeeded" : "failed")
+           << " for: " << web_contents()->GetLastCommittedURL().spec();
   if (snapshot_info->IsForLastN()) {
     DCHECK_EQ(snapshot_info, last_n_ongoing_snapshot_info_.get());
     last_n_ongoing_snapshot_info_.reset();

diff --git a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
index 2df851d..c9626478 100644
--- a/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc
+++ b/chrome/browser/android/offline_pages/recent_tab_helper_unittest.cc

@@ -23,6 +23,7 @@
 #include "components/offline_pages/core/offline_page_test_archiver.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/reload_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/test/web_contents_tester.h"
@@ -855,4 +856,35 @@
   EXPECT_EQ(offline_id, downloads_page->offline_id);
 }
 
+// Tests that a page reloaded is tracked as an actual load and properly saved.
+TEST_F(RecentTabHelperTest, ReloadIsTrackedAsNavigationAndSavedOnlyUponLoad) {
+  // Navigates and load fully then hide the tab so that a snapshot is created.
+  NavigateAndCommit(kTestPageUrl);
+  recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
+  FastForwardSnapshotController();
+  recent_tab_helper()->WasHidden();
+  RunUntilIdle();
+  ASSERT_EQ(1U, GetAllPages().size());
+
+  // Starts a reload and hides the tab. No new snapshot should be saved.
+  controller().Reload(content::ReloadType::NORMAL, false);
+  content::WebContentsTester* web_contents_tester =
+      content::WebContentsTester::For(web_contents());
+  web_contents_tester->CommitPendingNavigation();
+  recent_tab_helper()->WasHidden();
+  RunUntilIdle();
+  EXPECT_EQ(1U, page_added_count());
+  EXPECT_EQ(0U, model_removed_count());
+  ASSERT_EQ(1U, GetAllPages().size());
+
+  // Finish loading and hide the tab. A new snapshot should be created.
+  recent_tab_helper()->DocumentOnLoadCompletedInMainFrame();
+  FastForwardSnapshotController();
+  recent_tab_helper()->WasHidden();
+  RunUntilIdle();
+  EXPECT_EQ(2U, page_added_count());
+  EXPECT_EQ(1U, model_removed_count());
+  ASSERT_EQ(1U, GetAllPages().size());
+}
+
 }  // namespace offline_pages

diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index e72c483..8b1b30b 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc

@@ -18,6 +18,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
+#include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
@@ -77,6 +78,10 @@
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     AddWebappWithSkBitmap(info, webapp_id, icon_bitmap, splash_image_callback);
+    GooglePlayInstallState state =
+        ChromeWebApkHost::GetGooglePlayInstallState();
+    if (state != GooglePlayInstallState::SUPPORTED)
+      webapk::TrackGooglePlayInstallState(state);
     return;
   }
   AddShortcutWithSkBitmap(info, webapp_id, icon_bitmap);
@@ -90,6 +95,12 @@
     const WebApkInstaller::FinishCallback& callback) {
   WebApkInstallService::Get(browser_context)
       ->InstallAsync(info, icon_bitmap, callback);
+  // Don't record metric for users who install WebAPKs via "unsigned sources"
+  // flow.
+  if (ChromeWebApkHost::GetGooglePlayInstallState() ==
+      GooglePlayInstallState::SUPPORTED) {
+    webapk::TrackGooglePlayInstallState(GooglePlayInstallState::SUPPORTED);
+  }
 }
 
 // static

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 1eb487d..93d072b 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc

@@ -126,7 +126,8 @@
     : weak_java_tab_(env, obj),
       content_layer_(cc::Layer::Create()),
       tab_content_manager_(NULL),
-      synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)) {
+      synced_tab_delegate_(new browser_sync::SyncedTabDelegateAndroid(this)),
+      embedded_media_experience_enabled_(false) {
   Java_Tab_setNativePtr(env, obj, reinterpret_cast<intptr_t>(this));
 }
 
@@ -716,6 +717,22 @@
   return HasPrerenderedUrl(gurl);
 }
 
+void TabAndroid::EnableEmbeddedMediaExperience(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    jboolean enabled) {
+  embedded_media_experience_enabled_ = enabled;
+
+  if (!web_contents() || !web_contents()->GetRenderViewHost())
+    return;
+
+  web_contents()->GetRenderViewHost()->OnWebkitPreferencesChanged();
+}
+
+bool TabAndroid::ShouldEnableEmbeddedMediaExperience() const {
+  return embedded_media_experience_enabled_;
+}
+
 namespace {
 
 class ChromeInterceptNavigationDelegate : public InterceptNavigationDelegate {

diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 12ee17c..311218a 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h

@@ -240,6 +240,13 @@
     return webapp_manifest_scope_;
   }
 
+  void EnableEmbeddedMediaExperience(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jboolean enabled);
+
+  bool ShouldEnableEmbeddedMediaExperience() const;
+
   // Register the Tab's native methods through JNI.
   static bool RegisterTabAndroid(JNIEnv* env);
 
@@ -266,6 +273,7 @@
   std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   std::string webapp_manifest_scope_;
+  bool embedded_media_experience_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };

diff --git a/chrome/browser/android/vr_shell/BUILD.gn b/chrome/browser/android/vr_shell/BUILD.gn
index b5573b7..fd7b38e 100644
--- a/chrome/browser/android/vr_shell/BUILD.gn
+++ b/chrome/browser/android/vr_shell/BUILD.gn

@@ -13,6 +13,8 @@
     defines = []
 
     sources = [
+      "android_ui_gesture_target.cc",
+      "android_ui_gesture_target.h",
       "animation.cc",
       "animation.h",
       "easing.cc",
@@ -65,6 +67,7 @@
       "//components/omnibox/browser",
       "//components/rappor",
       "//components/security_state/core",
+      "//content/public/android:jni",
       "//content/public/browser",
       "//content/public/common",
       "//device/gamepad",

diff --git a/chrome/browser/android/vr_shell/PRESUBMIT.py b/chrome/browser/android/vr_shell/PRESUBMIT.py
index 2292c80e..70b0a60 100644
--- a/chrome/browser/android/vr_shell/PRESUBMIT.py
+++ b/chrome/browser/android/vr_shell/PRESUBMIT.py

@@ -15,9 +15,9 @@
 # linters, and add exclusions if necessary.
 #
 # Note that this list must be non-empty, or cpplint will use its default set of
-# filters. Therefore, explicitly enable a single dummy linter.
+# filters.
 LINT_FILTERS = [
-  '+build/include',
+  '-build/include',
 ]
 
 VERBOSITY_LEVEL = 4

diff --git a/chrome/browser/android/vr_shell/android_ui_gesture_target.cc b/chrome/browser/android/vr_shell/android_ui_gesture_target.cc
new file mode 100644
index 0000000..9bccc02
--- /dev/null
+++ b/chrome/browser/android/vr_shell/android_ui_gesture_target.cc

@@ -0,0 +1,102 @@
+// Copyright 2017 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 "chrome/browser/android/vr_shell/android_ui_gesture_target.h"
+
+#include "jni/MotionEventSynthesizer_jni.h"
+
+namespace vr_shell {
+
+AndroidUiGestureTarget::AndroidUiGestureTarget(jobject event_synthesizer,
+                                               float scroll_ratio)
+    : event_synthesizer_(event_synthesizer), scroll_ratio_(scroll_ratio) {
+  DCHECK(event_synthesizer_);
+}
+
+AndroidUiGestureTarget::~AndroidUiGestureTarget() = default;
+
+void AndroidUiGestureTarget::DispatchWebInputEvent(
+    std::unique_ptr<blink::WebInputEvent> event) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  blink::WebMouseEvent* mouse;
+  blink::WebGestureEvent* gesture;
+  if (blink::WebInputEvent::isMouseEventType(event->type())) {
+    mouse = static_cast<blink::WebMouseEvent*>(event.get());
+  } else {
+    gesture = static_cast<blink::WebGestureEvent*>(event.get());
+  }
+
+  switch (event->type()) {
+    case blink::WebGestureEvent::GestureScrollBegin:
+      DCHECK(gesture->data.scrollBegin.deltaHintUnits ==
+             blink::WebGestureEvent::ScrollUnits::PrecisePixels);
+      scroll_x_ = (scroll_ratio_ * gesture->data.scrollBegin.deltaXHint);
+      scroll_y_ = (scroll_ratio_ * gesture->data.scrollBegin.deltaYHint);
+      SetPointer(env, 0, 0);
+      Inject(env, Action::Start, gesture->timeStampSeconds());
+      SetPointer(env, scroll_x_, scroll_y_);
+      // Send a move immediately so that we can't accidentally trigger a click.
+      Inject(env, Action::Move, gesture->timeStampSeconds());
+      break;
+    case blink::WebGestureEvent::GestureScrollEnd:
+      Inject(env, Action::End, gesture->timeStampSeconds());
+      break;
+    case blink::WebGestureEvent::GestureScrollUpdate:
+      scroll_x_ += (scroll_ratio_ * gesture->data.scrollUpdate.deltaX);
+      scroll_y_ += (scroll_ratio_ * gesture->data.scrollUpdate.deltaY);
+      SetPointer(env, scroll_x_, scroll_y_);
+      Inject(env, Action::Move, gesture->timeStampSeconds());
+      break;
+    case blink::WebGestureEvent::GestureTapDown:
+      SetPointer(env, gesture->x, gesture->y);
+      Inject(env, Action::Start, gesture->timeStampSeconds());
+      Inject(env, Action::End, gesture->timeStampSeconds());
+      break;
+    case blink::WebGestureEvent::GestureFlingCancel:
+      Inject(env, Action::Cancel, gesture->timeStampSeconds());
+      break;
+    case blink::WebGestureEvent::GestureFlingStart:
+      // Flings are automatically generated for android UI. Ignore this input.
+      break;
+    case blink::WebMouseEvent::MouseEnter:
+      SetPointer(env, mouse->x, mouse->y);
+      Inject(env, Action::HoverEnter, gesture->timeStampSeconds());
+      break;
+    case blink::WebMouseEvent::MouseMove:
+      SetPointer(env, mouse->x, mouse->y);
+      Inject(env, Action::HoverMove, gesture->timeStampSeconds());
+      break;
+    case blink::WebMouseEvent::MouseLeave:
+      SetPointer(env, mouse->x, mouse->y);
+      Inject(env, Action::HoverExit, gesture->timeStampSeconds());
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+}
+
+void AndroidUiGestureTarget::SetPointer(JNIEnv* env, int x, int y) {
+  content::Java_MotionEventSynthesizer_setPointer(env, event_synthesizer_, 0, x,
+                                                  y, 0);
+}
+
+void AndroidUiGestureTarget::SetScrollDeltas(JNIEnv* env,
+                                             int x,
+                                             int y,
+                                             int dx,
+                                             int dy) {
+  content::Java_MotionEventSynthesizer_setScrollDeltas(env, event_synthesizer_,
+                                                       x, y, dx, dy);
+}
+
+void AndroidUiGestureTarget::Inject(JNIEnv* env,
+                                    Action action,
+                                    double time_in_seconds) {
+  content::Java_MotionEventSynthesizer_inject(
+      env, event_synthesizer_, static_cast<int>(action), 1,
+      static_cast<int64_t>(time_in_seconds * 1000.0));
+}
+
+}  // namespace vr_shell

diff --git a/chrome/browser/android/vr_shell/android_ui_gesture_target.h b/chrome/browser/android/vr_shell/android_ui_gesture_target.h
new file mode 100644
index 0000000..396a963
--- /dev/null
+++ b/chrome/browser/android/vr_shell/android_ui_gesture_target.h

@@ -0,0 +1,54 @@
+// Copyright 2017 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 CHROME_BROWSER_ANDROID_VR_SHELL_ANDROID_UI_GESTURE_TARGET_H_
+#define CHROME_BROWSER_ANDROID_VR_SHELL_ANDROID_UI_GESTURE_TARGET_H_
+
+#include <memory>
+
+#include "base/android/jni_android.h"
+#include "base/macros.h"
+#include "base/time/time.h"
+#include "third_party/WebKit/public/platform/WebGestureEvent.h"
+#include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
+
+namespace vr_shell {
+
+class AndroidUiGestureTarget {
+ public:
+  AndroidUiGestureTarget(jobject event_synthesizer, float dpr_ratio);
+  ~AndroidUiGestureTarget();
+
+  void DispatchWebInputEvent(std::unique_ptr<blink::WebInputEvent> event);
+
+ private:
+  // Enum values below need to be kept in sync with MotionEventSynthesizer.java.
+  enum Action {
+    Invalid = -1,
+    Start = 0,
+    Move = 1,
+    Cancel = 2,
+    End = 3,
+    Scroll = 4,
+    HoverEnter = 5,
+    HoverExit = 6,
+    HoverMove = 7,
+  };
+
+  void SetPointer(JNIEnv* env, int x, int y);
+  void SetScrollDeltas(JNIEnv* env, int x, int y, int dx, int dy);
+  void Inject(JNIEnv* env, Action action, double time_in_seconds);
+
+  jobject event_synthesizer_;
+  int scroll_x_ = 0;
+  int scroll_y_ = 0;
+  float scroll_ratio_;
+
+  DISALLOW_COPY_AND_ASSIGN(AndroidUiGestureTarget);
+};
+
+}  // namespace vr_shell
+
+#endif  // CHROME_BROWSER_ANDROID_VR_SHELL_ANDROID_UI_GESTURE_TARGET_H_

diff --git a/chrome/browser/android/vr_shell/ui_elements.cc b/chrome/browser/android/vr_shell/ui_elements.cc
index bec47f4..5fb4805 100644
--- a/chrome/browser/android/vr_shell/ui_elements.cc
+++ b/chrome/browser/android/vr_shell/ui_elements.cc

@@ -198,7 +198,7 @@
 }
 
 bool ContentRectangle::IsHitTestable() const {
-  return hit_testable;
+  return IsVisible() && hit_testable;
 }
 
 }  // namespace vr_shell

diff --git a/chrome/browser/android/vr_shell/vr_controller.cc b/chrome/browser/android/vr_shell/vr_controller.cc
index 2d4a810..387db15 100644
--- a/chrome/browser/android/vr_shell/vr_controller.cc
+++ b/chrome/browser/android/vr_shell/vr_controller.cc

@@ -253,7 +253,7 @@
       HandleScrollingState(gesture);
       break;
     default:
-      LOG(ERROR) << "Wrong gesture detector state: " << state_;
+      NOTREACHED();
       break;
   }
 }
@@ -287,11 +287,13 @@
       !ButtonDownHappened(gvr::kControllerButtonClick)) {
     state_ = SCROLLING;
     gesture->setType(WebInputEvent::GestureScrollBegin);
-    UpdateGesture(gesture);
+    UpdateGestureParameters();
     gesture->data.scrollBegin.deltaXHint =
         displacement_.x * kDisplacementScaleFactor;
     gesture->data.scrollBegin.deltaYHint =
         displacement_.y * kDisplacementScaleFactor;
+    gesture->data.scrollBegin.deltaHintUnits =
+        blink::WebGestureEvent::ScrollUnits::PrecisePixels;
   }
 }
 
@@ -300,11 +302,11 @@
       ButtonDownHappened(gvr::kControllerButtonClick)) {
     // Gesture ends.
     gesture->setType(WebInputEvent::GestureScrollEnd);
-    UpdateGesture(gesture);
+    UpdateGestureParameters();
   } else if (touch_position_changed_) {
     // User continues scrolling and there is a change in touch position.
     gesture->setType(WebInputEvent::GestureScrollUpdate);
-    UpdateGesture(gesture);
+    UpdateGestureParameters();
     if (IsHorizontalGesture()) {
       gesture->data.scrollUpdate.deltaX =
           displacement_.x * kDisplacementScaleFactor;
@@ -340,9 +342,7 @@
   Vector::SetZero(&last_velocity_);
 }
 
-void VrController::UpdateGesture(WebGestureEvent* gesture) {
-  if (!gesture)
-    LOG(ERROR) << "The gesture pointer is not initiated properly.";
+void VrController::UpdateGestureParameters() {
   displacement_ = Vector::Subtract(touch_info_->touch_point.position,
                                    prev_touch_point_->position);
 }

diff --git a/chrome/browser/android/vr_shell/vr_controller.h b/chrome/browser/android/vr_shell/vr_controller.h
index 3d4de03..8e70fd13 100644
--- a/chrome/browser/android/vr_shell/vr_controller.h
+++ b/chrome/browser/android/vr_shell/vr_controller.h

@@ -109,8 +109,7 @@
 
   void Reset();
 
-  // Update gesture parameters,
-  void UpdateGesture(WebGestureEvent* gesture);
+  void UpdateGestureParameters();
 
   // If the user is touching the touch pad and the touch point is different from
   // before, update the touch point and return true. Otherwise, return false.

diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc
index 55312c7..ba595ae 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc

@@ -18,6 +18,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/android/tab_android.h"
+#include "chrome/browser/android/vr_shell/android_ui_gesture_target.h"
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/vr_compositor.h"
 #include "chrome/browser/android/vr_shell/vr_gl_thread.h"
@@ -106,16 +107,19 @@
   delete this;
 }
 
-void VrShell::SwapContents(JNIEnv* env,
-                           const JavaParamRef<jobject>& obj,
-                           const JavaParamRef<jobject>& web_contents) {
+void VrShell::SwapContents(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& web_contents,
+    const JavaParamRef<jobject>& touch_event_synthesizer) {
   content::WebContents* contents =
       content::WebContents::FromJavaWebContents(web_contents);
-  if (contents == main_contents_)
+  if (contents == main_contents_ &&
+      touch_event_synthesizer.obj() == j_motion_event_synthesizer_.obj())
     return;
 
   SetIsInVR(main_contents_, false);
-
+  j_motion_event_synthesizer_.Reset(env, touch_event_synthesizer);
   main_contents_ = contents;
   content_compositor_->SetLayer(main_contents_);
   SetIsInVR(main_contents_, true);
@@ -123,6 +127,9 @@
   SetUiState();
 
   if (!main_contents_) {
+    android_ui_gesture_target_ = base::MakeUnique<AndroidUiGestureTarget>(
+        j_motion_event_synthesizer_.obj(),
+        Java_VrShellImpl_getNativePageScrollRatio(env, j_vr_shell_.obj()));
     content_input_manager_ = nullptr;
     vr_web_contents_observer_ = nullptr;
     metrics_helper_ = nullptr;
@@ -567,6 +574,8 @@
     std::unique_ptr<blink::WebInputEvent> event) {
   if (content_input_manager_) {
     content_input_manager_->ProcessUpdatedGesture(std::move(event));
+  } else if (android_ui_gesture_target_) {
+    android_ui_gesture_target_->DispatchWebInputEvent(std::move(event));
   }
 }
 

diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
index c168e9ae..b887d5079 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h

@@ -38,6 +38,7 @@
 
 namespace vr_shell {
 
+class AndroidUiGestureTarget;
 class UiInterface;
 class VrCompositor;
 class VrGLThread;
@@ -74,9 +75,11 @@
           VrShellDelegate* delegate,
           gvr_context* gvr_api,
           bool reprojected_rendering);
-  void SwapContents(JNIEnv* env,
-                    const base::android::JavaParamRef<jobject>& obj,
-                    const base::android::JavaParamRef<jobject>& web_contents);
+  void SwapContents(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      const base::android::JavaParamRef<jobject>& web_contents,
+      const base::android::JavaParamRef<jobject>& touch_event_synthesizer);
   void LoadUIContent(JNIEnv* env,
                      const base::android::JavaParamRef<jobject>& obj);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -204,6 +207,7 @@
   bool webvr_mode_ = false;
 
   content::WebContents* main_contents_ = nullptr;
+  base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_;
   ui::WindowAndroid* content_window_;
   std::unique_ptr<VrCompositor> content_compositor_;
   content::WebContents* ui_contents_;
@@ -215,6 +219,7 @@
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   std::unique_ptr<VrInputManager> content_input_manager_;
+  std::unique_ptr<AndroidUiGestureTarget> android_ui_gesture_target_;
   std::unique_ptr<VrInputManager> ui_input_manager_;
   std::unique_ptr<VrMetricsHelper> metrics_helper_;
 

diff --git a/chrome/browser/android/webapk/chrome_webapk_host.cc b/chrome/browser/android/webapk/chrome_webapk_host.cc
index ae712eea..0d73490 100644
--- a/chrome/browser/android/webapk/chrome_webapk_host.cc
+++ b/chrome/browser/android/webapk/chrome_webapk_host.cc

@@ -27,6 +27,13 @@
 }
 
 // static
+GooglePlayInstallState ChromeWebApkHost::GetGooglePlayInstallState() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  return static_cast<GooglePlayInstallState>(
+      Java_ChromeWebApkHost_getGooglePlayInstallState(env));
+}
+
+// static
 jboolean CanUseGooglePlayToInstallWebApk(
     JNIEnv* env,
     const base::android::JavaParamRef<jclass>& clazz) {

diff --git a/chrome/browser/android/webapk/chrome_webapk_host.h b/chrome/browser/android/webapk/chrome_webapk_host.h
index 943e07e..153c454 100644
--- a/chrome/browser/android/webapk/chrome_webapk_host.h
+++ b/chrome/browser/android/webapk/chrome_webapk_host.h

@@ -9,6 +9,19 @@
 
 #include "base/macros.h"
 
+// This enum is used to back a UMA histogram, and must be treated as
+// append-only.
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
+enum class GooglePlayInstallState {
+  SUPPORTED = 0,
+  DISABLED_OTHER = 1,
+  NO_PLAY_SERVICES = 2,
+  DISABLED_BY_VARIATIONS = 3,
+  DISABLED_BY_PLAY = 4,
+  MAX = 5
+};
+
 // ChromeWebApkHost is the C++ counterpart of org.chromium.chrome.browser's
 // ChromeWebApkHost in Java.
 class ChromeWebApkHost {
@@ -20,6 +33,9 @@
   // or Google Play.
   static bool CanInstallWebApk();
 
+  // Returns the state of installing a WebAPK from Google Play.
+  static GooglePlayInstallState GetGooglePlayInstallState();
+
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeWebApkHost);
 };

diff --git a/chrome/browser/android/webapk/webapk_info.cc b/chrome/browser/android/webapk/webapk_info.cc
index d97a469a7..e6cd84d 100644
--- a/chrome/browser/android/webapk/webapk_info.cc
+++ b/chrome/browser/android/webapk/webapk_info.cc

@@ -8,8 +8,8 @@
                        std::string package_name,
                        int shell_apk_version,
                        int version_code)
-    : short_name(short_name),
-      package_name(package_name),
+    : short_name(std::move(short_name)),
+      package_name(std::move(package_name)),
       shell_apk_version(shell_apk_version),
       version_code(version_code) {}
 

diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
index b0aac63..7df48b2 100644
--- a/chrome/browser/android/webapk/webapk_installer.cc
+++ b/chrome/browser/android/webapk/webapk_installer.cc

@@ -30,6 +30,7 @@
 #include "jni/WebApkInstaller_jni.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.h"
@@ -556,7 +557,8 @@
       download_url, output_path, true, request_context_getter_,
       base::Bind(&WebApkInstaller::OnWebApkDownloaded,
                  weak_ptr_factory_.GetWeakPtr(), output_path, download_url,
-                 retry_if_fails)));
+                 retry_if_fails),
+      NO_TRAFFIC_ANNOTATION_YET));
 }
 
 void WebApkInstaller::OnWebApkDownloaded(const base::FilePath& file_path,

diff --git a/chrome/browser/android/webapk/webapk_metrics.cc b/chrome/browser/android/webapk/webapk_metrics.cc
index 7a9aff7..82c8a107 100644
--- a/chrome/browser/android/webapk/webapk_metrics.cc
+++ b/chrome/browser/android/webapk/webapk_metrics.cc

@@ -6,9 +6,11 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "base/time/time.h"
+#include "chrome/browser/android/webapk/chrome_webapk_host.h"
 
 namespace webapk {
 
+const char kGooglePlayInstallState[] = "WebApk.Install.GooglePlayInstallState";
 const char kInstallDurationHistogram[] = "WebApk.Install.InstallDuration";
 const char kInstallEventHistogram[] = "WebApk.Install.InstallEvent";
 const char kInstallSourceHistogram[] = "WebApk.Install.InstallSource";
@@ -36,4 +38,9 @@
   UMA_HISTOGRAM_ENUMERATION(kUserActionHistogram, event, USER_ACTION_MAX);
 }
 
+void TrackGooglePlayInstallState(GooglePlayInstallState state) {
+  UMA_HISTOGRAM_ENUMERATION(kGooglePlayInstallState, static_cast<int>(state),
+                            static_cast<int>(GooglePlayInstallState::MAX));
+}
+
 }  // namespace webapk

diff --git a/chrome/browser/android/webapk/webapk_metrics.h b/chrome/browser/android/webapk/webapk_metrics.h
index d859c13..5c5b990 100644
--- a/chrome/browser/android/webapk/webapk_metrics.h
+++ b/chrome/browser/android/webapk/webapk_metrics.h

@@ -9,6 +9,8 @@
 class TimeDelta;
 }
 
+enum class GooglePlayInstallState;
+
 namespace webapk {
 
 // Keep these enums up to date with tools/metrics/histograms/histograms.xml.
@@ -62,6 +64,14 @@
 void TrackInstallInfoBarShown(InfoBarShown event);
 void TrackUserAction(UserAction event);
 
+// On web app and WebAPK installation records whether a WebAPK could be
+// installed via the Google Play flow. If not, records why the WebAPK could not
+// be installed via the Google Play flow (and a web app was added to the
+// homescreen instead).
+// Warning: This metric is recorded whenever a site is added to the homescreeen
+// as a web app, not just for sites with a WebAPK compatible Web Manifest.
+void TrackGooglePlayInstallState(GooglePlayInstallState state);
+
 };  // namespace webapk
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_METRICS_H_

diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index b14a7890..b57c6b77 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -2788,7 +2788,7 @@
         download->GetLastModifiedTime(), download->GetReceivedBytes(),
         download->GetTotalBytes(), download->GetHash(), download->GetState(),
         download->GetDangerType(), download->GetLastReason(),
-        download->GetOpened()));
+        download->GetOpened(), download->GetReceivedSlices()));
   }
 
   std::unique_ptr<content::DownloadTestObserver> completion_observer(

diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
index 34da670..60435211 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.cc

@@ -7,6 +7,7 @@
 #include <memory>
 
 #include "base/bind.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/banners/app_banner_manager.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
@@ -17,7 +18,6 @@
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 namespace banners {
 
@@ -64,8 +64,8 @@
   return APP_BANNER_INFOBAR_DELEGATE_DESKTOP;
 }
 
-gfx::VectorIconId AppBannerInfoBarDelegateDesktop::GetVectorIconId() const {
-  return gfx::VectorIconId::APPS;
+const gfx::VectorIcon& AppBannerInfoBarDelegateDesktop::GetVectorIcon() const {
+  return kAppsIcon;
 }
 
 void AppBannerInfoBarDelegateDesktop::InfoBarDismissed() {

diff --git a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
index 40de27f..8fa1764 100644
--- a/chrome/browser/banners/app_banner_infobar_delegate_desktop.h
+++ b/chrome/browser/banners/app_banner_infobar_delegate_desktop.h

@@ -48,7 +48,7 @@
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   void InfoBarDismissed() override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;

diff --git a/chrome/browser/browsing_data/downloads_counter_browsertest.cc b/chrome/browser/browsing_data/downloads_counter_browsertest.cc
index ea865fbb..7bcab2b 100644
--- a/chrome/browser/browsing_data/downloads_counter_browsertest.cc
+++ b/chrome/browser/browsing_data/downloads_counter_browsertest.cc

@@ -150,7 +150,8 @@
         state,
         danger,
         reason,
-        false);
+        false,
+        std::vector<content::DownloadItem::ReceivedSlice>());
 
     return guid;
   }

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5ff1d24..1e20b66c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -2660,13 +2660,16 @@
   web_prefs->data_saver_enabled = GetDataSaverEnabledPref(prefs);
 
 #if defined(OS_ANDROID)
-  if (base::FeatureList::IsEnabled(
-          features::kAllowAutoplayUnmutedInWebappManifestScope)) {
-    content::WebContents* contents =
-        content::WebContents::FromRenderViewHost(rvh);
-    if (contents) {
-      TabAndroid* tab_android = TabAndroid::FromWebContents(contents);
-      if (tab_android) {
+  content::WebContents* contents =
+      content::WebContents::FromRenderViewHost(rvh);
+  if (contents) {
+    TabAndroid* tab_android = TabAndroid::FromWebContents(contents);
+    if (tab_android) {
+      web_prefs->embedded_media_experience_enabled =
+          tab_android->ShouldEnableEmbeddedMediaExperience();
+
+      if (base::FeatureList::IsEnabled(
+              features::kAllowAutoplayUnmutedInWebappManifestScope)) {
         web_prefs->media_playback_gesture_whitelist_scope =
             tab_android->GetWebappManifestScope();
       }

diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index 7486bd47..65a7512 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn

@@ -724,12 +724,12 @@
     "login/easy_unlock/short_lived_user_context.h",
     "login/enrollment/auto_enrollment_check_screen.cc",
     "login/enrollment/auto_enrollment_check_screen.h",
-    "login/enrollment/auto_enrollment_check_screen_actor.h",
+    "login/enrollment/auto_enrollment_check_screen_view.h",
     "login/enrollment/auto_enrollment_controller.cc",
     "login/enrollment/auto_enrollment_controller.h",
     "login/enrollment/enrollment_screen.cc",
     "login/enrollment/enrollment_screen.h",
-    "login/enrollment/enrollment_screen_actor.h",
+    "login/enrollment/enrollment_screen_view.h",
     "login/enrollment/enrollment_uma.cc",
     "login/enrollment/enrollment_uma.h",
     "login/enrollment/enterprise_enrollment_helper.cc",
@@ -778,8 +778,8 @@
     "login/screen_manager.h",
     "login/screens/arc_terms_of_service_screen.cc",
     "login/screens/arc_terms_of_service_screen.h",
-    "login/screens/arc_terms_of_service_screen_actor.h",
-    "login/screens/arc_terms_of_service_screen_actor_observer.h",
+    "login/screens/arc_terms_of_service_screen_view.h",
+    "login/screens/arc_terms_of_service_screen_view_observer.h",
     "login/screens/base_screen.cc",
     "login/screens/base_screen.h",
     "login/screens/base_screen_delegate.h",
@@ -787,36 +787,37 @@
     "login/screens/chrome_user_selection_screen.h",
     "login/screens/controller_pairing_screen.cc",
     "login/screens/controller_pairing_screen.h",
-    "login/screens/controller_pairing_screen_actor.cc",
-    "login/screens/controller_pairing_screen_actor.h",
-    "login/screens/core_oobe_actor.h",
+    "login/screens/controller_pairing_screen_view.cc",
+    "login/screens/controller_pairing_screen_view.h",
+    "login/screens/core_oobe_view.h",
     "login/screens/device_disabled_screen.cc",
     "login/screens/device_disabled_screen.h",
-    "login/screens/device_disabled_screen_actor.h",
+    "login/screens/device_disabled_screen_view.h",
     "login/screens/enable_debugging_screen.cc",
     "login/screens/enable_debugging_screen.h",
-    "login/screens/enable_debugging_screen_actor.h",
+    "login/screens/enable_debugging_screen_view.h",
     "login/screens/error_screen.cc",
     "login/screens/error_screen.h",
-    "login/screens/error_screen_actor_delegate.h",
+    "login/screens/error_screen_view_delegate.h",
     "login/screens/eula_screen.cc",
     "login/screens/eula_screen.h",
     "login/screens/eula_view.h",
     "login/screens/gaia_screen.cc",
     "login/screens/gaia_screen.h",
+    "login/screens/gaia_view.h",
     "login/screens/hid_detection_screen.cc",
     "login/screens/hid_detection_screen.h",
     "login/screens/hid_detection_view.h",
     "login/screens/host_pairing_screen.cc",
     "login/screens/host_pairing_screen.h",
-    "login/screens/host_pairing_screen_actor.cc",
-    "login/screens/host_pairing_screen_actor.h",
+    "login/screens/host_pairing_screen_view.cc",
+    "login/screens/host_pairing_screen_view.h",
     "login/screens/kiosk_autolaunch_screen.cc",
     "login/screens/kiosk_autolaunch_screen.h",
-    "login/screens/kiosk_autolaunch_screen_actor.h",
+    "login/screens/kiosk_autolaunch_screen_view.h",
     "login/screens/kiosk_enable_screen.cc",
     "login/screens/kiosk_enable_screen.h",
-    "login/screens/kiosk_enable_screen_actor.h",
+    "login/screens/kiosk_enable_screen_view.h",
     "login/screens/model_view_channel.h",
     "login/screens/network_error.cc",
     "login/screens/network_error.h",
@@ -830,7 +831,7 @@
     "login/screens/screen_flow.h",
     "login/screens/terms_of_service_screen.cc",
     "login/screens/terms_of_service_screen.h",
-    "login/screens/terms_of_service_screen_actor.h",
+    "login/screens/terms_of_service_screen_view.h",
     "login/screens/update_screen.cc",
     "login/screens/update_screen.h",
     "login/screens/update_view.h",
@@ -840,7 +841,7 @@
     "login/screens/user_selection_screen.h",
     "login/screens/wrong_hwid_screen.cc",
     "login/screens/wrong_hwid_screen.h",
-    "login/screens/wrong_hwid_screen_actor.h",
+    "login/screens/wrong_hwid_screen_view.h",
     "login/session/chrome_session_manager.cc",
     "login/session/chrome_session_manager.h",
     "login/session/user_session_manager.cc",

diff --git a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc
index cbe7c69..908e8737 100644
--- a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc
+++ b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc

@@ -32,6 +32,7 @@
   // views::View overrides.
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
     node_data->AddIntAttribute(ui::AX_ATTR_CHILD_TREE_ID, id_);
+    node_data->role = ui::AX_ROLE_CLIENT;
   }
 
  private:
@@ -95,7 +96,7 @@
           chromeos::switches::kEnableChromeVoxArcSupport)) {
     instance->SetFilter(arc::mojom::AccessibilityFilterType::ALL);
     if (!tree_source_) {
-      tree_source_.reset(new AXTreeSourceArc());
+      tree_source_.reset(new AXTreeSourceArc(tree_id()));
       focus_stealer_.reset(new FocusStealer(tree_source_->tree_id()));
       exo::WMHelper::GetInstance()->AddActivationObserver(this);
     }
@@ -159,4 +160,19 @@
   }
 }
 
+void ArcAccessibilityHelperBridge::PerformAction(const ui::AXActionData& data) {
+  arc::mojom::AccessibilityActionType mojo_action;
+  switch (data.action) {
+    case ui::AX_ACTION_DO_DEFAULT:
+      mojo_action = arc::mojom::AccessibilityActionType::CLICK;
+      break;
+    default:
+      return;
+  }
+
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->accessibility_helper(), PerformAction);
+  instance->PerformAction(data.target_node_id, mojo_action);
+}
+
 }  // namespace arc

diff --git a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h
index aeaa640..1cc84f9 100644
--- a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h
+++ b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h

@@ -12,6 +12,7 @@
 #include "components/arc/instance_holder.h"
 #include "components/exo/wm_helper.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "ui/accessibility/ax_host_delegate.h"
 
 namespace views {
 
@@ -31,7 +32,8 @@
     : public ArcService,
       public mojom::AccessibilityHelperHost,
       public InstanceHolder<mojom::AccessibilityHelperInstance>::Observer,
-      public exo::WMHelper::ActivationObserver {
+      public exo::WMHelper::ActivationObserver,
+      public ui::AXHostDelegate {
  public:
   explicit ArcAccessibilityHelperBridge(ArcBridgeService* bridge_service);
   ~ArcAccessibilityHelperBridge() override;
@@ -51,6 +53,9 @@
   void OnWindowActivated(aura::Window* gained_active,
                          aura::Window* lost_active) override;
 
+  // AXHostDelegate overrides.
+  void PerformAction(const ui::AXActionData& data) override;
+
   mojo::Binding<mojom::AccessibilityHelperHost> binding_;
 
   std::unique_ptr<AXTreeSourceArc> tree_source_;

diff --git a/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.cc b/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.cc
index a5e06bb..c65d9a4 100644
--- a/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.cc
+++ b/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.cc

@@ -10,7 +10,6 @@
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "components/exo/wm_helper.h"
-#include "ui/accessibility/ax_tree_id_registry.h"
 #include "ui/aura/window.h"
 
 namespace {
@@ -89,8 +88,8 @@
 
 namespace arc {
 
-AXTreeSourceArc::AXTreeSourceArc()
-    : tree_id_(ui::AXTreeIDRegistry::GetInstance()->CreateID()),
+AXTreeSourceArc::AXTreeSourceArc(int32_t id)
+    : tree_id_(id),
       current_tree_serializer_(new AXTreeArcSerializer(this)),
       root_id_(-1),
       focused_node_id_(-1) {}

diff --git a/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h b/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h
index 2ebde4c0..da0ebbc 100644
--- a/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h
+++ b/chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h

@@ -30,7 +30,7 @@
                               ui::AXNodeData,
                               ui::AXTreeData> {
  public:
-  AXTreeSourceArc();
+  explicit AXTreeSourceArc(int32_t tree_id);
   ~AXTreeSourceArc() override;
 
   // Notify automation of an accessibility event.

diff --git a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
index 62a8c49..cfae8a4 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc

@@ -23,8 +23,8 @@
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h"
 #include "chrome/browser/chromeos/arc/test/arc_data_removed_waiter.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ -674,7 +674,7 @@
 
 class ArcSessionOobeOptInNegotiatorTest
     : public ArcSessionOobeOptInTest,
-      public chromeos::ArcTermsOfServiceScreenActor,
+      public chromeos::ArcTermsOfServiceScreenView,
       public testing::WithParamInterface<bool> {
  public:
   ArcSessionOobeOptInNegotiatorTest() = default;
@@ -684,7 +684,7 @@
 
     AppendEnableArcOOBEOptInSwitch();
 
-    ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(
+    ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenViewForTesting(
         this);
 
     GetFakeUserManager()->set_current_user_new(true);
@@ -708,7 +708,7 @@
     // Correctly stop service.
     arc_session_manager()->Shutdown();
 
-    ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(
+    ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenViewForTesting(
         nullptr);
 
     ArcSessionOobeOptInTest::TearDown();
@@ -727,9 +727,9 @@
     base::RunLoop().RunUntilIdle();
   }
 
-  void ReportActorDestroyed() {
+  void ReportViewDestroyed() {
     for (auto& observer : observer_list_)
-      observer.OnActorDestroyed(this);
+      observer.OnViewDestroyed(this);
     base::RunLoop().RunUntilIdle();
   }
 
@@ -745,17 +745,17 @@
     ArcDataRemovedWaiter().Wait();
   }
 
-  chromeos::ArcTermsOfServiceScreenActor* actor() { return this; }
+  chromeos::ArcTermsOfServiceScreenView* view() { return this; }
 
  private:
-  // ArcTermsOfServiceScreenActor:
+  // ArcTermsOfServiceScreenView:
   void AddObserver(
-      chromeos::ArcTermsOfServiceScreenActorObserver* observer) override {
+      chromeos::ArcTermsOfServiceScreenViewObserver* observer) override {
     observer_list_.AddObserver(observer);
   }
 
   void RemoveObserver(
-      chromeos::ArcTermsOfServiceScreenActorObserver* observer) override {
+      chromeos::ArcTermsOfServiceScreenViewObserver* observer) override {
     observer_list_.RemoveObserver(observer);
   }
 
@@ -767,7 +767,7 @@
 
   void Hide() override {}
 
-  base::ObserverList<chromeos::ArcTermsOfServiceScreenActorObserver>
+  base::ObserverList<chromeos::ArcTermsOfServiceScreenViewObserver>
       observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSessionOobeOptInNegotiatorTest);
@@ -778,7 +778,7 @@
                         ::testing::Values(true, false));
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsAccepted) {
-  actor()->Show();
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
@@ -788,7 +788,7 @@
 }
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsRejected) {
-  actor()->Show();
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
@@ -798,13 +798,13 @@
     EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));
 }
 
-TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsActorDestroyed) {
-  actor()->Show();
+TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsViewDestroyed) {
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   CloseLoginDisplayHost();
-  ReportActorDestroyed();
+  ReportViewDestroyed();
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
   if (!IsManagedUser())
     EXPECT_FALSE(IsArcPlayStoreEnabledForProfile(profile()));

diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.cc b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.cc
index 2e55d95..1588bd3 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.cc
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h"
 
 #include "base/bind.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
@@ -13,44 +13,44 @@
 
 namespace {
 
-chromeos::ArcTermsOfServiceScreenActor* g_actor_for_testing = nullptr;
+chromeos::ArcTermsOfServiceScreenView* g_view_for_testing = nullptr;
 
-chromeos::ArcTermsOfServiceScreenActor* GetScreenActor() {
+chromeos::ArcTermsOfServiceScreenView* GetScreenView() {
   // Inject testing instance.
-  if (g_actor_for_testing)
-    return g_actor_for_testing;
+  if (g_view_for_testing)
+    return g_view_for_testing;
 
   chromeos::LoginDisplayHost* host = chromeos::LoginDisplayHost::default_host();
   DCHECK(host);
   DCHECK(host->GetOobeUI());
-  return host->GetOobeUI()->GetArcTermsOfServiceScreenActor();
+  return host->GetOobeUI()->GetArcTermsOfServiceScreenView();
 }
 
 }  // namespace
 
 // static
-void ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(
-    chromeos::ArcTermsOfServiceScreenActor* actor) {
-  g_actor_for_testing = actor;
+void ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenViewForTesting(
+    chromeos::ArcTermsOfServiceScreenView* view) {
+  g_view_for_testing = view;
 }
 
 ArcTermsOfServiceOobeNegotiator::ArcTermsOfServiceOobeNegotiator() = default;
 
 ArcTermsOfServiceOobeNegotiator::~ArcTermsOfServiceOobeNegotiator() {
-  DCHECK(!screen_actor_);
+  DCHECK(!screen_view_);
 }
 
 void ArcTermsOfServiceOobeNegotiator::StartNegotiationImpl() {
-  DCHECK(!screen_actor_);
-  screen_actor_ = GetScreenActor();
-  DCHECK(screen_actor_);
-  screen_actor_->AddObserver(this);
+  DCHECK(!screen_view_);
+  screen_view_ = GetScreenView();
+  DCHECK(screen_view_);
+  screen_view_->AddObserver(this);
 }
 
 void ArcTermsOfServiceOobeNegotiator::HandleTermsAccepted(bool accepted) {
-  DCHECK(screen_actor_);
-  screen_actor_->RemoveObserver(this);
-  screen_actor_ = nullptr;
+  DCHECK(screen_view_);
+  screen_view_->RemoveObserver(this);
+  screen_view_ = nullptr;
   ReportResult(accepted);
 }
 
@@ -62,9 +62,9 @@
   HandleTermsAccepted(true);
 }
 
-void ArcTermsOfServiceOobeNegotiator::OnActorDestroyed(
-    chromeos::ArcTermsOfServiceScreenActor* actor) {
-  DCHECK_EQ(actor, screen_actor_);
+void ArcTermsOfServiceOobeNegotiator::OnViewDestroyed(
+    chromeos::ArcTermsOfServiceScreenView* view) {
+  DCHECK_EQ(view, screen_view_);
   HandleTermsAccepted(false);
 }
 

diff --git a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h
index df6f470..59af5dc6 100644
--- a/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h
+++ b/chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h

@@ -7,10 +7,10 @@
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_negotiator.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
 
 namespace chromeos {
-class ArcTermsOfServiceScreenActor;
+class ArcTermsOfServiceScreenView;
 }
 
 namespace arc {
@@ -18,39 +18,39 @@
 // Handles the Terms-of-service agreement user action via OOBE OptIn UI.
 class ArcTermsOfServiceOobeNegotiator
     : public ArcTermsOfServiceNegotiator,
-      public chromeos::ArcTermsOfServiceScreenActorObserver {
+      public chromeos::ArcTermsOfServiceScreenViewObserver {
  public:
   ArcTermsOfServiceOobeNegotiator();
   ~ArcTermsOfServiceOobeNegotiator() override;
 
   // Injects ARC OOBE screen handler in unit tests, where OOBE UI is not
   // available.
-  static void SetArcTermsOfServiceScreenActorForTesting(
-      chromeos::ArcTermsOfServiceScreenActor* actor);
+  static void SetArcTermsOfServiceScreenViewForTesting(
+      chromeos::ArcTermsOfServiceScreenView* view);
 
  private:
   // Helper to handle callbacks from
-  // chromeos::ArcTermsOfServiceScreenActorObserver. It removes observer from
-  // |screen_actor_|, resets it, and then dispatches |accepted|. It is expected
+  // chromeos::ArcTermsOfServiceScreenViewObserver. It removes observer from
+  // |screen_view_|, resets it, and then dispatches |accepted|. It is expected
   // that this method is called exactly once for each instance of
   // ArcTermsOfServiceOobeNegotiator.
   void HandleTermsAccepted(bool accepted);
 
-  // chromeos::ArcTermsOfServiceScreenActorObserver:
+  // chromeos::ArcTermsOfServiceScreenViewObserver:
   void OnSkip() override;
   void OnAccept() override;
-  void OnActorDestroyed(chromeos::ArcTermsOfServiceScreenActor* actor) override;
+  void OnViewDestroyed(chromeos::ArcTermsOfServiceScreenView* view) override;
 
   // ArcTermsOfServiceNegotiator:
   void StartNegotiationImpl() override;
 
   // Unowned pointer. If a user signs out while ARC OOBE opt-in is active,
-  // LoginDisplayHost is detached first then OnActorDestroyed is called.
-  // It means, in OnSkip() and OnAccept(), the Actor needs to be obtained via
-  // LoginDisplayHost, but in OnActorDestroyed(), the argument needs to be used.
-  // In order to use the same way to access the Actor, remember the pointer in
+  // LoginDisplayHost is detached first then OnViewDestroyed is called.
+  // It means, in OnSkip() and OnAccept(), the View needs to be obtained via
+  // LoginDisplayHost, but in OnViewDestroyed(), the argument needs to be used.
+  // In order to use the same way to access the View, remember the pointer in
   // StartNegotiationImpl(), and reset in HandleTermsAccepted().
-  chromeos::ArcTermsOfServiceScreenActor* screen_actor_ = nullptr;
+  chromeos::ArcTermsOfServiceScreenView* screen_view_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceOobeNegotiator);
 };

diff --git a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc
index 25cb3ca..dec4b9b4 100644
--- a/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc
+++ b/chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.cc

@@ -8,7 +8,7 @@
 #include "ash/common/wm_shell.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/task_runner_util.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/signin/core/account_id/account_id.h"
@@ -116,8 +116,9 @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ash::WallpaperController* wc = ash::WmShell::Get()->wallpaper_controller();
   gfx::ImageSkia wallpaper = wc->GetWallpaper();
-  base::PostTaskAndReplyWithResult(
-      content::BrowserThread::GetBlockingPool(), FROM_HERE,
+  base::PostTaskWithTraitsAndReplyWithResult(
+      FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
+                     base::TaskPriority::BACKGROUND),
       base::Bind(&EncodeImagePng, wallpaper), callback);
 }
 

diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc
index fe355271..19377df 100644
--- a/chrome/browser/chromeos/customization/customization_document.cc
+++ b/chrome/browser/chromeos/customization/customization_document.cc

@@ -23,6 +23,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization/customization_wallpaper_downloader.h"
@@ -146,7 +147,6 @@
 }
 
 void CheckWallpaperCacheExists(const base::FilePath& path, bool* exists) {
-  DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   DCHECK(exists);
   *exists = base::PathExists(path);
 }
@@ -866,10 +866,10 @@
       &ServicesCustomizationDocument::OnCheckedWallpaperCacheExists,
       weak_ptr_factory_.GetWeakPtr(), base::Passed(std::move(exists)),
       base::Passed(std::move(applying)));
-  if (!content::BrowserThread::PostBlockingPoolTaskAndReply(
-          FROM_HERE, check_file_exists, on_checked_closure)) {
-    LOG(WARNING) << "Failed to start check Wallpaper cache exists.";
-  }
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   check_file_exists, on_checked_closure);
 }
 
 void ServicesCustomizationDocument::OnCheckedWallpaperCacheExists(

diff --git a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.cc b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.cc
index 7fcbf30..5c17a58 100644
--- a/chrome/browser/chromeos/customization/customization_wallpaper_downloader.cc
+++ b/chrome/browser/chromeos/customization/customization_wallpaper_downloader.cc

@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "base/files/file_util.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/task_scheduler/post_task.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
@@ -31,7 +31,6 @@
 
 void CreateWallpaperDirectory(const base::FilePath& wallpaper_dir,
                               bool* success) {
-  DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   DCHECK(success);
 
   *success = CreateDirectoryAndGetError(wallpaper_dir, NULL);
@@ -44,7 +43,6 @@
 void RenameTemporaryFile(const base::FilePath& from,
                          const base::FilePath& to,
                          bool* success) {
-  DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   DCHECK(success);
 
   base::File::Error error;
@@ -96,11 +94,11 @@
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SEND_AUTH_DATA);
-  base::SequencedWorkerPool* blocking_pool =
-      content::BrowserThread::GetBlockingPool();
   url_fetcher_->SaveResponseToFileAtPath(
       wallpaper_temporary_file_,
-      blocking_pool->GetSequencedTaskRunner(blocking_pool->GetSequenceToken()));
+      base::CreateSequencedTaskRunnerWithTraits(
+          base::TaskTraits().MayBlock().WithPriority(
+              base::TaskPriority::BACKGROUND)));
   url_fetcher_->Start();
 }
 
@@ -130,10 +128,10 @@
   base::Closure on_created_closure =
       base::Bind(&CustomizationWallpaperDownloader::OnWallpaperDirectoryCreated,
                  weak_factory_.GetWeakPtr(), base::Passed(std::move(success)));
-  if (!content::BrowserThread::PostBlockingPoolTaskAndReply(
-          FROM_HERE, mkdir_closure, on_created_closure)) {
-    LOG(WARNING) << "Failed to start Customized Wallpaper download.";
-  }
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   mkdir_closure, on_created_closure);
 }
 
 void CustomizationWallpaperDownloader::OnWallpaperDirectoryCreated(
@@ -178,12 +176,10 @@
   base::Closure on_rename_closure =
       base::Bind(&CustomizationWallpaperDownloader::OnTemporaryFileRenamed,
                  weak_factory_.GetWeakPtr(), base::Passed(std::move(success)));
-  if (!content::BrowserThread::PostBlockingPoolTaskAndReply(
-          FROM_HERE, rename_closure, on_rename_closure)) {
-    LOG(WARNING)
-        << "Failed to start Customized Wallpaper Rename DownloadedFile.";
-    on_wallpaper_fetch_completed_.Run(false, wallpaper_url_);
-  }
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   rename_closure, on_rename_closure);
 }
 
 void CustomizationWallpaperDownloader::OnTemporaryFileRenamed(

diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index d532a8b..5a68721 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc

@@ -20,6 +20,8 @@
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/extensions/extension_commands_global_registry.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/prefs/pref_service.h"
@@ -132,14 +134,24 @@
 // prefs::kLanguageRemapSearchKeyTo.
 const ModifierRemapping* GetRemappedKey(const std::string& pref_name,
                                         const PrefService& pref_service) {
-  if (!pref_service.FindPreference(pref_name.c_str()))
-    return NULL;  // The |pref_name| hasn't been registered. On login screen?
-  const int value = pref_service.GetInteger(pref_name.c_str());
+  int value = -1;
+  // If we're at the login screen, try to get the pref from the global prefs
+  // dictionary.
+  if (!LoginDisplayHost::default_host() ||
+      !LoginDisplayHost::default_host()
+           ->GetOobeUI()
+           ->signin_screen_handler()
+           ->GetKeyboardRemappedPrefValue(pref_name, &value)) {
+    if (!pref_service.FindPreference(pref_name))
+      return nullptr;
+    value = pref_service.GetInteger(pref_name);
+  }
+
   for (size_t i = 0; i < arraysize(kModifierRemappings); ++i) {
     if (value == kModifierRemappings[i].remap_to)
       return &kModifierRemappings[i];
   }
-  return NULL;
+  return nullptr;
 }
 
 bool HasDiamondKey() {

diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
index 8e15742..9db262e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc

@@ -324,9 +324,8 @@
       extensions::SOURCE_NETWORK);
 
   file_manager::VolumeManager::Get(browser()->profile())
-      ->AddVolumeForTesting(
-          make_linked_ptr(file_manager::Volume::CreateForProvidedFileSystem(
-              info, file_manager::MOUNT_CONTEXT_AUTO)));
+      ->AddVolumeForTesting(file_manager::Volume::CreateForProvidedFileSystem(
+          info, file_manager::MOUNT_CONTEXT_AUTO));
 
   // We will call fileManagerPrivate.unmountVolume once. To test that method, we
   // check that UnmountPath is really called with the same value.

diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc
index daf2fb3..529bc17 100644
--- a/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router.cc

@@ -48,7 +48,7 @@
 
   // Add new job info.
   UpdateBytes(job_info);
-  drive_jobs_[job_info.job_id] = make_linked_ptr(new drive::JobInfo(job_info));
+  drive_jobs_[job_info.job_id] = base::MakeUnique<drive::JobInfo>(job_info);
 
   ScheduleDriveFileTransferEvent(
       job_info, file_manager_private::TRANSFER_STATE_IN_PROGRESS,

diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router.h b/chrome/browser/chromeos/extensions/file_manager/job_event_router.h
index 85e4dc5..ea787a67 100644
--- a/chrome/browser/chromeos/extensions/file_manager/job_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router.h

@@ -13,7 +13,6 @@
 #include <string>
 
 #include "base/macros.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
@@ -82,7 +81,7 @@
   base::TimeDelta event_delay_;
 
   // Set of job that are in the job schedular.
-  std::map<drive::JobID, linked_ptr<drive::JobInfo>> drive_jobs_;
+  std::map<drive::JobID, std::unique_ptr<drive::JobInfo>> drive_jobs_;
 
   // Job info of pending event. |ScheduleDriveFileTransferEvent| registers
   // timeout callback to dispatch this.

diff --git a/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc
index 8b84ea50..13f220e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/job_event_router_unittest.cc

@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -20,7 +21,7 @@
   JobEventRouterImpl() : JobEventRouter(base::TimeDelta::FromMilliseconds(0)) {
     listener_extension_ids_.insert("extension_a");
   }
-  std::vector<linked_ptr<base::DictionaryValue>> events;
+  std::vector<std::unique_ptr<base::DictionaryValue>> events;
 
   void SetListenerExtensionIds(std::set<std::string> extension_ids) {
     listener_extension_ids_ = extension_ids;
@@ -49,7 +50,7 @@
       std::unique_ptr<base::ListValue> event_args) override {
     const base::DictionaryValue* event;
     event_args->GetDictionary(0, &event);
-    events.push_back(make_linked_ptr(event->DeepCopy()));
+    events.push_back(base::WrapUnique(event->DeepCopy()));
   }
 
  private:

diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
index 8d592b6..b8aef48 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc

@@ -168,10 +168,10 @@
 }
 
 // static
-Volume* Volume::CreateForDrive(Profile* profile) {
+std::unique_ptr<Volume> Volume::CreateForDrive(Profile* profile) {
   const base::FilePath& drive_path =
       drive::util::GetDriveMountPointPath(profile);
-  Volume* const volume = new Volume;
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = VOLUME_TYPE_GOOGLE_DRIVE;
   volume->device_type_ = chromeos::DEVICE_TYPE_UNKNOWN;
   volume->source_path_ = drive_path;
@@ -184,8 +184,9 @@
 }
 
 // static
-Volume* Volume::CreateForDownloads(const base::FilePath& downloads_path) {
-  Volume* const volume = new Volume;
+std::unique_ptr<Volume> Volume::CreateForDownloads(
+    const base::FilePath& downloads_path) {
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = VOLUME_TYPE_DOWNLOADS_DIRECTORY;
   volume->device_type_ = chromeos::DEVICE_TYPE_UNKNOWN;
   // Keep source_path empty.
@@ -198,10 +199,10 @@
 }
 
 // static
-Volume* Volume::CreateForRemovable(
+std::unique_ptr<Volume> Volume::CreateForRemovable(
     const chromeos::disks::DiskMountManager::MountPointInfo& mount_point,
     const chromeos::disks::DiskMountManager::Disk* disk) {
-  Volume* const volume = new Volume;
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = MountTypeToVolumeType(mount_point.mount_type);
   volume->source_path_ = base::FilePath(mount_point.source_path);
   volume->source_ = mount_point.mount_type == chromeos::MOUNT_TYPE_ARCHIVE
@@ -228,11 +229,11 @@
 }
 
 // static
-Volume* Volume::CreateForProvidedFileSystem(
+std::unique_ptr<Volume> Volume::CreateForProvidedFileSystem(
     const chromeos::file_system_provider::ProvidedFileSystemInfo&
         file_system_info,
     MountContext mount_context) {
-  Volume* const volume = new Volume;
+  std::unique_ptr<Volume> volume(new Volume());
   volume->file_system_id_ = file_system_info.file_system_id();
   volume->extension_id_ = file_system_info.extension_id();
   switch (file_system_info.source()) {
@@ -260,10 +261,10 @@
 }
 
 // static
-Volume* Volume::CreateForMTP(const base::FilePath& mount_path,
-                             const std::string& label,
-                             bool read_only) {
-  Volume* const volume = new Volume;
+std::unique_ptr<Volume> Volume::CreateForMTP(const base::FilePath& mount_path,
+                                             const std::string& label,
+                                             bool read_only) {
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = VOLUME_TYPE_MTP;
   volume->mount_path_ = mount_path;
   volume->mount_condition_ = chromeos::disks::MOUNT_CONDITION_NONE;
@@ -278,8 +279,9 @@
 }
 
 // static
-Volume* Volume::CreateForMediaView(const std::string& root_document_id) {
-  Volume* const volume = new Volume;
+std::unique_ptr<Volume> Volume::CreateForMediaView(
+    const std::string& root_document_id) {
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = VOLUME_TYPE_MEDIA_VIEW;
   volume->device_type_ = chromeos::DEVICE_TYPE_UNKNOWN;
   volume->source_ = SOURCE_SYSTEM;
@@ -294,11 +296,12 @@
 }
 
 // static
-Volume* Volume::CreateForTesting(const base::FilePath& path,
-                                 VolumeType volume_type,
-                                 chromeos::DeviceType device_type,
-                                 bool read_only) {
-  Volume* const volume = new Volume;
+std::unique_ptr<Volume> Volume::CreateForTesting(
+    const base::FilePath& path,
+    VolumeType volume_type,
+    chromeos::DeviceType device_type,
+    bool read_only) {
+  std::unique_ptr<Volume> volume(new Volume());
   volume->type_ = volume_type;
   volume->device_type_ = device_type;
   // Keep source_path empty.
@@ -311,9 +314,10 @@
 }
 
 // static
-Volume* Volume::CreateForTesting(const base::FilePath& device_path,
-                                 const base::FilePath& mount_path) {
-  Volume* const volume = new Volume;
+std::unique_ptr<Volume> Volume::CreateForTesting(
+    const base::FilePath& device_path,
+    const base::FilePath& mount_path) {
+  std::unique_ptr<Volume> volume(new Volume());
   volume->system_path_prefix_ = device_path;
   volume->mount_path_ = mount_path;
   return volume;
@@ -355,14 +359,14 @@
   DCHECK(success);
 
   DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-               make_linked_ptr(Volume::CreateForDownloads(downloads)));
+               Volume::CreateForDownloads(downloads));
 
   // Subscribe to DriveIntegrationService.
   if (drive_integration_service_) {
     drive_integration_service_->AddObserver(this);
     if (drive_integration_service_->IsMounted()) {
       DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-                   make_linked_ptr(Volume::CreateForDrive(profile_)));
+                   Volume::CreateForDrive(profile_));
     }
   }
 
@@ -382,9 +386,9 @@
     std::vector<ProvidedFileSystemInfo> file_system_info_list =
         file_system_provider_service_->GetProvidedFileSystemInfoList();
     for (size_t i = 0; i < file_system_info_list.size(); ++i) {
-      linked_ptr<Volume> volume(Volume::CreateForProvidedFileSystem(
-          file_system_info_list[i], MOUNT_CONTEXT_AUTO));
-      DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume);
+      std::unique_ptr<Volume> volume = Volume::CreateForProvidedFileSystem(
+          file_system_info_list[i], MOUNT_CONTEXT_AUTO);
+      DoMountEvent(chromeos::MOUNT_ERROR_NONE, std::move(volume));
     }
   }
 
@@ -457,6 +461,7 @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   std::vector<base::WeakPtr<Volume>> result;
+  result.reserve(mounted_volumes_.size());
   for (const auto& pair : mounted_volumes_) {
     result.push_back(pair.second->AsWeakPtr());
   }
@@ -480,13 +485,13 @@
   base::FilePath old_path;
   if (FindDownloadsMountPointPath(profile_, &old_path)) {
     DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
-                   make_linked_ptr(Volume::CreateForDownloads(old_path)));
+                   *Volume::CreateForDownloads(old_path));
   }
 
   bool success = RegisterDownloadsMountPoint(profile_, path);
   DoMountEvent(
       success ? chromeos::MOUNT_ERROR_NONE : chromeos::MOUNT_ERROR_INVALID_PATH,
-      make_linked_ptr(Volume::CreateForDownloads(path)));
+      Volume::CreateForDownloads(path));
   return success;
 }
 
@@ -495,14 +500,14 @@
                                         chromeos::DeviceType device_type,
                                         bool read_only) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-               make_linked_ptr(Volume::CreateForTesting(
-                   path, volume_type, device_type, read_only)));
+  DoMountEvent(
+      chromeos::MOUNT_ERROR_NONE,
+      Volume::CreateForTesting(path, volume_type, device_type, read_only));
 }
 
-void VolumeManager::AddVolumeForTesting(const linked_ptr<Volume>& volume) {
+void VolumeManager::AddVolumeForTesting(std::unique_ptr<Volume> volume) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume);
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE, std::move(volume));
 }
 
 void VolumeManager::OnFileSystemMounted() {
@@ -511,15 +516,13 @@
   // Raise mount event.
   // We can pass chromeos::MOUNT_ERROR_NONE even when authentication is failed
   // or network is unreachable. These two errors will be handled later.
-  linked_ptr<Volume> volume(Volume::CreateForDrive(profile_));
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume);
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE, Volume::CreateForDrive(profile_));
 }
 
 void VolumeManager::OnFileSystemBeingUnmounted() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  linked_ptr<Volume> volume(Volume::CreateForDrive(profile_));
-  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, volume);
+  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, *Volume::CreateForDrive(profile_));
 }
 
 void VolumeManager::OnDiskEvent(
@@ -629,14 +632,14 @@
   // Notify a mounting/unmounting event to observers.
   const chromeos::disks::DiskMountManager::Disk* const disk =
       disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
-  linked_ptr<Volume> volume(Volume::CreateForRemovable(mount_info, disk));
+  std::unique_ptr<Volume> volume = Volume::CreateForRemovable(mount_info, disk);
   switch (event) {
     case chromeos::disks::DiskMountManager::MOUNTING: {
-      DoMountEvent(error_code, volume);
+      DoMountEvent(error_code, std::move(volume));
       return;
     }
     case chromeos::disks::DiskMountManager::UNMOUNTING:
-      DoUnmountEvent(error_code, volume);
+      DoUnmountEvent(error_code, *volume);
       return;
   }
   NOTREACHED();
@@ -694,8 +697,8 @@
       break;
   }
 
-  linked_ptr<Volume> volume(
-      Volume::CreateForProvidedFileSystem(file_system_info, volume_context));
+  std::unique_ptr<Volume> volume =
+      Volume::CreateForProvidedFileSystem(file_system_info, volume_context);
 
   // TODO(mtomasz): Introduce own type, and avoid using MountError internally,
   // since it is related to cros disks only.
@@ -712,7 +715,7 @@
       break;
   }
 
-  DoMountEvent(mount_error, volume);
+  DoMountEvent(mount_error, std::move(volume));
 }
 
 void VolumeManager::OnProvidedFileSystemUnmount(
@@ -724,9 +727,9 @@
   const chromeos::MountError mount_error = error == base::File::FILE_OK
                                                ? chromeos::MOUNT_ERROR_NONE
                                                : chromeos::MOUNT_ERROR_UNKNOWN;
-  linked_ptr<Volume> volume(Volume::CreateForProvidedFileSystem(
-      file_system_info, MOUNT_CONTEXT_UNKNOWN));
-  DoUnmountEvent(mount_error, volume);
+  std::unique_ptr<Volume> volume = Volume::CreateForProvidedFileSystem(
+      file_system_info, MOUNT_CONTEXT_UNKNOWN);
+  DoUnmountEvent(mount_error, *volume);
 }
 
 void VolumeManager::OnExternalStorageDisabledChangedUnmountCallback(
@@ -753,24 +756,18 @@
 
   if (enabled) {
     DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-                 linked_ptr<Volume>(
-                     Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
+                 Volume::CreateForMediaView(arc::kImagesRootDocumentId));
     DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-                 linked_ptr<Volume>(
-                     Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
+                 Volume::CreateForMediaView(arc::kVideosRootDocumentId));
     DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-                 linked_ptr<Volume>(
-                     Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+                 Volume::CreateForMediaView(arc::kAudioRootDocumentId));
   } else {
     DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
-                   linked_ptr<Volume>(
-                       Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
+                   *Volume::CreateForMediaView(arc::kImagesRootDocumentId));
     DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
-                   linked_ptr<Volume>(
-                       Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
+                   *Volume::CreateForMediaView(arc::kVideosRootDocumentId));
     DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
-                   linked_ptr<Volume>(
-                       Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+                   *Volume::CreateForMediaView(arc::kAudioRootDocumentId));
   }
 
   arc_volumes_mounted_ = enabled;
@@ -858,8 +855,8 @@
                  base::Unretained(MTPDeviceMapService::GetInstance()),
                  info.location(), fsid, read_only));
 
-  linked_ptr<Volume> volume(Volume::CreateForMTP(path, label, read_only));
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume);
+  std::unique_ptr<Volume> volume = Volume::CreateForMTP(path, label, read_only);
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE, std::move(volume));
 }
 
 void VolumeManager::OnRemovableStorageDetached(
@@ -867,9 +864,9 @@
   if (!storage_monitor::StorageInfo::IsMTPDevice(info.device_id()))
     return;
 
-  for (const auto mounted_volume : mounted_volumes_) {
+  for (const auto& mounted_volume : mounted_volumes_) {
     if (mounted_volume.second->source_path().value() == info.location()) {
-      DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, mounted_volume.second);
+      DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, *mounted_volume.second.get());
 
       const std::string fsid = GetMountPointNameForMediaStorage(info);
       storage::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(fsid);
@@ -889,7 +886,7 @@
     return;
   }
 
-  std::vector<linked_ptr<Volume>> archives;
+  std::vector<std::unique_ptr<Volume>> archives;
 
   const chromeos::disks::DiskMountManager::MountPointMap& mount_points =
       disk_mount_manager_->mount_points();
@@ -899,14 +896,14 @@
        ++it) {
     if (it->second.mount_type == chromeos::MOUNT_TYPE_ARCHIVE) {
       // Archives are mounted after other types of volume. See below.
-      archives.push_back(
-          make_linked_ptr(Volume::CreateForRemovable(it->second, NULL)));
+      archives.push_back(Volume::CreateForRemovable(it->second, nullptr));
       continue;
     }
-    DoMountEvent(chromeos::MOUNT_ERROR_NONE,
-                 make_linked_ptr(Volume::CreateForRemovable(
-                     it->second, disk_mount_manager_->FindDiskBySourcePath(
-                                     it->second.source_path))));
+    DoMountEvent(
+        chromeos::MOUNT_ERROR_NONE,
+        Volume::CreateForRemovable(
+            it->second,
+            disk_mount_manager_->FindDiskBySourcePath(it->second.source_path)));
   }
 
   // We mount archives only if they are opened from currently mounted volumes.
@@ -916,24 +913,26 @@
     if (done[i])
       continue;
 
-    std::vector<linked_ptr<Volume>> chain;
+    std::vector<std::unique_ptr<Volume>> chain;
+    // done[x] = true means archives[x] is null and that volume is in |chain|.
     done[i] = true;
-    chain.push_back(archives[i]);
+    chain.push_back(std::move(archives[i]));
 
     // If archives[i]'s source_path is in another archive, mount it first.
     for (size_t parent = i + 1; parent < archives.size(); ++parent) {
       if (!done[parent] &&
           archives[parent]->mount_path().IsParent(
               chain.back()->source_path())) {
+        // done[parent] started false, so archives[parent] is non-null.
         done[parent] = true;
-        chain.push_back(archives[parent]);
+        chain.push_back(std::move(archives[parent]));
         parent = i + 1;  // Search archives[parent]'s parent from the beginning.
       }
     }
 
     // Mount from the tail of chain.
     for (size_t i = chain.size(); i > 0; --i) {
-      DoMountEvent(chromeos::MOUNT_ERROR_NONE, chain[i - 1]);
+      DoMountEvent(chromeos::MOUNT_ERROR_NONE, std::move(chain[i - 1]));
     }
   }
 }
@@ -947,7 +946,7 @@
 }
 
 void VolumeManager::DoMountEvent(chromeos::MountError error_code,
-                                 const linked_ptr<Volume>& volume) {
+                                 std::unique_ptr<Volume> volume) {
   // Archive files are mounted globally in system. We however don't want to show
   // archives from profile-specific folders (Drive/Downloads) of other users in
   // multi-profile session. To this end, we filter out archives not on the
@@ -972,25 +971,27 @@
     return;
   }
 
+  Volume* raw_volume = volume.get();
   if (error_code == chromeos::MOUNT_ERROR_NONE || volume->mount_condition()) {
-    mounted_volumes_[volume->volume_id()] = volume;
-    UMA_HISTOGRAM_ENUMERATION("FileBrowser.VolumeType", volume->type(),
+    mounted_volumes_[volume->volume_id()] = std::move(volume);
+    UMA_HISTOGRAM_ENUMERATION("FileBrowser.VolumeType", raw_volume->type(),
                               NUM_VOLUME_TYPE);
   }
 
   for (auto& observer : observers_)
-    observer.OnVolumeMounted(error_code, *volume);
+    observer.OnVolumeMounted(error_code, *raw_volume);
 }
 
 void VolumeManager::DoUnmountEvent(chromeos::MountError error_code,
-                                   const linked_ptr<Volume>& volume) {
-  if (mounted_volumes_.find(volume->volume_id()) == mounted_volumes_.end())
+                                   const Volume& volume) {
+  auto iter = mounted_volumes_.find(volume.volume_id());
+  if (iter == mounted_volumes_.end())
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
-    mounted_volumes_.erase(volume->volume_id());
+    mounted_volumes_.erase(iter);
 
   for (auto& observer : observers_)
-    observer.OnVolumeUnmounted(error_code, *volume.get());
+    observer.OnVolumeUnmounted(error_code, volume);
 }
 
 }  // namespace file_manager

diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h
index 46014daf..1658d149 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.h
+++ b/chrome/browser/chromeos/file_manager/volume_manager.h

@@ -14,7 +14,6 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/linked_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
@@ -80,25 +79,29 @@
   ~Volume();
 
   // Factory static methods for different volume types.
-  static Volume* CreateForDrive(Profile* profile);
-  static Volume* CreateForDownloads(const base::FilePath& downloads_path);
-  static Volume* CreateForRemovable(
+  static std::unique_ptr<Volume> CreateForDrive(Profile* profile);
+  static std::unique_ptr<Volume> CreateForDownloads(
+      const base::FilePath& downloads_path);
+  static std::unique_ptr<Volume> CreateForRemovable(
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_point,
       const chromeos::disks::DiskMountManager::Disk* disk);
-  static Volume* CreateForProvidedFileSystem(
+  static std::unique_ptr<Volume> CreateForProvidedFileSystem(
       const chromeos::file_system_provider::ProvidedFileSystemInfo&
           file_system_info,
       MountContext mount_context);
-  static Volume* CreateForMTP(const base::FilePath& mount_path,
-                              const std::string& label,
-                              bool read_only);
-  static Volume* CreateForMediaView(const std::string& root_document_id);
-  static Volume* CreateForTesting(const base::FilePath& path,
-                                  VolumeType volume_type,
-                                  chromeos::DeviceType device_type,
-                                  bool read_only);
-  static Volume* CreateForTesting(const base::FilePath& device_path,
-                                  const base::FilePath& mount_path);
+  static std::unique_ptr<Volume> CreateForMTP(const base::FilePath& mount_path,
+                                              const std::string& label,
+                                              bool read_only);
+  static std::unique_ptr<Volume> CreateForMediaView(
+      const std::string& root_document_id);
+  static std::unique_ptr<Volume> CreateForTesting(
+      const base::FilePath& path,
+      VolumeType volume_type,
+      chromeos::DeviceType device_type,
+      bool read_only);
+  static std::unique_ptr<Volume> CreateForTesting(
+      const base::FilePath& device_path,
+      const base::FilePath& mount_path);
 
   // Getters for all members. See below for details.
   const std::string& volume_id() const { return volume_id_; }
@@ -270,7 +273,7 @@
                            bool read_only);
 
   // For testing purpose, adds the volume info to the volume manager.
-  void AddVolumeForTesting(const linked_ptr<Volume>& volume);
+  void AddVolumeForTesting(std::unique_ptr<Volume> volume);
 
   // drive::DriveIntegrationServiceObserver overrides.
   void OnFileSystemMounted() override;
@@ -322,9 +325,8 @@
   void OnDiskMountManagerRefreshed(bool success);
   void OnStorageMonitorInitialized();
   void DoMountEvent(chromeos::MountError error_code,
-                    const linked_ptr<Volume>& volume);
-  void DoUnmountEvent(chromeos::MountError error_code,
-                      const linked_ptr<Volume>& volume);
+                    std::unique_ptr<Volume> volume);
+  void DoUnmountEvent(chromeos::MountError error_code, const Volume& volume);
   void OnExternalStorageDisabledChangedUnmountCallback(
       chromeos::MountError error_code);
 
@@ -336,7 +338,7 @@
   chromeos::file_system_provider::Service*
       file_system_provider_service_;  // Not owned by this class.
   GetMtpStorageInfoCallback get_mtp_storage_info_callback_;
-  std::map<std::string, linked_ptr<Volume>> mounted_volumes_;
+  std::map<std::string, std::unique_ptr<Volume>> mounted_volumes_;
   std::unique_ptr<SnapshotManager> snapshot_manager_;
   bool arc_volumes_mounted_ = false;
 

diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
index 9de81cdb..779c7da 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc

@@ -150,11 +150,11 @@
       diagnostic_mode_(diagnostic_mode),
       host_(host),
       oobe_ui_(oobe_ui),
-      app_launch_splash_screen_actor_(
-          oobe_ui_->GetAppLaunchSplashScreenActor()) {}
+      app_launch_splash_screen_view_(oobe_ui_->GetAppLaunchSplashScreenView()) {
+}
 
 AppLaunchController::~AppLaunchController() {
-  app_launch_splash_screen_actor_->SetDelegate(NULL);
+  app_launch_splash_screen_view_->SetDelegate(NULL);
 }
 
 void AppLaunchController::StartAppLaunch(bool is_auto_launch) {
@@ -173,8 +173,8 @@
   launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
 
   // TODO(tengs): Add a loading profile app launch state.
-  app_launch_splash_screen_actor_->SetDelegate(this);
-  app_launch_splash_screen_actor_->Show(app_id_);
+  app_launch_splash_screen_view_->SetDelegate(this);
+  app_launch_splash_screen_view_->Show(app_id_);
 
   KioskAppManager::App app;
   CHECK(KioskAppManager::Get());
@@ -280,8 +280,8 @@
   if (requested) {
     MaybeShowNetworkConfigureUI();
   } else {
-    app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
+    app_launch_splash_screen_view_->UpdateAppLaunchState(
+        AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
     startup_app_launcher_->RestartLauncher();
   }
 }
@@ -381,28 +381,28 @@
       if (network_config_requested_)
         OnConfigureNetwork();
       else
-        app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
+        app_launch_splash_screen_view_->ToggleNetworkConfig(true);
     } else {
       ShowNetworkConfigureUIWhenReady();
     }
   } else {
-    app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
+    app_launch_splash_screen_view_->UpdateAppLaunchState(
+        AppLaunchSplashScreenView::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
   }
 }
 
 void AppLaunchController::ShowNetworkConfigureUIWhenReady() {
   if (!profile_) {
     show_network_config_ui_after_profile_load_ = true;
-    app_launch_splash_screen_actor_->UpdateAppLaunchState(
-        AppLaunchSplashScreenActor::
+    app_launch_splash_screen_view_->UpdateAppLaunchState(
+        AppLaunchSplashScreenView::
             APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI);
     return;
   }
 
   show_network_config_ui_after_profile_load_ = false;
   showing_network_dialog_ = true;
-  app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
+  app_launch_splash_screen_view_->ShowNetworkConfigureUI();
 }
 
 void AppLaunchController::InitializeNetwork() {
@@ -414,12 +414,12 @@
       base::TimeDelta::FromSeconds(network_wait_time_),
       this, &AppLaunchController::OnNetworkWaitTimedout);
 
-  app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
 }
 
 bool AppLaunchController::IsNetworkReady() {
-  return app_launch_splash_screen_actor_->IsNetworkReady();
+  return app_launch_splash_screen_view_->IsNetworkReady();
 }
 
 bool AppLaunchController::ShouldSkipAppInstallation() {
@@ -427,26 +427,26 @@
 }
 
 void AppLaunchController::OnLoadingOAuthFile() {
-  app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_LOADING_AUTH_FILE);
 }
 
 void AppLaunchController::OnInitializingTokenService() {
-  app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE);
 }
 
 void AppLaunchController::OnInstallingApp() {
-  app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_INSTALLING_APPLICATION);
 
   ClearNetworkWaitTimer();
-  app_launch_splash_screen_actor_->ToggleNetworkConfig(false);
+  app_launch_splash_screen_view_->ToggleNetworkConfig(false);
 
   // We have connectivity at this point, so we can skip the network
   // configuration dialog if it is being shown.
   if (showing_network_dialog_) {
-    app_launch_splash_screen_actor_->Show(app_id_);
+    app_launch_splash_screen_view_->Show(app_id_);
     showing_network_dialog_ = false;
     launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
   }
@@ -488,8 +488,8 @@
 
 void AppLaunchController::OnLaunchSucceeded() {
   DVLOG(1) << "Kiosk launch succeeded, wait for app window.";
-  app_launch_splash_screen_actor_->UpdateAppLaunchState(
-      AppLaunchSplashScreenActor::APP_LAUNCH_STATE_WAITING_APP_WINDOW);
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_WAITING_APP_WINDOW);
 
   DCHECK(!app_window_watcher_);
   app_window_watcher_.reset(new AppWindowWatcher(this, app_id_));

diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h
index c0399a7..be4b1893 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.h
+++ b/chrome/browser/chromeos/login/app_launch_controller.h

@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
-#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -30,12 +30,11 @@
 // Controller for the kiosk app launch process, responsible for
 // coordinating loading the kiosk profile, launching the app, and
 // updating the splash screen UI.
-class AppLaunchController
-    : public AppLaunchSplashScreenActor::Delegate,
-      public KioskProfileLoader::Delegate,
-      public StartupAppLauncher::Delegate,
-      public AppLaunchSigninScreen::Delegate,
-      public content::NotificationObserver {
+class AppLaunchController : public AppLaunchSplashScreenView::Delegate,
+                            public KioskProfileLoader::Delegate,
+                            public StartupAppLauncher::Delegate,
+                            public AppLaunchSigninScreen::Delegate,
+                            public content::NotificationObserver {
  public:
   typedef base::Callback<bool()> ReturnBoolCallback;
 
@@ -92,7 +91,7 @@
   void OnProfileLoaded(Profile* profile) override;
   void OnProfileLoadFailed(KioskAppLaunchError::Error error) override;
 
-  // AppLaunchSplashScreenActor::Delegate overrides:
+  // AppLaunchSplashScreenView::Delegate overrides:
   void OnConfigureNetwork() override;
   void OnCancelAppLaunch() override;
   void OnNetworkConfigRequested(bool requested) override;
@@ -123,7 +122,7 @@
   const bool diagnostic_mode_;
   LoginDisplayHost* host_ = nullptr;
   OobeUI* oobe_ui_ = nullptr;
-  AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr;
+  AppLaunchSplashScreenView* app_launch_splash_screen_view_ = nullptr;
   std::unique_ptr<KioskProfileLoader> kiosk_profile_loader_;
   std::unique_ptr<StartupAppLauncher> startup_app_launcher_;
   std::unique_ptr<AppLaunchSigninScreen> signin_screen_;

diff --git a/chrome/browser/chromeos/login/arc_kiosk_controller.cc b/chrome/browser/chromeos/login/arc_kiosk_controller.cc
index b895e97c3..da04f6ec 100644
--- a/chrome/browser/chromeos/login/arc_kiosk_controller.cc
+++ b/chrome/browser/chromeos/login/arc_kiosk_controller.cc

@@ -26,11 +26,11 @@
 
 ArcKioskController::ArcKioskController(LoginDisplayHost* host, OobeUI* oobe_ui)
     : host_(host),
-      arc_kiosk_splash_screen_actor_(oobe_ui->GetArcKioskSplashScreenActor()),
+      arc_kiosk_splash_screen_view_(oobe_ui->GetArcKioskSplashScreenView()),
       weak_ptr_factory_(this) {}
 
 ArcKioskController::~ArcKioskController() {
-  arc_kiosk_splash_screen_actor_->SetDelegate(nullptr);
+  arc_kiosk_splash_screen_view_->SetDelegate(nullptr);
 }
 
 void ArcKioskController::StartArcKiosk(const AccountId& account_id) {
@@ -38,8 +38,8 @@
 
   host_->GetWebUILoginView()->SetUIEnabled(true);
 
-  arc_kiosk_splash_screen_actor_->SetDelegate(this);
-  arc_kiosk_splash_screen_actor_->Show();
+  arc_kiosk_splash_screen_view_->SetDelegate(this);
+  arc_kiosk_splash_screen_view_->Show();
   splash_wait_timer_.Start(FROM_HERE, kArcKioskSplashScreenMinTime,
                            base::Bind(&ArcKioskController::CloseSplashScreen,
                                       weak_ptr_factory_.GetWeakPtr()));
@@ -107,14 +107,14 @@
   // a profile load, so invalidate the delegate now.
   UserSessionManager::GetInstance()->DelegateDeleted(this);
   ArcKioskAppService::Get(profile_)->SetDelegate(this);
-  arc_kiosk_splash_screen_actor_->UpdateArcKioskState(
-      ArcKioskSplashScreenActor::ArcKioskState::WAITING_APP_LAUNCH);
+  arc_kiosk_splash_screen_view_->UpdateArcKioskState(
+      ArcKioskSplashScreenView::ArcKioskState::WAITING_APP_LAUNCH);
 }
 
 void ArcKioskController::OnAppStarted() {
   DVLOG(1) << "ARC Kiosk launch succeeded, wait for app window.";
-  arc_kiosk_splash_screen_actor_->UpdateArcKioskState(
-      ArcKioskSplashScreenActor::ArcKioskState::WAITING_APP_WINDOW);
+  arc_kiosk_splash_screen_view_->UpdateArcKioskState(
+      ArcKioskSplashScreenView::ArcKioskState::WAITING_APP_WINDOW);
 }
 
 void ArcKioskController::OnAppWindowLaunched() {

diff --git a/chrome/browser/chromeos/login/arc_kiosk_controller.h b/chrome/browser/chromeos/login/arc_kiosk_controller.h
index 5062836..8408535 100644
--- a/chrome/browser/chromeos/login/arc_kiosk_controller.h
+++ b/chrome/browser/chromeos/login/arc_kiosk_controller.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.h"
-#include "chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_view.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chromeos/login/auth/login_performer.h"
 
@@ -31,7 +31,7 @@
 class ArcKioskController : public LoginPerformer::Delegate,
                            public UserSessionManagerDelegate,
                            public ArcKioskAppService::Delegate,
-                           public ArcKioskSplashScreenActor::Delegate {
+                           public ArcKioskSplashScreenView::Delegate {
  public:
   ArcKioskController(LoginDisplayHost* host, OobeUI* oobe_ui);
 
@@ -58,13 +58,13 @@
   void OnAppStarted() override;
   void OnAppWindowLaunched() override;
 
-  // ArcKioskSplashScreenActor::Delegate implementation:
+  // ArcKioskSplashScreenView::Delegate implementation:
   void OnCancelArcKioskLaunch() override;
 
   // LoginDisplayHost owns itself.
   LoginDisplayHost* const host_;
   // Owned by OobeUI.
-  ArcKioskSplashScreenActor* const arc_kiosk_splash_screen_actor_;
+  ArcKioskSplashScreenView* const arc_kiosk_splash_screen_view_;
   // Not owning here.
   Profile* profile_ = nullptr;
 

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
index 62c3995..9f7e45d3 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.cc

@@ -46,24 +46,24 @@
 
 AutoEnrollmentCheckScreen::AutoEnrollmentCheckScreen(
     BaseScreenDelegate* base_screen_delegate,
-    AutoEnrollmentCheckScreenActor* actor)
+    AutoEnrollmentCheckScreenView* view)
     : BaseScreen(base_screen_delegate,
                  OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK),
-      actor_(actor),
+      view_(view),
       auto_enrollment_controller_(nullptr),
       captive_portal_status_(
           NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN),
       auto_enrollment_state_(policy::AUTO_ENROLLMENT_STATE_IDLE),
       histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
       weak_ptr_factory_(this) {
-  if (actor_)
-    actor_->SetDelegate(this);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 AutoEnrollmentCheckScreen::~AutoEnrollmentCheckScreen() {
   network_portal_detector::GetInstance()->RemoveObserver(this);
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void AutoEnrollmentCheckScreen::ClearState() {
@@ -90,7 +90,7 @@
   // Bring up the screen. It's important to do this before updating the UI,
   // because the latter may switch to the error screen, which needs to stay on
   // top.
-  actor_->Show();
+  view_->Show();
   histogram_helper_->OnScreenShow();
 
   // Set up state change observers.
@@ -121,10 +121,10 @@
 void AutoEnrollmentCheckScreen::Hide() {
 }
 
-void AutoEnrollmentCheckScreen::OnActorDestroyed(
-    AutoEnrollmentCheckScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void AutoEnrollmentCheckScreen::OnViewDestroyed(
+    AutoEnrollmentCheckScreenView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 void AutoEnrollmentCheckScreen::OnPortalDetectionCompleted(

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h
index b9ac5f1..1ac416e0 100644
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h

@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
@@ -29,12 +29,12 @@
 // the error screen upon failures. Similar to a screen controller, but it
 // doesn't actually drive a dedicated screen.
 class AutoEnrollmentCheckScreen
-    : public AutoEnrollmentCheckScreenActor::Delegate,
+    : public AutoEnrollmentCheckScreenView::Delegate,
       public BaseScreen,
       public NetworkPortalDetector::Observer {
  public:
   AutoEnrollmentCheckScreen(BaseScreenDelegate* base_screen_delegate,
-                            AutoEnrollmentCheckScreenActor* actor);
+                            AutoEnrollmentCheckScreenView* view);
   ~AutoEnrollmentCheckScreen() override;
 
   static AutoEnrollmentCheckScreen* Get(ScreenManager* manager);
@@ -51,8 +51,8 @@
   void Show() override;
   void Hide() override;
 
-  // AutoEnrollmentCheckScreenActor::Delegate implementation:
-  void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) override;
+  // AutoEnrollmentCheckScreenView::Delegate implementation:
+  void OnViewDestroyed(AutoEnrollmentCheckScreenView* view) override;
 
   // NetworkPortalDetector::Observer implementation:
   void OnPortalDetectionCompleted(
@@ -90,7 +90,7 @@
   // The user requested a connection attempt to be performed.
   void OnConnectRequested();
 
-  AutoEnrollmentCheckScreenActor* actor_;
+  AutoEnrollmentCheckScreenView* view_;
   AutoEnrollmentController* auto_enrollment_controller_;
 
   std::unique_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h
deleted file mode 100644
index 1079ad3..0000000
--- a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h
+++ /dev/null

@@ -1,32 +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 CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_ACTOR_H_
-
-namespace chromeos {
-
-// Interface between auto-enrollment check screen and its representation.
-// Note, do not forget to call OnActorDestroyed in the dtor.
-class AutoEnrollmentCheckScreenActor {
- public:
-  // Allows us to get info from auto-enrollment check screen that we need.
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(AutoEnrollmentCheckScreenActor* actor) = 0;
-  };
-
-  virtual ~AutoEnrollmentCheckScreenActor() {}
-
-  virtual void Show() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h
new file mode 100644
index 0000000..3259790
--- /dev/null
+++ b/chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h

@@ -0,0 +1,32 @@
+// 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 CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_VIEW_H_
+
+namespace chromeos {
+
+// Interface between auto-enrollment check screen and its representation.
+// Note, do not forget to call OnViewDestroyed in the dtor.
+class AutoEnrollmentCheckScreenView {
+ public:
+  // Allows us to get info from auto-enrollment check screen that we need.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(NULL).
+    virtual void OnViewDestroyed(AutoEnrollmentCheckScreenView* view) = 0;
+  };
+
+  virtual ~AutoEnrollmentCheckScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index 73db1d4a..3c7483a0 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

@@ -74,9 +74,9 @@
 }
 
 EnrollmentScreen::EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
-                                   EnrollmentScreenActor* actor)
+                                   EnrollmentScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_ENROLLMENT),
-      actor_(actor),
+      view_(view),
       weak_ptr_factory_(this) {
   retry_policy_.num_errors_to_ignore = 0;
   retry_policy_.initial_delay_ms = kInitialDelayMS;
@@ -126,7 +126,7 @@
                        ? policy::EnrollmentConfig::MODE_ATTESTATION_FORCED
                        : policy::EnrollmentConfig::MODE_ATTESTATION;
   }
-  actor_->SetParameters(this, config_);
+  view_->SetParameters(this, config_);
   enrollment_helper_ = nullptr;
 }
 
@@ -182,14 +182,14 @@
 }
 
 void EnrollmentScreen::Hide() {
-  actor_->Hide();
+  view_->Hide();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 void EnrollmentScreen::AuthenticateUsingAttestation() {
   VLOG(1) << "Authenticating using attestation.";
   elapsed_timer_.reset(new base::ElapsedTimer());
-  actor_->Show();
+  view_->Show();
   CreateEnrollmentHelper();
   enrollment_helper_->EnrollUsingAttestation();
 }
@@ -202,7 +202,7 @@
   UMA(enrollment_failed_once_ ? policy::kMetricEnrollmentRestarted
                               : policy::kMetricEnrollmentStarted);
 
-  actor_->ShowEnrollmentSpinnerScreen();
+  view_->ShowEnrollmentSpinnerScreen();
   CreateEnrollmentHelper();
   enrollment_helper_->EnrollUsingAuthCode(
       auth_code, shark_controller_ != nullptr /* fetch_additional_token */);
@@ -256,7 +256,7 @@
 
 void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) {
   RecordEnrollmentErrorMetrics();
-  actor_->ShowAuthError(error);
+  view_->ShowAuthError(error);
 }
 
 void EnrollmentScreen::OnEnrollmentError(policy::EnrollmentStatus status) {
@@ -272,7 +272,7 @@
       current_auth_ == AUTH_ATTESTATION && AdvanceToNextAuth()) {
     Show();
   } else {
-    actor_->ShowEnrollmentStatus(status);
+    view_->ShowEnrollmentStatus(status);
     if (UsingHandsOffEnrollment())
       AutomaticRetry();
   }
@@ -281,7 +281,7 @@
 void EnrollmentScreen::OnOtherError(
     EnterpriseEnrollmentHelper::OtherError error) {
   RecordEnrollmentErrorMetrics();
-  actor_->ShowOtherError(error);
+  view_->ShowOtherError(error);
   if (UsingHandsOffEnrollment())
     AutomaticRetry();
 }
@@ -325,10 +325,10 @@
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     connector->GetDeviceCloudPolicyManager()->core()->RefreshSoon();
-    actor_->ShowEnrollmentStatus(
+    view_->ShowEnrollmentStatus(
         policy::EnrollmentStatus::ForStatus(policy::EnrollmentStatus::SUCCESS));
   } else {
-    actor_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
+    view_->ShowEnrollmentStatus(policy::EnrollmentStatus::ForStatus(
         policy::EnrollmentStatus::ATTRIBUTE_UPDATE_FAILED));
   }
 }
@@ -345,7 +345,7 @@
 
   std::string asset_id = policy ? policy->annotated_asset_id() : std::string();
   std::string location = policy ? policy->annotated_location() : std::string();
-  actor_->ShowAttributePromptScreen(asset_id, location);
+  view_->ShowAttributePromptScreen(asset_id, location);
 }
 
 void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) {
@@ -360,7 +360,7 @@
   if (UsingHandsOffEnrollment()) {
     OnConfirmationClosed();
   } else {
-    actor_->ShowEnrollmentStatus(
+    view_->ShowEnrollmentStatus(
         policy::EnrollmentStatus::ForStatus(policy::EnrollmentStatus::SUCCESS));
   }
 }
@@ -370,8 +370,8 @@
 }
 
 void EnrollmentScreen::ShowSigninScreen() {
-  actor_->Show();
-  actor_->ShowSigninScreen();
+  view_->Show();
+  view_->ShowSigninScreen();
 }
 
 void EnrollmentScreen::RecordEnrollmentErrorMetrics() {
@@ -383,7 +383,7 @@
 
 void EnrollmentScreen::JoinDomain(OnDomainJoinedCallback on_joined_callback) {
   on_joined_callback_ = std::move(on_joined_callback);
-  actor_->ShowAdJoin();
+  view_->ShowAdJoin();
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
index 6e547f6b..7cabf4c8 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.h

@@ -14,7 +14,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/policy/active_directory_join_delegate.h"
@@ -41,11 +41,11 @@
 class EnrollmentScreen
     : public BaseScreen,
       public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer,
-      public EnrollmentScreenActor::Controller,
+      public EnrollmentScreenView::Controller,
       public ActiveDirectoryJoinDelegate {
  public:
   EnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
-                   EnrollmentScreenActor* actor);
+                   EnrollmentScreenView* view);
   ~EnrollmentScreen() override;
 
   static EnrollmentScreen* Get(ScreenManager* manager);
@@ -61,7 +61,7 @@
   void Show() override;
   void Hide() override;
 
-  // EnrollmentScreenActor::Controller implementation:
+  // EnrollmentScreenView::Controller implementation:
   void OnLoginDone(const std::string& user,
                    const std::string& auth_code) override;
   void OnRetry() override;
@@ -83,9 +83,7 @@
   void JoinDomain(OnDomainJoinedCallback on_joined_callback) override;
 
   // Used for testing.
-  EnrollmentScreenActor* GetActor() {
-    return actor_;
-  }
+  EnrollmentScreenView* GetView() { return view_; }
 
  private:
   friend class EnrollmentScreenUnitTest;
@@ -166,7 +164,7 @@
 
   pairing_chromeos::ControllerPairingController* shark_controller_ = nullptr;
 
-  EnrollmentScreenActor* actor_;
+  EnrollmentScreenView* view_;
   policy::EnrollmentConfig config_;
   policy::EnrollmentConfig enrollment_config_;
   Auth current_auth_ = AUTH_OAUTH;

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h
deleted file mode 100644
index bcb27b10..0000000
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h
+++ /dev/null

@@ -1,81 +0,0 @@
-// Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_ACTOR_H_
-
-#include <string>
-
-#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
-
-class GoogleServiceAuthError;
-
-namespace policy {
-struct EnrollmentConfig;
-class EnrollmentStatus;
-}
-
-namespace chromeos {
-
-// Interface class for the enterprise enrollment screen actor.
-class EnrollmentScreenActor {
- public:
-  // This defines the interface for controllers which will be called back when
-  // something happens on the UI.
-  class Controller {
-   public:
-    virtual ~Controller() {}
-
-    virtual void OnLoginDone(const std::string& user,
-                             const std::string& auth_code) = 0;
-    virtual void OnRetry() = 0;
-    virtual void OnCancel() = 0;
-    virtual void OnConfirmationClosed() = 0;
-    virtual void OnAdJoined(const std::string& realm) = 0;
-    virtual void OnDeviceAttributeProvided(const std::string& asset_id,
-                                           const std::string& location) = 0;
-  };
-
-  virtual ~EnrollmentScreenActor() {}
-
-  // Initializes the actor with parameters.
-  virtual void SetParameters(Controller* controller,
-                             const policy::EnrollmentConfig& config) = 0;
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-
-  // Shows the signin screen.
-  virtual void ShowSigninScreen() = 0;
-
-  // Shows the Active Directory domain joining screen.
-  virtual void ShowAdJoin() = 0;
-
-  // Shows the device attribute prompt screen.
-  virtual void ShowAttributePromptScreen(const std::string& asset_id,
-                                         const std::string& location) = 0;
-
-  // Shows a success string for attestation-based enrollment.
-  virtual void ShowAttestationBasedEnrollmentSuccessScreen(
-      const std::string& enterprise_domain) = 0;
-
-  // Shows the spinner screen for enrollment.
-  virtual void ShowEnrollmentSpinnerScreen() = 0;
-
-  // Show an authentication error.
-  virtual void ShowAuthError(const GoogleServiceAuthError& error) = 0;
-
-  // Show non-authentication error.
-  virtual void ShowOtherError(EnterpriseEnrollmentHelper::OtherError error) = 0;
-
-  // Update the UI to report the |status| of the enrollment procedure.
-  virtual void ShowEnrollmentStatus(policy::EnrollmentStatus status) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
index a79d8dc2..3e210ce 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc

@@ -136,25 +136,25 @@
   EnrollmentScreen* enrollment_screen = EnrollmentScreen::Get(wcontroller);
   ASSERT_TRUE(enrollment_screen);
 
-  EnrollmentScreenActor* actor = enrollment_screen->GetActor();
-  ASSERT_TRUE(actor);
+  EnrollmentScreenView* view = enrollment_screen->GetView();
+  ASSERT_TRUE(view);
 
   test::JSChecker checker(
       LoginDisplayHost::default_host()->GetWebUILoginView()->GetWebContents());
 
   // Run through the flow
-  actor->Show();
+  view->Show();
   OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENROLLMENT).Wait();
   checker.ExpectTrue(
       "window.getComputedStyle(document.getElementById('oauth-enroll-step-"
       "signin')).display !== 'none'");
 
-  actor->ShowEnrollmentSpinnerScreen();
+  view->ShowEnrollmentSpinnerScreen();
   checker.ExpectTrue(
       "window.getComputedStyle(document.getElementById('oauth-enroll-step-"
       "working')).display !== 'none'");
 
-  actor->ShowAttestationBasedEnrollmentSuccessScreen("fake domain");
+  view->ShowAttestationBasedEnrollmentSuccessScreen("fake domain");
   checker.ExpectTrue(
       "window.getComputedStyle(document.getElementById('oauth-enroll-step-abe-"
       "success')).display !== 'none'");

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_unittest.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen_unittest.cc
index e4b8bc6..dce186db 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen_unittest.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_unittest.cc

@@ -77,7 +77,7 @@
   // Creates the EnrollmentScreen and sets required parameters.
   void SetUpEnrollmentScreen() {
     enrollment_screen_.reset(
-        new EnrollmentScreen(&mock_delegate_, &mock_actor_));
+        new EnrollmentScreen(&mock_delegate_, &mock_view_));
     enrollment_screen_->SetParameters(enrollment_config_, &fake_controller_);
   }
 
@@ -116,7 +116,7 @@
   policy::EnrollmentConfig enrollment_config_;
   pairing_chromeos::FakeControllerPairingController fake_controller_;
   MockBaseScreenDelegate mock_delegate_;
-  MockEnrollmentScreenActor mock_actor_;
+  MockEnrollmentScreenView mock_view_;
 
   DISALLOW_COPY_AND_ASSIGN(EnrollmentScreenUnitTest);
 };

diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h b/chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h
new file mode 100644
index 0000000..9b43849
--- /dev/null
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h

@@ -0,0 +1,81 @@
+// Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_VIEW_H_
+
+#include <string>
+
+#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
+
+class GoogleServiceAuthError;
+
+namespace policy {
+struct EnrollmentConfig;
+class EnrollmentStatus;
+}
+
+namespace chromeos {
+
+// Interface class for the enterprise enrollment screen view.
+class EnrollmentScreenView {
+ public:
+  // This defines the interface for controllers which will be called back when
+  // something happens on the UI.
+  class Controller {
+   public:
+    virtual ~Controller() {}
+
+    virtual void OnLoginDone(const std::string& user,
+                             const std::string& auth_code) = 0;
+    virtual void OnRetry() = 0;
+    virtual void OnCancel() = 0;
+    virtual void OnConfirmationClosed() = 0;
+    virtual void OnAdJoined(const std::string& realm) = 0;
+    virtual void OnDeviceAttributeProvided(const std::string& asset_id,
+                                           const std::string& location) = 0;
+  };
+
+  virtual ~EnrollmentScreenView() {}
+
+  // Initializes the view with parameters.
+  virtual void SetParameters(Controller* controller,
+                             const policy::EnrollmentConfig& config) = 0;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+
+  // Shows the signin screen.
+  virtual void ShowSigninScreen() = 0;
+
+  // Shows the Active Directory domain joining screen.
+  virtual void ShowAdJoin() = 0;
+
+  // Shows the device attribute prompt screen.
+  virtual void ShowAttributePromptScreen(const std::string& asset_id,
+                                         const std::string& location) = 0;
+
+  // Shows a success string for attestation-based enrollment.
+  virtual void ShowAttestationBasedEnrollmentSuccessScreen(
+      const std::string& enterprise_domain) = 0;
+
+  // Shows the spinner screen for enrollment.
+  virtual void ShowEnrollmentSpinnerScreen() = 0;
+
+  // Show an authentication error.
+  virtual void ShowAuthError(const GoogleServiceAuthError& error) = 0;
+
+  // Show non-authentication error.
+  virtual void ShowOtherError(EnterpriseEnrollmentHelper::OtherError error) = 0;
+
+  // Update the UI to report the |status| of the enrollment procedure.
+  virtual void ShowEnrollmentStatus(policy::EnrollmentStatus status) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc
index 6d9c0c8..1bf9f20 100644
--- a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.cc

@@ -11,24 +11,22 @@
 
 MockAutoEnrollmentCheckScreen::MockAutoEnrollmentCheckScreen(
     BaseScreenDelegate* base_screen_delegate,
-    AutoEnrollmentCheckScreenActor* actor)
-    : AutoEnrollmentCheckScreen(base_screen_delegate, actor) {
-}
+    AutoEnrollmentCheckScreenView* view)
+    : AutoEnrollmentCheckScreen(base_screen_delegate, view) {}
 
 MockAutoEnrollmentCheckScreen::~MockAutoEnrollmentCheckScreen() { }
 
-MockAutoEnrollmentCheckScreenActor::MockAutoEnrollmentCheckScreenActor()
+MockAutoEnrollmentCheckScreenView::MockAutoEnrollmentCheckScreenView()
     : screen_(NULL) {
   EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
 }
 
-
-MockAutoEnrollmentCheckScreenActor::~MockAutoEnrollmentCheckScreenActor() {
+MockAutoEnrollmentCheckScreenView::~MockAutoEnrollmentCheckScreenView() {
   if (screen_)
-    screen_->OnActorDestroyed(this);
+    screen_->OnViewDestroyed(this);
 }
 
-void MockAutoEnrollmentCheckScreenActor::SetDelegate(Delegate* screen) {
+void MockAutoEnrollmentCheckScreenView::SetDelegate(Delegate* screen) {
   screen_ = screen;
   MockSetDelegate(screen);
 }

diff --git a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h
index b6dd5e1..ecd7f7f7 100644
--- a/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_screen.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_MOCK_AUTO_ENROLLMENT_CHECK_SCREEN_H_
 
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
-#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -14,15 +14,14 @@
 class MockAutoEnrollmentCheckScreen : public AutoEnrollmentCheckScreen {
  public:
   MockAutoEnrollmentCheckScreen(BaseScreenDelegate* base_screen_delegate,
-                                AutoEnrollmentCheckScreenActor* actor);
+                                AutoEnrollmentCheckScreenView* view);
   ~MockAutoEnrollmentCheckScreen() override;
 };
 
-class MockAutoEnrollmentCheckScreenActor
-    : public AutoEnrollmentCheckScreenActor {
+class MockAutoEnrollmentCheckScreenView : public AutoEnrollmentCheckScreenView {
  public:
-  MockAutoEnrollmentCheckScreenActor();
-  ~MockAutoEnrollmentCheckScreenActor() override;
+  MockAutoEnrollmentCheckScreenView();
+  ~MockAutoEnrollmentCheckScreenView() override;
 
   void SetDelegate(Delegate* screen) override;
 

diff --git a/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.cc
index b2ce4a1..e4ac54a 100644
--- a/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.cc

@@ -8,17 +8,14 @@
 
 MockEnrollmentScreen::MockEnrollmentScreen(
     BaseScreenDelegate* base_screen_delegate,
-    EnrollmentScreenActor* actor)
-    : EnrollmentScreen(base_screen_delegate, actor) {
-}
+    EnrollmentScreenView* view)
+    : EnrollmentScreen(base_screen_delegate, view) {}
 
 MockEnrollmentScreen::~MockEnrollmentScreen() {
 }
 
-MockEnrollmentScreenActor::MockEnrollmentScreenActor() {
-}
+MockEnrollmentScreenView::MockEnrollmentScreenView() {}
 
-MockEnrollmentScreenActor::~MockEnrollmentScreenActor() {
-}
+MockEnrollmentScreenView::~MockEnrollmentScreenView() {}
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h b/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h
index a9be5222..139c43b 100644
--- a/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h
+++ b/chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_MOCK_ENROLLMENT_SCREEN_H_
 
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
-#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "google_apis/gaia/google_service_auth_error.h"
@@ -17,15 +17,14 @@
 class MockEnrollmentScreen : public EnrollmentScreen {
  public:
   MockEnrollmentScreen(BaseScreenDelegate* base_screen_delegate,
-                       EnrollmentScreenActor* actor);
+                       EnrollmentScreenView* view);
   ~MockEnrollmentScreen() override;
 };
 
-class MockEnrollmentScreenActor
-    : public EnrollmentScreenActor {
+class MockEnrollmentScreenView : public EnrollmentScreenView {
  public:
-  MockEnrollmentScreenActor();
-  virtual ~MockEnrollmentScreenActor();
+  MockEnrollmentScreenView();
+  virtual ~MockEnrollmentScreenView();
 
   MOCK_METHOD2(SetParameters,
                void(Controller*, const policy::EnrollmentConfig& config));

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index d6685315..0d7112a 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -763,7 +763,7 @@
 
     // Configure network should bring up lock screen for owner.
     OobeScreenWaiter lock_screen_waiter(OobeScreen::SCREEN_ACCOUNT_PICKER);
-    static_cast<AppLaunchSplashScreenActor::Delegate*>(GetAppLaunchController())
+    static_cast<AppLaunchSplashScreenView::Delegate*>(GetAppLaunchController())
         ->OnConfigureNetwork();
     lock_screen_waiter.Wait();
 

diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
index 8312e2f..659e0f4 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc

@@ -431,14 +431,14 @@
   if (new_bounds.IsEmpty()) {
     // Keyboard has been hidden.
     if (GetOobeUI()) {
-      GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true);
-      GetOobeUI()->GetCoreOobeActor()->ShowPinKeyboard(true);
+      GetOobeUI()->GetCoreOobeView()->ShowControlBar(true);
+      GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(true);
     }
   } else {
     // Keyboard has been shown.
     if (GetOobeUI()) {
-      GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
-      GetOobeUI()->GetCoreOobeActor()->ShowPinKeyboard(false);
+      GetOobeUI()->GetCoreOobeView()->ShowControlBar(false);
+      GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(false);
     }
   }
 }
@@ -463,8 +463,8 @@
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
-    GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
-                                                       size.height());
+    GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
+                                                      size.height());
   }
 }
 

diff --git a/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc b/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc
index 472d8de..3e5b8d1 100644
--- a/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_ui_keyboard_browsertest.cc

@@ -43,15 +43,12 @@
 class FocusPODWaiter {
  public:
   FocusPODWaiter() : focused_(false), runner_(new content::MessageLoopRunner) {
-    GetOobeUI()
-        ->signin_screen_handler_for_test()
-        ->SetFocusPODCallbackForTesting(
-            base::Bind(&FocusPODWaiter::OnFocusPOD, base::Unretained(this)));
+    GetOobeUI()->signin_screen_handler()->SetFocusPODCallbackForTesting(
+        base::Bind(&FocusPODWaiter::OnFocusPOD, base::Unretained(this)));
   }
   ~FocusPODWaiter() {
-    GetOobeUI()
-        ->signin_screen_handler_for_test()
-        ->SetFocusPODCallbackForTesting(base::Closure());
+    GetOobeUI()->signin_screen_handler()->SetFocusPODCallbackForTesting(
+        base::Closure());
   }
 
   void OnFocusPOD() {
@@ -70,9 +67,8 @@
     if (focused_)
       return;
     runner_->Run();
-    GetOobeUI()
-        ->signin_screen_handler_for_test()
-        ->SetFocusPODCallbackForTesting(base::Closure());
+    GetOobeUI()->signin_screen_handler()->SetFocusPODCallbackForTesting(
+        base::Closure());
     runner_ = NULL;
   }
 

diff --git a/chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h b/chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h
deleted file mode 100644
index 27163215..0000000
--- a/chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h
+++ /dev/null

@@ -1,70 +0,0 @@
-// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_ACTOR_H_
-
-#include "base/strings/string16.h"
-
-namespace chromeos {
-
-// Interface for UI implemenations of the ApplaunchSplashScreen.
-class AppLaunchSplashScreenActor {
- public:
-  enum AppLaunchState {
-    APP_LAUNCH_STATE_LOADING_AUTH_FILE,
-    APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE,
-    APP_LAUNCH_STATE_PREPARING_NETWORK,
-    APP_LAUNCH_STATE_INSTALLING_APPLICATION,
-    APP_LAUNCH_STATE_WAITING_APP_WINDOW,
-    APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT,
-    APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI,
-  };
-
-  class Delegate {
-   public:
-    // Invoked when the configure network control is clicked.
-    virtual void OnConfigureNetwork() = 0;
-
-    // Invoked when the app launch bailout shortcut key is pressed.
-    virtual void OnCancelAppLaunch() = 0;
-
-    // Invoked when the network config shortcut key is pressed.
-    virtual void OnNetworkConfigRequested(bool requested) = 0;
-
-    // Invoked when network state is changed. |online| is true if the device
-    // is connected to the Internet.
-    virtual void OnNetworkStateChanged(bool online) = 0;
-
-   protected:
-    virtual ~Delegate() {}
-  };
-
-  virtual ~AppLaunchSplashScreenActor() {}
-
-  // Sets screen this actor belongs to.
-  virtual void SetDelegate(Delegate* screen) = 0;
-
-  // Shows the contents of the screen.
-  virtual void Show(const std::string& app_id) = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-
-  // Set the current app launch state.
-  virtual void UpdateAppLaunchState(AppLaunchState state) = 0;
-
-  // Sets whether configure network control is visible.
-  virtual void ToggleNetworkConfig(bool visible) = 0;
-
-  // Shows the network error and configure UI.
-  virtual void ShowNetworkConfigureUI() = 0;
-
-  // Returns true if the default network has Internet access.
-  virtual bool IsNetworkReady() = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h b/chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h
new file mode 100644
index 0000000..d7dcfe8
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h

@@ -0,0 +1,70 @@
+// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_VIEW_H_
+
+#include "base/strings/string16.h"
+
+namespace chromeos {
+
+// Interface for UI implemenations of the ApplaunchSplashScreen.
+class AppLaunchSplashScreenView {
+ public:
+  enum AppLaunchState {
+    APP_LAUNCH_STATE_LOADING_AUTH_FILE,
+    APP_LAUNCH_STATE_LOADING_TOKEN_SERVICE,
+    APP_LAUNCH_STATE_PREPARING_NETWORK,
+    APP_LAUNCH_STATE_INSTALLING_APPLICATION,
+    APP_LAUNCH_STATE_WAITING_APP_WINDOW,
+    APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT,
+    APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI,
+  };
+
+  class Delegate {
+   public:
+    // Invoked when the configure network control is clicked.
+    virtual void OnConfigureNetwork() = 0;
+
+    // Invoked when the app launch bailout shortcut key is pressed.
+    virtual void OnCancelAppLaunch() = 0;
+
+    // Invoked when the network config shortcut key is pressed.
+    virtual void OnNetworkConfigRequested(bool requested) = 0;
+
+    // Invoked when network state is changed. |online| is true if the device
+    // is connected to the Internet.
+    virtual void OnNetworkStateChanged(bool online) = 0;
+
+   protected:
+    virtual ~Delegate() {}
+  };
+
+  virtual ~AppLaunchSplashScreenView() {}
+
+  // Sets screen this view belongs to.
+  virtual void SetDelegate(Delegate* screen) = 0;
+
+  // Shows the contents of the screen.
+  virtual void Show(const std::string& app_id) = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+
+  // Set the current app launch state.
+  virtual void UpdateAppLaunchState(AppLaunchState state) = 0;
+
+  // Sets whether configure network control is visible.
+  virtual void ToggleNetworkConfig(bool visible) = 0;
+
+  // Shows the network error and configure UI.
+  virtual void ShowNetworkConfigureUI() = 0;
+
+  // Returns true if the default network has Internet access.
+  virtual bool IsNetworkReady() = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_APP_LAUNCH_SPLASH_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h b/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h
deleted file mode 100644
index b6a8c85..0000000
--- a/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h
+++ /dev/null

@@ -1,51 +0,0 @@
-// Copyright 2017 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_ACTOR_H_
-
-namespace chromeos {
-
-// Interface for UI implemenations of the ArcKioskSplashScreen.
-class ArcKioskSplashScreenActor {
- public:
-  enum class ArcKioskState {
-    STARTING_SESSION,
-    WAITING_APP_LAUNCH,
-    WAITING_APP_WINDOW,
-  };
-
-  class Delegate {
-   public:
-    Delegate() = default;
-    // Invoked when the launch bailout shortcut key is pressed.
-    virtual void OnCancelArcKioskLaunch() = 0;
-
-   protected:
-    virtual ~Delegate() = default;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(Delegate);
-  };
-
-  ArcKioskSplashScreenActor() = default;
-
-  virtual ~ArcKioskSplashScreenActor() = default;
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Set the current ARC kiosk state.
-  virtual void UpdateArcKioskState(ArcKioskState state) = 0;
-
-  // Sets screen this actor belongs to.
-  virtual void SetDelegate(Delegate* delegate) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArcKioskSplashScreenActor);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_view.h b/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_view.h
new file mode 100644
index 0000000..3e96825
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_view.h

@@ -0,0 +1,51 @@
+// Copyright 2017 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_VIEW_H_
+
+namespace chromeos {
+
+// Interface for UI implemenations of the ArcKioskSplashScreen.
+class ArcKioskSplashScreenView {
+ public:
+  enum class ArcKioskState {
+    STARTING_SESSION,
+    WAITING_APP_LAUNCH,
+    WAITING_APP_WINDOW,
+  };
+
+  class Delegate {
+   public:
+    Delegate() = default;
+    // Invoked when the launch bailout shortcut key is pressed.
+    virtual void OnCancelArcKioskLaunch() = 0;
+
+   protected:
+    virtual ~Delegate() = default;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(Delegate);
+  };
+
+  ArcKioskSplashScreenView() = default;
+
+  virtual ~ArcKioskSplashScreenView() = default;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Set the current ARC kiosk state.
+  virtual void UpdateArcKioskState(ArcKioskState state) = 0;
+
+  // Sets screen this view belongs to.
+  virtual void SetDelegate(Delegate* delegate) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ArcKioskSplashScreenView);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_KIOSK_SPLASH_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
index 8fbd907a..34b0abf 100644
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h"
 
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
@@ -17,30 +17,30 @@
 
 ArcTermsOfServiceScreen::ArcTermsOfServiceScreen(
     BaseScreenDelegate* base_screen_delegate,
-    ArcTermsOfServiceScreenActor* actor)
+    ArcTermsOfServiceScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->AddObserver(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->AddObserver(this);
 }
 
 ArcTermsOfServiceScreen::~ArcTermsOfServiceScreen() {
-  if (actor_)
-    actor_->RemoveObserver(this);
+  if (view_)
+    view_->RemoveObserver(this);
 }
 
 void ArcTermsOfServiceScreen::Show() {
-  if (!actor_)
+  if (!view_)
     return;
 
   // Show the screen.
-  actor_->Show();
+  view_->Show();
 }
 
 void ArcTermsOfServiceScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void ArcTermsOfServiceScreen::OnSkip() {
@@ -51,10 +51,10 @@
   Finish(BaseScreenDelegate::ARC_TERMS_OF_SERVICE_FINISHED);
 }
 
-void ArcTermsOfServiceScreen::OnActorDestroyed(
-    ArcTermsOfServiceScreenActor* actor) {
-  DCHECK_EQ(actor, actor_);
-  actor_ = nullptr;
+void ArcTermsOfServiceScreen::OnViewDestroyed(
+    ArcTermsOfServiceScreenView* view) {
+  DCHECK_EQ(view, view_);
+  view_ = nullptr;
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h
index fff5e27..cad2d8ae 100644
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen.h

@@ -8,32 +8,32 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 
 namespace chromeos {
 
-class ArcTermsOfServiceScreenActor;
+class ArcTermsOfServiceScreenView;
 class BaseScreenDelegate;
 
 class ArcTermsOfServiceScreen : public BaseScreen,
-                                public ArcTermsOfServiceScreenActorObserver {
+                                public ArcTermsOfServiceScreenViewObserver {
  public:
   ArcTermsOfServiceScreen(BaseScreenDelegate* base_screen_delegate,
-                          ArcTermsOfServiceScreenActor* actor);
+                          ArcTermsOfServiceScreenView* view);
   ~ArcTermsOfServiceScreen() override;
 
   // BaseScreen:
   void Show() override;
   void Hide() override;
 
-  // ArcTermsOfServiceScreenActorObserver:
+  // ArcTermsOfServiceScreenViewObserver:
   void OnSkip() override;
   void OnAccept() override;
-  void OnActorDestroyed(ArcTermsOfServiceScreenActor* actor) override;
+  void OnViewDestroyed(ArcTermsOfServiceScreenView* view) override;
 
  private:
-  ArcTermsOfServiceScreenActor* actor_;
+  ArcTermsOfServiceScreenView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h
deleted file mode 100644
index a30b60a..0000000
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h
+++ /dev/null

@@ -1,42 +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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_H_
-
-#include <string>
-
-#include "base/macros.h"
-
-namespace chromeos {
-
-class ArcTermsOfServiceScreenActorObserver;
-
-// Interface for dependency injection between TermsOfServiceScreen and its
-// WebUI representation.
-class ArcTermsOfServiceScreenActor {
- public:
-  virtual ~ArcTermsOfServiceScreenActor() = default;
-
-  // Adds/Removes observer for actor.
-  virtual void AddObserver(ArcTermsOfServiceScreenActorObserver* observer) = 0;
-  virtual void RemoveObserver(
-      ArcTermsOfServiceScreenActorObserver* observer) = 0;
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-
- protected:
-  ArcTermsOfServiceScreenActor() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenActor);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h
deleted file mode 100644
index cd1346ee..0000000
--- a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h
+++ /dev/null

@@ -1,36 +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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_OBSERVER_H_
-
-#include "base/macros.h"
-
-namespace chromeos {
-
-class ArcTermsOfServiceScreenActor;
-
-class ArcTermsOfServiceScreenActorObserver {
- public:
-  virtual ~ArcTermsOfServiceScreenActorObserver() = default;
-
-  // Called when the user skips the PlayStore Terms of Service.
-  virtual void OnSkip() = 0;
-
-  // Called when the user accepts the PlayStore Terms of Service.
-  virtual void OnAccept() = 0;
-
-  // Called when actor is destroyed so there is no dead reference to it.
-  virtual void OnActorDestroyed(ArcTermsOfServiceScreenActor* actor) = 0;
-
- protected:
-  ArcTermsOfServiceScreenActorObserver() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenActorObserver);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_ACTOR_OBSERVER_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h
new file mode 100644
index 0000000..7b75f78
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h

@@ -0,0 +1,42 @@
+// 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_H_
+
+#include <string>
+
+#include "base/macros.h"
+
+namespace chromeos {
+
+class ArcTermsOfServiceScreenViewObserver;
+
+// Interface for dependency injection between TermsOfServiceScreen and its
+// WebUI representation.
+class ArcTermsOfServiceScreenView {
+ public:
+  virtual ~ArcTermsOfServiceScreenView() = default;
+
+  // Adds/Removes observer for view.
+  virtual void AddObserver(ArcTermsOfServiceScreenViewObserver* observer) = 0;
+  virtual void RemoveObserver(
+      ArcTermsOfServiceScreenViewObserver* observer) = 0;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+
+ protected:
+  ArcTermsOfServiceScreenView() = default;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenView);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h
new file mode 100644
index 0000000..f539027
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h

@@ -0,0 +1,36 @@
+// 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_OBSERVER_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_OBSERVER_H_
+
+#include "base/macros.h"
+
+namespace chromeos {
+
+class ArcTermsOfServiceScreenView;
+
+class ArcTermsOfServiceScreenViewObserver {
+ public:
+  virtual ~ArcTermsOfServiceScreenViewObserver() = default;
+
+  // Called when the user skips the PlayStore Terms of Service.
+  virtual void OnSkip() = 0;
+
+  // Called when the user accepts the PlayStore Terms of Service.
+  virtual void OnAccept() = 0;
+
+  // Called when the view is destroyed so there is no dead reference to it.
+  virtual void OnViewDestroyed(ArcTermsOfServiceScreenView* view) = 0;
+
+ protected:
+  ArcTermsOfServiceScreenViewObserver() = default;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ArcTermsOfServiceScreenViewObserver);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ARC_TERMS_OF_SERVICE_SCREEN_VIEW_OBSERVER_H_

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
index 3c9128bb..08a536c 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

@@ -18,22 +18,22 @@
 ControllerPairingScreen::ControllerPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
-    ControllerPairingScreenActor* actor,
+    ControllerPairingScreenView* view,
     ControllerPairingController* shark_controller)
     : BaseScreen(base_screen_delegate,
                  OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING),
       delegate_(delegate),
-      actor_(actor),
+      view_(view),
       shark_controller_(shark_controller),
       current_stage_(ControllerPairingController::STAGE_NONE),
       device_preselected_(false) {
-  actor_->SetDelegate(this);
+  view_->SetDelegate(this);
   shark_controller_->AddObserver(this);
 }
 
 ControllerPairingScreen::~ControllerPairingScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(nullptr);
   shark_controller_->RemoveObserver(this);
 }
 
@@ -42,8 +42,8 @@
     return;
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
-  if (actor_)
-    actor_->OnContextChanged(diff);
+  if (view_)
+    view_->OnContextChanged(diff);
 }
 
 bool ControllerPairingScreen::ExpectStageIs(Stage stage) const {
@@ -55,14 +55,14 @@
 }
 
 void ControllerPairingScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
   shark_controller_->StartPairing();
 }
 
 void ControllerPairingScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
@@ -160,10 +160,10 @@
   CommitContextChanges();
 }
 
-void ControllerPairingScreen::OnActorDestroyed(
-    ControllerPairingScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void ControllerPairingScreen::OnViewDestroyed(
+    ControllerPairingScreenView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 // Overridden from ControllerPairingView::Delegate:

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
index 9305e14..3cd02c7 100644
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h"
 #include "components/login/screens/screen_context.h"
 #include "components/pairing/controller_pairing_controller.h"
 
@@ -17,7 +17,7 @@
 class ControllerPairingScreen
     : public BaseScreen,
       public pairing_chromeos::ControllerPairingController::Observer,
-      public ControllerPairingScreenActor::Delegate {
+      public ControllerPairingScreenView::Delegate {
  public:
   class Delegate {
    public:
@@ -33,7 +33,7 @@
   ControllerPairingScreen(
       BaseScreenDelegate* base_screen_delegate,
       Delegate* delegate,
-      ControllerPairingScreenActor* actor,
+      ControllerPairingScreenView* view,
       pairing_chromeos::ControllerPairingController* shark_controller);
   ~ControllerPairingScreen() override;
 
@@ -52,13 +52,13 @@
   void DiscoveredDevicesListChanged() override;
 
   // Overridden from ControllerPairingView::Delegate:
-  void OnActorDestroyed(ControllerPairingScreenActor* actor) override;
+  void OnViewDestroyed(ControllerPairingScreenView* view) override;
   void OnScreenContextChanged(const base::DictionaryValue& diff) override;
   void OnUserActed(const std::string& action) override;
 
   Delegate* delegate_;
 
-  ControllerPairingScreenActor* actor_;
+  ControllerPairingScreenView* view_;
 
   // Controller performing pairing. Owned by the wizard controller.
   pairing_chromeos::ControllerPairingController* shark_controller_;

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.cc
deleted file mode 100644
index 9cd894f9..0000000
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.cc
+++ /dev/null

@@ -1,52 +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 "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
-
-namespace chromeos {
-
-namespace controller_pairing {
-
-// Keep these constants synced with corresponding constants defined in
-// oobe_screen_controller_pairing.js.
-const char kContextKeyPage[] = "page";
-const char kContextKeyControlsDisabled[] = "controlsDisabled";
-const char kContextKeyDevices[] = "devices";
-const char kContextKeyConfirmationCode[] = "code";
-const char kContextKeySelectedDevice[] = "selectedDevice";
-const char kContextKeyAccountId[] = "accountId";
-const char kContextKeyEnrollmentDomain[] = "enrollmentDomain";
-
-const char kPageDevicesDiscovery[] = "devices-discovery";
-const char kPageDeviceSelect[] = "device-select";
-const char kPageDeviceNotFound[] = "device-not-found";
-const char kPageEstablishingConnection[] = "establishing-connection";
-const char kPageEstablishingConnectionError[] = "establishing-connection-error";
-const char kPageCodeConfirmation[] = "code-confirmation";
-const char kPageHostNetworkError[] = "host-network-error";
-const char kPageHostUpdate[] = "host-update";
-const char kPageHostConnectionLost[] = "host-connection-lost";
-const char kPageEnrollmentIntroduction[] = "enrollment-introduction";
-const char kPageAuthentication[] = "authentication";
-const char kPageHostEnrollment[] = "host-enrollment";
-const char kPageHostEnrollmentError[] = "host-enrollment-error";
-const char kPagePairingDone[] = "pairing-done";
-
-const char kActionChooseDevice[] = "chooseDevice";
-const char kActionRepeatDiscovery[] = "repeatDiscovery";
-const char kActionAcceptCode[] = "acceptCode";
-const char kActionRejectCode[] = "rejectCode";
-const char kActionProceedToAuthentication[] = "proceedToAuthentication";
-const char kActionEnroll[] = "enroll";
-const char kActionStartSession[] = "startSession";
-
-}  // namespace controller_pairing
-
-ControllerPairingScreenActor::ControllerPairingScreenActor() {
-}
-
-ControllerPairingScreenActor::~ControllerPairingScreenActor() {
-}
-
-}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h
deleted file mode 100644
index 3796790..0000000
--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h
+++ /dev/null

@@ -1,87 +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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_ACTOR_H_
-
-#include <string>
-
-#include "base/macros.h"
-
-namespace base {
-class DictionaryValue;
-}
-
-namespace content {
-class BrowserContext;
-}
-
-namespace chromeos {
-
-namespace controller_pairing {
-
-// Keep these constants synced with corresponding constants defined in
-// oobe_screen_controller_pairing.js.
-// Context keys.
-extern const char kContextKeyPage[];
-extern const char kContextKeyControlsDisabled[];
-extern const char kContextKeyDevices[];
-extern const char kContextKeyConfirmationCode[];
-extern const char kContextKeySelectedDevice[];
-extern const char kContextKeyAccountId[];
-extern const char kContextKeyEnrollmentDomain[];
-
-// Pages names.
-extern const char kPageDevicesDiscovery[];
-extern const char kPageDeviceSelect[];
-extern const char kPageDeviceNotFound[];
-extern const char kPageEstablishingConnection[];
-extern const char kPageEstablishingConnectionError[];
-extern const char kPageCodeConfirmation[];
-extern const char kPageHostNetworkError[];
-extern const char kPageHostUpdate[];
-extern const char kPageHostConnectionLost[];
-extern const char kPageEnrollmentIntroduction[];
-extern const char kPageAuthentication[];
-extern const char kPageHostEnrollment[];
-extern const char kPageHostEnrollmentError[];
-extern const char kPagePairingDone[];
-
-// Actions names.
-extern const char kActionChooseDevice[];
-extern const char kActionRepeatDiscovery[];
-extern const char kActionAcceptCode[];
-extern const char kActionRejectCode[];
-extern const char kActionProceedToAuthentication[];
-extern const char kActionEnroll[];
-extern const char kActionStartSession[];
-
-}  // namespace controller_pairing
-
-class ControllerPairingScreenActor {
- public:
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-    virtual void OnActorDestroyed(ControllerPairingScreenActor* actor) = 0;
-    virtual void OnScreenContextChanged(const base::DictionaryValue& diff) = 0;
-    virtual void OnUserActed(const std::string& action) = 0;
-  };
-
-  ControllerPairingScreenActor();
-  virtual ~ControllerPairingScreenActor();
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-  virtual void OnContextChanged(const base::DictionaryValue& diff) = 0;
-  virtual content::BrowserContext* GetBrowserContext() = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreenActor);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.cc
new file mode 100644
index 0000000..91cda03
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.cc

@@ -0,0 +1,50 @@
+// 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 "chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h"
+
+namespace chromeos {
+
+namespace controller_pairing {
+
+// Keep these constants synced with corresponding constants defined in
+// oobe_screen_controller_pairing.js.
+const char kContextKeyPage[] = "page";
+const char kContextKeyControlsDisabled[] = "controlsDisabled";
+const char kContextKeyDevices[] = "devices";
+const char kContextKeyConfirmationCode[] = "code";
+const char kContextKeySelectedDevice[] = "selectedDevice";
+const char kContextKeyAccountId[] = "accountId";
+const char kContextKeyEnrollmentDomain[] = "enrollmentDomain";
+
+const char kPageDevicesDiscovery[] = "devices-discovery";
+const char kPageDeviceSelect[] = "device-select";
+const char kPageDeviceNotFound[] = "device-not-found";
+const char kPageEstablishingConnection[] = "establishing-connection";
+const char kPageEstablishingConnectionError[] = "establishing-connection-error";
+const char kPageCodeConfirmation[] = "code-confirmation";
+const char kPageHostNetworkError[] = "host-network-error";
+const char kPageHostUpdate[] = "host-update";
+const char kPageHostConnectionLost[] = "host-connection-lost";
+const char kPageEnrollmentIntroduction[] = "enrollment-introduction";
+const char kPageAuthentication[] = "authentication";
+const char kPageHostEnrollment[] = "host-enrollment";
+const char kPageHostEnrollmentError[] = "host-enrollment-error";
+const char kPagePairingDone[] = "pairing-done";
+
+const char kActionChooseDevice[] = "chooseDevice";
+const char kActionRepeatDiscovery[] = "repeatDiscovery";
+const char kActionAcceptCode[] = "acceptCode";
+const char kActionRejectCode[] = "rejectCode";
+const char kActionProceedToAuthentication[] = "proceedToAuthentication";
+const char kActionEnroll[] = "enroll";
+const char kActionStartSession[] = "startSession";
+
+}  // namespace controller_pairing
+
+ControllerPairingScreenView::ControllerPairingScreenView() {}
+
+ControllerPairingScreenView::~ControllerPairingScreenView() {}
+
+}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h b/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h
new file mode 100644
index 0000000..739d4a6
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h

@@ -0,0 +1,87 @@
+// 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_VIEW_H_
+
+#include <string>
+
+#include "base/macros.h"
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace content {
+class BrowserContext;
+}
+
+namespace chromeos {
+
+namespace controller_pairing {
+
+// Keep these constants synced with corresponding constants defined in
+// oobe_screen_controller_pairing.js.
+// Context keys.
+extern const char kContextKeyPage[];
+extern const char kContextKeyControlsDisabled[];
+extern const char kContextKeyDevices[];
+extern const char kContextKeyConfirmationCode[];
+extern const char kContextKeySelectedDevice[];
+extern const char kContextKeyAccountId[];
+extern const char kContextKeyEnrollmentDomain[];
+
+// Pages names.
+extern const char kPageDevicesDiscovery[];
+extern const char kPageDeviceSelect[];
+extern const char kPageDeviceNotFound[];
+extern const char kPageEstablishingConnection[];
+extern const char kPageEstablishingConnectionError[];
+extern const char kPageCodeConfirmation[];
+extern const char kPageHostNetworkError[];
+extern const char kPageHostUpdate[];
+extern const char kPageHostConnectionLost[];
+extern const char kPageEnrollmentIntroduction[];
+extern const char kPageAuthentication[];
+extern const char kPageHostEnrollment[];
+extern const char kPageHostEnrollmentError[];
+extern const char kPagePairingDone[];
+
+// Actions names.
+extern const char kActionChooseDevice[];
+extern const char kActionRepeatDiscovery[];
+extern const char kActionAcceptCode[];
+extern const char kActionRejectCode[];
+extern const char kActionProceedToAuthentication[];
+extern const char kActionEnroll[];
+extern const char kActionStartSession[];
+
+}  // namespace controller_pairing
+
+class ControllerPairingScreenView {
+ public:
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+    virtual void OnViewDestroyed(ControllerPairingScreenView* view) = 0;
+    virtual void OnScreenContextChanged(const base::DictionaryValue& diff) = 0;
+    virtual void OnUserActed(const std::string& action) = 0;
+  };
+
+  ControllerPairingScreenView();
+  virtual ~ControllerPairingScreenView();
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+  virtual void OnContextChanged(const base::DictionaryValue& diff) = 0;
+  virtual content::BrowserContext* GetBrowserContext() = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreenView);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CONTROLLER_PAIRING_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/core_oobe_actor.h b/chrome/browser/chromeos/login/screens/core_oobe_actor.h
deleted file mode 100644
index 1200caa..0000000
--- a/chrome/browser/chromeos/login/screens/core_oobe_actor.h
+++ /dev/null

@@ -1,52 +0,0 @@
-// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_ACTOR_H_
-
-#include <string>
-
-#include "chrome/browser/chromeos/login/help_app_launcher.h"
-
-namespace base {
-class DictionaryValue;
-}
-
-namespace chromeos {
-
-class CoreOobeActor {
- public:
-  virtual ~CoreOobeActor() {}
-
-  virtual void ShowSignInError(int login_attempts,
-                               const std::string& error_text,
-                               const std::string& help_link_text,
-                               HelpAppLauncher::HelpTopic help_topic_id) = 0;
-  virtual void ShowTpmError() = 0;
-  virtual void ShowSignInUI(const std::string& email) = 0;
-  virtual void ResetSignInUI(bool force_online) = 0;
-  virtual void ClearUserPodPassword() = 0;
-  virtual void RefocusCurrentPod() = 0;
-  virtual void ShowPasswordChangedScreen(bool show_password_error,
-                                         const std::string& email) = 0;
-  virtual void SetUsageStats(bool checked) = 0;
-  virtual void SetOemEulaUrl(const std::string& oem_eula_url) = 0;
-  virtual void SetTpmPassword(const std::string& tmp_password) = 0;
-  virtual void ClearErrors() = 0;
-  virtual void ReloadContent(const base::DictionaryValue& dictionary) = 0;
-  virtual void ShowControlBar(bool show) = 0;
-  virtual void ShowPinKeyboard(bool show) = 0;
-  virtual void SetClientAreaSize(int width, int height) = 0;
-  virtual void ShowDeviceResetScreen() = 0;
-  virtual void ShowEnableDebuggingScreen() = 0;
-  virtual void InitDemoModeDetection() = 0;
-  virtual void StopDemoModeDetection() = 0;
-  virtual void UpdateKeyboardState() = 0;
-  virtual void ShowActiveDirectoryPasswordChangeScreen(
-      const std::string& username) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/core_oobe_view.h b/chrome/browser/chromeos/login/screens/core_oobe_view.h
new file mode 100644
index 0000000..4b5a0f9
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/core_oobe_view.h

@@ -0,0 +1,52 @@
+// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_VIEW_H_
+
+#include <string>
+
+#include "chrome/browser/chromeos/login/help_app_launcher.h"
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace chromeos {
+
+class CoreOobeView {
+ public:
+  virtual ~CoreOobeView() {}
+
+  virtual void ShowSignInError(int login_attempts,
+                               const std::string& error_text,
+                               const std::string& help_link_text,
+                               HelpAppLauncher::HelpTopic help_topic_id) = 0;
+  virtual void ShowTpmError() = 0;
+  virtual void ShowSignInUI(const std::string& email) = 0;
+  virtual void ResetSignInUI(bool force_online) = 0;
+  virtual void ClearUserPodPassword() = 0;
+  virtual void RefocusCurrentPod() = 0;
+  virtual void ShowPasswordChangedScreen(bool show_password_error,
+                                         const std::string& email) = 0;
+  virtual void SetUsageStats(bool checked) = 0;
+  virtual void SetOemEulaUrl(const std::string& oem_eula_url) = 0;
+  virtual void SetTpmPassword(const std::string& tmp_password) = 0;
+  virtual void ClearErrors() = 0;
+  virtual void ReloadContent(const base::DictionaryValue& dictionary) = 0;
+  virtual void ShowControlBar(bool show) = 0;
+  virtual void ShowPinKeyboard(bool show) = 0;
+  virtual void SetClientAreaSize(int width, int height) = 0;
+  virtual void ShowDeviceResetScreen() = 0;
+  virtual void ShowEnableDebuggingScreen() = 0;
+  virtual void InitDemoModeDetection() = 0;
+  virtual void StopDemoModeDetection() = 0;
+  virtual void UpdateKeyboardState() = 0;
+  virtual void ShowActiveDirectoryPasswordChangeScreen(
+      const std::string& username) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_CORE_OOBE_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
index 5bf41c5..66d644c 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.cc
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.cc

@@ -15,30 +15,30 @@
 
 DeviceDisabledScreen::DeviceDisabledScreen(
     BaseScreenDelegate* base_screen_delegate,
-    DeviceDisabledScreenActor* actor)
+    DeviceDisabledScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_DEVICE_DISABLED),
-      actor_(actor),
+      view_(view),
       device_disabling_manager_(
           g_browser_process->platform_part()->device_disabling_manager()),
       showing_(false) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
   device_disabling_manager_->AddObserver(this);
 }
 
 DeviceDisabledScreen::~DeviceDisabledScreen() {
-  if (actor_)
-    actor_->SetDelegate(nullptr);
+  if (view_)
+    view_->SetDelegate(nullptr);
   device_disabling_manager_->RemoveObserver(this);
 }
 
 void DeviceDisabledScreen::Show() {
-  if (!actor_ || showing_)
+  if (!view_ || showing_)
     return;
 
   showing_ = true;
-  actor_->Show();
+  view_->Show();
 }
 
 void DeviceDisabledScreen::Hide() {
@@ -46,13 +46,13 @@
     return;
   showing_ = false;
 
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
-void DeviceDisabledScreen::OnActorDestroyed(DeviceDisabledScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = nullptr;
+void DeviceDisabledScreen::OnViewDestroyed(DeviceDisabledScreenView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 const std::string& DeviceDisabledScreen::GetEnrollmentDomain() const {
@@ -65,8 +65,8 @@
 
 void DeviceDisabledScreen::OnDisabledMessageChanged(
     const std::string& disabled_message) {
-  if (actor_)
-    actor_->UpdateMessage(disabled_message);
+  if (view_)
+    view_->UpdateMessage(disabled_message);
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen.h b/chrome/browser/chromeos/login/screens/device_disabled_screen.h
index 6aff9bb..586dbb7 100644
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen.h
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/device_disabled_screen_view.h"
 #include "chrome/browser/chromeos/system/device_disabling_manager.h"
 
 namespace chromeos {
@@ -20,19 +20,19 @@
 
 // Screen informing the user that the device has been disabled by its owner.
 class DeviceDisabledScreen : public BaseScreen,
-                             public DeviceDisabledScreenActor::Delegate,
+                             public DeviceDisabledScreenView::Delegate,
                              public system::DeviceDisablingManager::Observer {
  public:
   DeviceDisabledScreen(BaseScreenDelegate* base_screen_delegate,
-                       DeviceDisabledScreenActor* actor);
+                       DeviceDisabledScreenView* view);
   ~DeviceDisabledScreen() override;
 
   // BaseScreen:
   void Show() override;
   void Hide() override;
 
-  // DeviceDisabledScreenActor::Delegate:
-  void OnActorDestroyed(DeviceDisabledScreenActor* actor) override;
+  // DeviceDisabledScreenView::Delegate:
+  void OnViewDestroyed(DeviceDisabledScreenView* view) override;
   const std::string& GetEnrollmentDomain() const override;
   const std::string& GetMessage() const override;
 
@@ -40,7 +40,7 @@
   void OnDisabledMessageChanged(const std::string& disabled_message) override;
 
  private:
-  DeviceDisabledScreenActor* actor_;
+  DeviceDisabledScreenView* view_;
   system::DeviceDisablingManager* device_disabling_manager_;
 
   // Whether the screen is currently showing.

diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h b/chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h
deleted file mode 100644
index 7fdcc7d..0000000
--- a/chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h
+++ /dev/null

@@ -1,44 +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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface between the device disabled screen and its representation.
-class DeviceDisabledScreenActor {
- public:
-  // Allows the representation to access information about the screen.
-  class Delegate {
-   public:
-    virtual ~Delegate() {
-    }
-
-    // Called when the actor is being destroyed. Note that if the Delegate is
-    // destroyed first, it must call SetDelegate(nullptr).
-    virtual void OnActorDestroyed(DeviceDisabledScreenActor* actor) = 0;
-
-    // Returns the domain that owns the device.
-    virtual const std::string& GetEnrollmentDomain() const = 0;
-
-    // Returns the message that should be shown to the user.
-    virtual const std::string& GetMessage() const = 0;
-  };
-
-  virtual ~DeviceDisabledScreenActor() {
-  }
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-  virtual void UpdateMessage(const std::string& message) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_ACTOR_H_
-

diff --git a/chrome/browser/chromeos/login/screens/device_disabled_screen_view.h b/chrome/browser/chromeos/login/screens/device_disabled_screen_view.h
new file mode 100644
index 0000000..bd063d7
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/device_disabled_screen_view.h

@@ -0,0 +1,41 @@
+// 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface between the device disabled screen and its representation.
+class DeviceDisabledScreenView {
+ public:
+  // Allows the representation to access information about the screen.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when the view is being destroyed. Note that if the Delegate is
+    // destroyed first, it must call SetDelegate(nullptr).
+    virtual void OnViewDestroyed(DeviceDisabledScreenView* view) = 0;
+
+    // Returns the domain that owns the device.
+    virtual const std::string& GetEnrollmentDomain() const = 0;
+
+    // Returns the message that should be shown to the user.
+    virtual const std::string& GetMessage() const = 0;
+  };
+
+  virtual ~DeviceDisabledScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+  virtual void UpdateMessage(const std::string& message) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_DEVICE_DISABLED_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc b/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
index 1cf93ee8..0bd6517 100644
--- a/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc
+++ b/chrome/browser/chromeos/login/screens/enable_debugging_screen.cc

@@ -11,27 +11,27 @@
 namespace chromeos {
 
 EnableDebuggingScreen::EnableDebuggingScreen(BaseScreenDelegate* delegate,
-                                             EnableDebuggingScreenActor* actor)
+                                             EnableDebuggingScreenView* view)
     : BaseScreen(delegate, OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 EnableDebuggingScreen::~EnableDebuggingScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void EnableDebuggingScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
 }
 
 void EnableDebuggingScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void EnableDebuggingScreen::OnExit(bool success) {
@@ -39,10 +39,9 @@
                    BaseScreenDelegate::ENABLE_DEBUGGING_CANCELED);
 }
 
-void EnableDebuggingScreen::OnActorDestroyed(
-    EnableDebuggingScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void EnableDebuggingScreen::OnViewDestroyed(EnableDebuggingScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen.h b/chrome/browser/chromeos/login/screens/enable_debugging_screen.h
index 36db96b1..d08f6e2 100644
--- a/chrome/browser/chromeos/login/screens/enable_debugging_screen.h
+++ b/chrome/browser/chromeos/login/screens/enable_debugging_screen.h

@@ -9,17 +9,17 @@
 
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h"
 
 namespace chromeos {
 
 // Representation independent class that controls screen showing enable
 // debugging screen to users.
 class EnableDebuggingScreen : public BaseScreen,
-                              public EnableDebuggingScreenActor::Delegate {
+                              public EnableDebuggingScreenView::Delegate {
  public:
   EnableDebuggingScreen(BaseScreenDelegate* delegate,
-                        EnableDebuggingScreenActor* actor);
+                        EnableDebuggingScreenView* view);
   ~EnableDebuggingScreen() override;
 
   // BaseScreen implementation:
@@ -28,10 +28,10 @@
 
   // EnableDebuggingScreenActor::Delegate implementation:
   void OnExit(bool success) override;
-  void OnActorDestroyed(EnableDebuggingScreenActor* actor) override;
+  void OnViewDestroyed(EnableDebuggingScreenView* view) override;
 
  private:
-  EnableDebuggingScreenActor* actor_;
+  EnableDebuggingScreenView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(EnableDebuggingScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h b/chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h
deleted file mode 100644
index 66a1d99a..0000000
--- a/chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h
+++ /dev/null

@@ -1,38 +0,0 @@
-// Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface between enable debugging screen and its representation.
-// Note, do not forget to call OnActorDestroyed in the dtor.
-class EnableDebuggingScreenActor {
- public:
-  // Allows us to get info from reset screen that we need.
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // Called when screen is exited.
-    virtual void OnExit(bool success) = 0;
-
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(EnableDebuggingScreenActor* actor) = 0;
-  };
-
-  virtual ~EnableDebuggingScreenActor() {}
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h b/chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h
new file mode 100644
index 0000000..664fbae
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h

@@ -0,0 +1,38 @@
+// Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface between enable debugging screen and its representation.
+// Note, do not forget to call OnViewDestroyed in the dtor.
+class EnableDebuggingScreenView {
+ public:
+  // Allows us to get info from reset screen that we need.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when screen is exited.
+    virtual void OnExit(bool success) = 0;
+
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(nullptr).
+    virtual void OnViewDestroyed(EnableDebuggingScreenView* view) = 0;
+  };
+
+  virtual ~EnableDebuggingScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ENABLE_DEBUGGING_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/eula_screen.h b/chrome/browser/chromeos/login/screens/eula_screen.h
index 4c03ebc..c7423d1 100644
--- a/chrome/browser/chromeos/login/screens/eula_screen.h
+++ b/chrome/browser/chromeos/login/screens/eula_screen.h

@@ -41,7 +41,7 @@
   // locale and manifest. Returns empty URL otherwise.
   GURL GetOemEulaUrl() const;
 
-  // Initiate TPM password fetch. Will call actor's OnPasswordFetched() when
+  // Initiate TPM password fetch. Will call view's OnPasswordFetched() when
   // done.
   void InitiatePasswordFetch();
 

diff --git a/chrome/browser/chromeos/login/screens/gaia_screen.cc b/chrome/browser/chromeos/login/screens/gaia_screen.cc
index 4b138af..bcf90de 100644
--- a/chrome/browser/chromeos/login/screens/gaia_screen.cc
+++ b/chrome/browser/chromeos/login/screens/gaia_screen.cc

@@ -4,28 +4,12 @@
 
 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 
-#include "base/logging.h"
-#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
-#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
+#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 
 namespace chromeos {
 
-GaiaScreen::GaiaScreen() : legacy_handler_(NULL), screen_handler_(NULL) {
-}
-
-GaiaScreen::~GaiaScreen() {
-}
-
-void GaiaScreen::SetLegacyHandler(LoginDisplayWebUIHandler* handler) {
-  legacy_handler_ = handler;
-}
-
-void GaiaScreen::SetScreenHandler(GaiaScreenHandler* handler) {
-  screen_handler_ = handler;
-}
-
 void GaiaScreen::MaybePreloadAuthExtension() {
-  screen_handler_->MaybePreloadAuthExtension();
+  view_->MaybePreloadAuthExtension();
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/gaia_screen.h b/chrome/browser/chromeos/login/screens/gaia_screen.h
index f19671190..680af80 100644
--- a/chrome/browser/chromeos/login/screens/gaia_screen.h
+++ b/chrome/browser/chromeos/login/screens/gaia_screen.h

@@ -13,22 +13,21 @@
 
 namespace chromeos {
 
-class LoginDisplayWebUIHandler;
-class GaiaScreenHandler;
+class GaiaView;
 
 // This class represents GAIA screen: login screen that is responsible for
 // GAIA-based sign-in.
 class GaiaScreen {
  public:
-  GaiaScreen();
-  virtual ~GaiaScreen();
-  void SetLegacyHandler(LoginDisplayWebUIHandler* handler);
-  void SetScreenHandler(GaiaScreenHandler* handler);
+  GaiaScreen() = default;
+  virtual ~GaiaScreen() = default;
+
+  void set_view(GaiaView* view) { view_ = view; }
+
   void MaybePreloadAuthExtension();
 
  private:
-  LoginDisplayWebUIHandler* legacy_handler_;
-  GaiaScreenHandler* screen_handler_;
+  GaiaView* view_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/gaia_view.h b/chrome/browser/chromeos/login/screens/gaia_view.h
new file mode 100644
index 0000000..04af20e
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/gaia_view.h

@@ -0,0 +1,33 @@
+// Copyright 2017 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_
+
+#include <string>
+
+#include "base/bind.h"
+#include "base/compiler_specific.h"
+#include "base/macros.h"
+
+namespace chromeos {
+
+class GaiaView {
+ public:
+  GaiaView() = default;
+  virtual ~GaiaView() = default;
+
+  // Decides whether an auth extension should be pre-loaded. If it should,
+  // pre-loads it.
+  virtual void MaybePreloadAuthExtension() = 0;
+
+  virtual void DisableRestrictiveProxyCheckForTest() = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(GaiaView);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_GAIA_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index 1dbc73a..4a14f7c 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc

@@ -20,20 +20,20 @@
 HostPairingScreen::HostPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
-    HostPairingScreenActor* actor,
+    HostPairingScreenView* view,
     pairing_chromeos::HostPairingController* remora_controller)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_HOST_PAIRING),
       delegate_(delegate),
-      actor_(actor),
+      view_(view),
       remora_controller_(remora_controller),
       weak_ptr_factory_(this) {
-  actor_->SetDelegate(this);
+  view_->SetDelegate(this);
   remora_controller_->AddObserver(this);
 }
 
 HostPairingScreen::~HostPairingScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
   remora_controller_->RemoveObserver(this);
 }
 
@@ -42,19 +42,19 @@
     return;
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
-  if (actor_)
-    actor_->OnContextChanged(diff);
+  if (view_)
+    view_->OnContextChanged(diff);
 }
 
 void HostPairingScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
   PairingStageChanged(remora_controller_->GetCurrentStage());
 }
 
 void HostPairingScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void HostPairingScreen::PairingStageChanged(Stage new_stage) {
@@ -151,9 +151,9 @@
       HostPairingController::ENROLLMENT_STATUS_ENROLLING);
 }
 
-void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void HostPairingScreen::OnViewDestroyed(HostPairingScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 void HostPairingScreen::OnAuthError(const GoogleServiceAuthError& error) {

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.h b/chrome/browser/chromeos/login/screens/host_pairing_screen.h
index 87e786c..996efcc 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/host_pairing_screen_view.h"
 #include "components/login/screens/screen_context.h"
 #include "components/pairing/host_pairing_controller.h"
 
@@ -17,7 +17,7 @@
 class HostPairingScreen
     : public BaseScreen,
       public pairing_chromeos::HostPairingController::Observer,
-      public HostPairingScreenActor::Delegate,
+      public HostPairingScreenView::Delegate,
       public EnterpriseEnrollmentHelper::EnrollmentStatusConsumer {
  public:
   class Delegate {
@@ -39,7 +39,7 @@
 
   HostPairingScreen(BaseScreenDelegate* base_screen_delegate,
                     Delegate* delegate,
-                    HostPairingScreenActor* actor,
+                    HostPairingScreenView* view,
                     pairing_chromeos::HostPairingController* remora_controller);
   ~HostPairingScreen() override;
 
@@ -63,7 +63,7 @@
   void EnrollHostRequested(const std::string& auth_token) override;
 
   // Overridden from ControllerPairingView::Delegate:
-  void OnActorDestroyed(HostPairingScreenActor* actor) override;
+  void OnViewDestroyed(HostPairingScreenView* view) override;
 
   // Overridden from EnterpriseEnrollmentHelper::EnrollmentStatusConsumer:
   void OnAuthError(const GoogleServiceAuthError& error) override;
@@ -79,7 +79,7 @@
 
   Delegate* delegate_ = nullptr;
 
-  HostPairingScreenActor* actor_ = nullptr;
+  HostPairingScreenView* view_ = nullptr;
 
   // Controller performing pairing. Owned by the wizard controller.
   pairing_chromeos::HostPairingController* remora_controller_ = nullptr;

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.cc
deleted file mode 100644
index 00b7ac4..0000000
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.cc
+++ /dev/null

@@ -1,39 +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 "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
-
-namespace chromeos {
-
-namespace host_pairing {
-
-// Keep these constants synced with corresponding constants defined in
-// oobe_screen_host_pairing.js.
-const char kContextKeyPage[] = "page";
-const char kContextKeyDeviceName[] = "deviceName";
-const char kContextKeyConfirmationCode[] = "code";
-const char kContextKeyEnrollmentDomain[] = "enrollmentDomain";
-const char kContextKeyUpdateProgress[] = "updateProgress";
-
-const char kPageWelcome[] = "welcome";
-const char kPageIntializationError[] = "initialization-error";
-const char kPageCodeConfirmation[] = "code-confirmation";
-const char kPageConnectionError[] = "connection-error";
-const char kPageSetupBasicConfiguration[] = "setup-basic-configuration";
-const char kPageSetupNetworkError[] = "setup-network-error";
-const char kPageUpdate[] = "update";
-const char kPageEnrollmentIntroduction[] = "enrollment-introduction";
-const char kPageEnrollment[] = "enrollment";
-const char kPageEnrollmentError[] = "enrollment-error";
-const char kPagePairingDone[] = "pairing-done";
-
-}  // namespace host_pairing
-
-HostPairingScreenActor::HostPairingScreenActor() {
-}
-
-HostPairingScreenActor::~HostPairingScreenActor() {
-}
-
-}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h b/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h
deleted file mode 100644
index b6d86f84..0000000
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h
+++ /dev/null

@@ -1,64 +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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_ACTOR_H_
-
-#include "base/macros.h"
-
-namespace base {
-class DictionaryValue;
-}
-
-namespace chromeos {
-
-namespace host_pairing {
-
-// Keep these constants synced with corresponding constants defined in
-// oobe_screen_host_pairing.js.
-// Conxtext keys.
-extern const char kContextKeyPage[];
-extern const char kContextKeyDeviceName[];
-extern const char kContextKeyConfirmationCode[];
-extern const char kContextKeyEnrollmentDomain[];
-extern const char kContextKeyUpdateProgress[];
-
-// Pages names.
-extern const char kPageWelcome[];
-extern const char kPageIntializationError[];
-extern const char kPageCodeConfirmation[];
-extern const char kPageConnectionError[];
-extern const char kPageSetupBasicConfiguration[];
-extern const char kPageSetupNetworkError[];
-extern const char kPageUpdate[];
-extern const char kPageEnrollmentIntroduction[];
-extern const char kPageEnrollment[];
-extern const char kPageEnrollmentError[];
-extern const char kPagePairingDone[];
-
-}  // namespace host_pairing
-
-class HostPairingScreenActor {
- public:
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-    virtual void OnActorDestroyed(HostPairingScreenActor* actor) = 0;
-  };
-
-  HostPairingScreenActor();
-  virtual ~HostPairingScreenActor();
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-  virtual void OnContextChanged(const base::DictionaryValue& diff) = 0;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(HostPairingScreenActor);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen_view.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen_view.cc
new file mode 100644
index 0000000..daed366
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen_view.cc

@@ -0,0 +1,37 @@
+// 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 "chrome/browser/chromeos/login/screens/host_pairing_screen_view.h"
+
+namespace chromeos {
+
+namespace host_pairing {
+
+// Keep these constants synced with corresponding constants defined in
+// oobe_screen_host_pairing.js.
+const char kContextKeyPage[] = "page";
+const char kContextKeyDeviceName[] = "deviceName";
+const char kContextKeyConfirmationCode[] = "code";
+const char kContextKeyEnrollmentDomain[] = "enrollmentDomain";
+const char kContextKeyUpdateProgress[] = "updateProgress";
+
+const char kPageWelcome[] = "welcome";
+const char kPageIntializationError[] = "initialization-error";
+const char kPageCodeConfirmation[] = "code-confirmation";
+const char kPageConnectionError[] = "connection-error";
+const char kPageSetupBasicConfiguration[] = "setup-basic-configuration";
+const char kPageSetupNetworkError[] = "setup-network-error";
+const char kPageUpdate[] = "update";
+const char kPageEnrollmentIntroduction[] = "enrollment-introduction";
+const char kPageEnrollment[] = "enrollment";
+const char kPageEnrollmentError[] = "enrollment-error";
+const char kPagePairingDone[] = "pairing-done";
+
+}  // namespace host_pairing
+
+HostPairingScreenView::HostPairingScreenView() {}
+
+HostPairingScreenView::~HostPairingScreenView() {}
+
+}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen_view.h b/chrome/browser/chromeos/login/screens/host_pairing_screen_view.h
new file mode 100644
index 0000000..64ded65
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen_view.h

@@ -0,0 +1,64 @@
+// 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_VIEW_H_
+
+#include "base/macros.h"
+
+namespace base {
+class DictionaryValue;
+}
+
+namespace chromeos {
+
+namespace host_pairing {
+
+// Keep these constants synced with corresponding constants defined in
+// oobe_screen_host_pairing.js.
+// Conxtext keys.
+extern const char kContextKeyPage[];
+extern const char kContextKeyDeviceName[];
+extern const char kContextKeyConfirmationCode[];
+extern const char kContextKeyEnrollmentDomain[];
+extern const char kContextKeyUpdateProgress[];
+
+// Pages names.
+extern const char kPageWelcome[];
+extern const char kPageIntializationError[];
+extern const char kPageCodeConfirmation[];
+extern const char kPageConnectionError[];
+extern const char kPageSetupBasicConfiguration[];
+extern const char kPageSetupNetworkError[];
+extern const char kPageUpdate[];
+extern const char kPageEnrollmentIntroduction[];
+extern const char kPageEnrollment[];
+extern const char kPageEnrollmentError[];
+extern const char kPagePairingDone[];
+
+}  // namespace host_pairing
+
+class HostPairingScreenView {
+ public:
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+    virtual void OnViewDestroyed(HostPairingScreenView* view) = 0;
+  };
+
+  HostPairingScreenView();
+  virtual ~HostPairingScreenView();
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+  virtual void OnContextChanged(const base::DictionaryValue& diff) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(HostPairingScreenView);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_HOST_PAIRING_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
index 2b78f71a..52c1f32 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc
+++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.cc

@@ -13,22 +13,22 @@
 
 KioskAutolaunchScreen::KioskAutolaunchScreen(
     BaseScreenDelegate* base_screen_delegate,
-    KioskAutolaunchScreenActor* actor)
+    KioskAutolaunchScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_KIOSK_AUTOLAUNCH),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 KioskAutolaunchScreen::~KioskAutolaunchScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void KioskAutolaunchScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
 }
 
 void KioskAutolaunchScreen::OnExit(bool confirmed) {
@@ -36,10 +36,9 @@
                    : BaseScreenDelegate::KIOSK_AUTOLAUNCH_CANCELED);
 }
 
-void KioskAutolaunchScreen::OnActorDestroyed(
-    KioskAutolaunchScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void KioskAutolaunchScreen::OnViewDestroyed(KioskAutolaunchScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h
index 5a22e59..bcba0aa6 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h
+++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h

@@ -10,17 +10,17 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_view.h"
 
 namespace chromeos {
 
 // Representation independent class that controls screen showing auto launch
 // warning to users.
 class KioskAutolaunchScreen : public BaseScreen,
-                              public KioskAutolaunchScreenActor::Delegate {
+                              public KioskAutolaunchScreenView::Delegate {
  public:
   KioskAutolaunchScreen(BaseScreenDelegate* base_screen_delegate,
-                        KioskAutolaunchScreenActor* actor);
+                        KioskAutolaunchScreenView* view);
   ~KioskAutolaunchScreen() override;
 
   // BaseScreen implementation:
@@ -29,10 +29,10 @@
 
   // KioskAutolaunchScreenActor::Delegate implementation:
   void OnExit(bool confirmed) override;
-  void OnActorDestroyed(KioskAutolaunchScreenActor* actor) override;
+  void OnViewDestroyed(KioskAutolaunchScreenView* view) override;
 
  private:
-  KioskAutolaunchScreenActor* actor_;
+  KioskAutolaunchScreenView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAutolaunchScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h
deleted file mode 100644
index 7a70760..0000000
--- a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h
+++ /dev/null

@@ -1,37 +0,0 @@
-// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface between reset screen and its representation.
-// Note, do not forget to call OnActorDestroyed in the dtor.
-class KioskAutolaunchScreenActor {
- public:
-  // Allows us to get info from reset screen that we need.
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // Called when screen is exited.
-    virtual void OnExit(bool confirmed) = 0;
-
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(KioskAutolaunchScreenActor* actor) = 0;
-  };
-
-  virtual ~KioskAutolaunchScreenActor() {}
-
-  virtual void Show() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_view.h b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_view.h
new file mode 100644
index 0000000..c45487d
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_view.h

@@ -0,0 +1,37 @@
+// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface between reset screen and its representation.
+// Note, do not forget to call OnViewDestroyed in the dtor.
+class KioskAutolaunchScreenView {
+ public:
+  // Allows us to get info from reset screen that we need.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when screen is exited.
+    virtual void OnExit(bool confirmed) = 0;
+
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(nullptr).
+    virtual void OnViewDestroyed(KioskAutolaunchScreenView* view) = 0;
+  };
+
+  virtual ~KioskAutolaunchScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_AUTOLAUNCH_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
index 0b6c965..f6434ab8 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc
+++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.cc

@@ -12,31 +12,31 @@
 namespace chromeos {
 
 KioskEnableScreen::KioskEnableScreen(BaseScreenDelegate* base_screen_delegate,
-                                     KioskEnableScreenActor* actor)
+                                     KioskEnableScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_KIOSK_ENABLE),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 KioskEnableScreen::~KioskEnableScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void KioskEnableScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
 }
 
 void KioskEnableScreen::OnExit() {
   Finish(BaseScreenDelegate::KIOSK_ENABLE_COMPLETED);
 }
 
-void KioskEnableScreen::OnActorDestroyed(KioskEnableScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void KioskEnableScreen::OnViewDestroyed(KioskEnableScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h
index e5edae3..f2b101cf 100644
--- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h
+++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen.h

@@ -10,17 +10,17 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_view.h"
 
 namespace chromeos {
 
 // Representation independent class that controls screen for enabling
 // consumer kiosk mode.
 class KioskEnableScreen : public BaseScreen,
-                          public KioskEnableScreenActor::Delegate {
+                          public KioskEnableScreenView::Delegate {
  public:
   KioskEnableScreen(BaseScreenDelegate* base_screen_delegate,
-                    KioskEnableScreenActor* actor);
+                    KioskEnableScreenView* view);
   ~KioskEnableScreen() override;
 
   // BaseScreen implementation:
@@ -29,10 +29,10 @@
 
   // KioskEnableScreenActor::Delegate implementation:
   void OnExit() override;
-  void OnActorDestroyed(KioskEnableScreenActor* actor) override;
+  void OnViewDestroyed(KioskEnableScreenView* view) override;
 
  private:
-  KioskEnableScreenActor* actor_;
+  KioskEnableScreenView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskEnableScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h b/chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h
deleted file mode 100644
index 727d1e38..0000000
--- a/chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h
+++ /dev/null

@@ -1,37 +0,0 @@
-// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface between enable kiosk screen and its representation.
-// Note, do not forget to call OnActorDestroyed in the dtor.
-class KioskEnableScreenActor {
- public:
-  // Allows us to get info from reset screen that we need.
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // Called when screen is exited.
-    virtual void OnExit() = 0;
-
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(KioskEnableScreenActor* actor) = 0;
-  };
-
-  virtual ~KioskEnableScreenActor() {}
-
-  virtual void Show() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/kiosk_enable_screen_view.h b/chrome/browser/chromeos/login/screens/kiosk_enable_screen_view.h
new file mode 100644
index 0000000..f4304dd
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/kiosk_enable_screen_view.h

@@ -0,0 +1,37 @@
+// Copyright 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface between enable kiosk screen and its representation.
+// Note, do not forget to call OnViewDestroyed in the dtor.
+class KioskEnableScreenView {
+ public:
+  // Allows us to get info from reset screen that we need.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when screen is exited.
+    virtual void OnExit() = 0;
+
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(nullptr).
+    virtual void OnViewDestroyed(KioskEnableScreenView* view) = 0;
+  };
+
+  virtual ~KioskEnableScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.cc b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.cc
deleted file mode 100644
index f852b948..0000000
--- a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.cc
+++ /dev/null

@@ -1,29 +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 "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h"
-
-using ::testing::AtLeast;
-using ::testing::AtMost;
-using ::testing::NotNull;
-
-namespace chromeos {
-
-MockDeviceDisabledScreenActor::MockDeviceDisabledScreenActor()
-    : delegate_(nullptr) {
-  EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
-  EXPECT_CALL(*this, MockSetDelegate(nullptr)).Times(AtMost(1));
-}
-
-MockDeviceDisabledScreenActor::~MockDeviceDisabledScreenActor() {
-  if (delegate_)
-    delegate_->OnActorDestroyed(this);
-}
-
-void MockDeviceDisabledScreenActor::SetDelegate(Delegate* delegate) {
-  delegate_ = delegate;
-  MockSetDelegate(delegate);
-}
-
-}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h
deleted file mode 100644
index e124e06..0000000
--- a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h
+++ /dev/null

@@ -1,32 +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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_ACTOR_H_
-
-#include "chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h"
-#include "testing/gmock/include/gmock/gmock.h"
-
-namespace chromeos {
-
-class MockDeviceDisabledScreenActor : public DeviceDisabledScreenActor {
- public:
-  MockDeviceDisabledScreenActor();
-  ~MockDeviceDisabledScreenActor() override;
-
-  void SetDelegate(Delegate* delegate) override;
-
-  MOCK_METHOD0(Show, void());
-  MOCK_METHOD0(Hide, void());
-  MOCK_METHOD1(UpdateMessage, void(const std::string& message));
-
- private:
-  MOCK_METHOD1(MockSetDelegate, void(Delegate* delegate));
-
-  Delegate* delegate_;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.cc b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.cc
new file mode 100644
index 0000000..118334b
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.cc

@@ -0,0 +1,29 @@
+// 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 "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h"
+
+using ::testing::AtLeast;
+using ::testing::AtMost;
+using ::testing::NotNull;
+
+namespace chromeos {
+
+MockDeviceDisabledScreenView::MockDeviceDisabledScreenView()
+    : delegate_(nullptr) {
+  EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
+  EXPECT_CALL(*this, MockSetDelegate(nullptr)).Times(AtMost(1));
+}
+
+MockDeviceDisabledScreenView::~MockDeviceDisabledScreenView() {
+  if (delegate_)
+    delegate_->OnViewDestroyed(this);
+}
+
+void MockDeviceDisabledScreenView::SetDelegate(Delegate* delegate) {
+  delegate_ = delegate;
+  MockSetDelegate(delegate);
+}
+
+}  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h
new file mode 100644
index 0000000..50c73180
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h

@@ -0,0 +1,32 @@
+// 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_VIEW_H_
+
+#include "chrome/browser/chromeos/login/screens/device_disabled_screen_view.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+namespace chromeos {
+
+class MockDeviceDisabledScreenView : public DeviceDisabledScreenView {
+ public:
+  MockDeviceDisabledScreenView();
+  ~MockDeviceDisabledScreenView() override;
+
+  void SetDelegate(Delegate* delegate) override;
+
+  MOCK_METHOD0(Show, void());
+  MOCK_METHOD0(Hide, void());
+  MOCK_METHOD1(UpdateMessage, void(const std::string& message));
+
+ private:
+  MOCK_METHOD1(MockSetDelegate, void(Delegate* delegate));
+
+  Delegate* delegate_;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_DEVICE_DISABLED_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.cc b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.cc
index a6a5ad4..179d550 100644
--- a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.cc
+++ b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.cc

@@ -11,24 +11,23 @@
 
 MockEnableDebuggingScreen::MockEnableDebuggingScreen(
     BaseScreenDelegate* base_screen_delegate,
-    EnableDebuggingScreenActor* actor)
-    : EnableDebuggingScreen(base_screen_delegate, actor) {
-}
+    EnableDebuggingScreenView* view)
+    : EnableDebuggingScreen(base_screen_delegate, view) {}
 
 MockEnableDebuggingScreen::~MockEnableDebuggingScreen() {
 }
 
-MockEnableDebuggingScreenActor::MockEnableDebuggingScreenActor() {
+MockEnableDebuggingScreenView::MockEnableDebuggingScreenView() {
   EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
 }
 
-MockEnableDebuggingScreenActor::~MockEnableDebuggingScreenActor() {
+MockEnableDebuggingScreenView::~MockEnableDebuggingScreenView() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
-void MockEnableDebuggingScreenActor::SetDelegate(
-    EnableDebuggingScreenActor::Delegate* delegate) {
+void MockEnableDebuggingScreenView::SetDelegate(
+    EnableDebuggingScreenView::Delegate* delegate) {
   delegate_ = delegate;
   MockSetDelegate(delegate);
 }

diff --git a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h
index 27076dc..862b59a 100644
--- a/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_ENABLE_DEBUGGING_SCREEN_H_
 
 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
-#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -15,21 +15,20 @@
 class MockEnableDebuggingScreen : public EnableDebuggingScreen {
  public:
   MockEnableDebuggingScreen(BaseScreenDelegate* base_screen_delegate,
-                            EnableDebuggingScreenActor* actor);
+                            EnableDebuggingScreenView* view);
   ~MockEnableDebuggingScreen() override;
 };
 
-class MockEnableDebuggingScreenActor
-    : public EnableDebuggingScreenActor {
+class MockEnableDebuggingScreenView : public EnableDebuggingScreenView {
  public:
-  MockEnableDebuggingScreenActor();
-  ~MockEnableDebuggingScreenActor() override;
+  MockEnableDebuggingScreenView();
+  ~MockEnableDebuggingScreenView() override;
 
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
   MOCK_METHOD1(MockSetDelegate, void(Delegate* delegate));
 
-  void SetDelegate(EnableDebuggingScreenActor::Delegate* delegate) override;
+  void SetDelegate(EnableDebuggingScreenView::Delegate* delegate) override;
 
  private:
   Delegate* delegate_;

diff --git a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc
index 7a2c938..1982bf5 100644
--- a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc
+++ b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.cc

@@ -11,23 +11,22 @@
 
 MockWrongHWIDScreen::MockWrongHWIDScreen(
     BaseScreenDelegate* base_screen_delegate,
-    WrongHWIDScreenActor* actor)
-    : WrongHWIDScreen(base_screen_delegate, actor) {
-}
+    WrongHWIDScreenView* view)
+    : WrongHWIDScreen(base_screen_delegate, view) {}
 
 MockWrongHWIDScreen::~MockWrongHWIDScreen() {
 }
 
-MockWrongHWIDScreenActor::MockWrongHWIDScreenActor() : delegate_(nullptr) {
+MockWrongHWIDScreenView::MockWrongHWIDScreenView() : delegate_(nullptr) {
   EXPECT_CALL(*this, MockSetDelegate(NotNull())).Times(AtLeast(1));
 }
 
-MockWrongHWIDScreenActor::~MockWrongHWIDScreenActor() {
+MockWrongHWIDScreenView::~MockWrongHWIDScreenView() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
-void MockWrongHWIDScreenActor::SetDelegate(Delegate* delegate) {
+void MockWrongHWIDScreenView::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
   MockSetDelegate(delegate);
 }

diff --git a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h
index dfa180f..66dd49c 100644
--- a/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h
+++ b/chrome/browser/chromeos/login/screens/mock_wrong_hwid_screen.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_MOCK_WRONG_HWID_SCREEN_H_
 
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
-#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -16,14 +16,14 @@
 class MockWrongHWIDScreen : public WrongHWIDScreen {
  public:
   MockWrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
-                      WrongHWIDScreenActor* actor);
+                      WrongHWIDScreenView* view);
   ~MockWrongHWIDScreen() override;
 };
 
-class MockWrongHWIDScreenActor : public WrongHWIDScreenActor {
+class MockWrongHWIDScreenView : public WrongHWIDScreenView {
  public:
-  MockWrongHWIDScreenActor();
-  ~MockWrongHWIDScreenActor() override;
+  MockWrongHWIDScreenView();
+  ~MockWrongHWIDScreenView() override;
 
   void SetDelegate(Delegate* delegate) override;
 

diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
index 163cc7d..3d5ea73e0 100644
--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

@@ -121,39 +121,39 @@
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, CanConnect) {
   EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
       .WillOnce((Return(true)));
-  // EXPECT_FALSE(actor_->IsContinueEnabled());
+  // EXPECT_FALSE(view_->IsContinueEnabled());
   network_screen_->UpdateStatus();
 
   EXPECT_CALL(*mock_network_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(true));
-  // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
-  // EXPECT_FALSE(actor_->IsContinueEnabled());
-  // EXPECT_FALSE(actor_->IsConnecting());
+  // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
+  // EXPECT_FALSE(view_->IsContinueEnabled());
+  // EXPECT_FALSE(view_->IsConnecting());
   network_screen_->UpdateStatus();
 
-  // EXPECT_TRUE(actor_->IsContinueEnabled());
+  // EXPECT_TRUE(view_->IsContinueEnabled());
   EmulateContinueButtonExit(network_screen_);
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkScreenTest, Timeout) {
   EXPECT_CALL(*mock_network_state_helper_, IsConnecting())
       .WillOnce((Return(true)));
-  // EXPECT_FALSE(actor_->IsContinueEnabled());
+  // EXPECT_FALSE(view_->IsContinueEnabled());
   network_screen_->UpdateStatus();
 
   EXPECT_CALL(*mock_network_state_helper_, IsConnected())
       .Times(2)
       .WillRepeatedly(Return(false));
-  // TODO(nkostylev): Add integration with WebUI actor http://crosbug.com/22570
-  // EXPECT_FALSE(actor_->IsContinueEnabled());
-  // EXPECT_FALSE(actor_->IsConnecting());
+  // TODO(nkostylev): Add integration with WebUI view http://crosbug.com/22570
+  // EXPECT_FALSE(view_->IsContinueEnabled());
+  // EXPECT_FALSE(view_->IsConnecting());
   network_screen_->OnConnectionTimeout();
 
   // Close infobubble with error message - it makes the test stable.
-  // EXPECT_FALSE(actor_->IsContinueEnabled());
-  // EXPECT_FALSE(actor_->IsConnecting());
-  // actor_->ClearErrors();
+  // EXPECT_FALSE(view_->IsContinueEnabled());
+  // EXPECT_FALSE(view_->IsConnecting());
+  // view_->ClearErrors();
 }
 
 class HandsOffNetworkScreenTest : public NetworkScreenTest {

diff --git a/chrome/browser/chromeos/login/screens/reset_screen.h b/chrome/browser/chromeos/login/screens/reset_screen.h
index 77740e6..e54b0aa 100644
--- a/chrome/browser/chromeos/login/screens/reset_screen.h
+++ b/chrome/browser/chromeos/login/screens/reset_screen.h

@@ -28,7 +28,7 @@
               ResetView* view);
   ~ResetScreen() override;
 
-  // Called when actor is destroyed so there's no dead reference to it.
+  // Called when view is destroyed so there's no dead reference to it.
   void OnViewDestroyed(ResetView* view);
 
  private:

diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc b/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc
index ffbebd1..15d3eee 100644
--- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc
+++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.cc

@@ -28,38 +28,38 @@
 
 TermsOfServiceScreen::TermsOfServiceScreen(
     BaseScreenDelegate* base_screen_delegate,
-    TermsOfServiceScreenActor* actor)
+    TermsOfServiceScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_TERMS_OF_SERVICE),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 TermsOfServiceScreen::~TermsOfServiceScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
 }
 
 void TermsOfServiceScreen::Show() {
-  if (!actor_)
+  if (!view_)
     return;
 
   // Set the domain name whose Terms of Service are being shown.
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  actor_->SetDomain(connector->GetEnterpriseDomain());
+  view_->SetDomain(connector->GetEnterpriseDomain());
 
   // Show the screen.
-  actor_->Show();
+  view_->Show();
 
   // Start downloading the Terms of Service.
   StartDownload();
 }
 
 void TermsOfServiceScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void TermsOfServiceScreen::OnDecline() {
@@ -70,9 +70,9 @@
   Finish(BaseScreenDelegate::TERMS_OF_SERVICE_ACCEPTED);
 }
 
-void TermsOfServiceScreen::OnActorDestroyed(TermsOfServiceScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void TermsOfServiceScreen::OnViewDestroyed(TermsOfServiceScreenView* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 void TermsOfServiceScreen::StartDownload() {
@@ -82,8 +82,8 @@
   std::string terms_of_service_url =
       prefs->GetString(prefs::kTermsOfServiceURL);
   if (terms_of_service_url.empty()) {
-    if (actor_)
-      actor_->OnLoadError();
+    if (view_)
+      view_->OnLoadError();
     return;
   }
 
@@ -110,8 +110,8 @@
   terms_of_service_fetcher_.reset();
 
   // Show an error message to the user.
-  if (actor_)
-    actor_->OnLoadError();
+  if (view_)
+    view_->OnLoadError();
 }
 
 void TermsOfServiceScreen::OnURLFetchComplete(const net::URLFetcher* source) {
@@ -125,7 +125,7 @@
   // Destroy the fetcher when this method returns.
   std::unique_ptr<net::URLFetcher> fetcher(
       std::move(terms_of_service_fetcher_));
-  if (!actor_)
+  if (!view_)
     return;
 
   std::string terms_of_service;
@@ -136,11 +136,11 @@
       !source->GetResponseHeaders()->GetMimeType(&mime_type) ||
       mime_type != "text/plain" ||
       !source->GetResponseAsString(&terms_of_service)) {
-    actor_->OnLoadError();
+    view_->OnLoadError();
   } else {
     // If the Terms of Service were downloaded successfully, show them to the
     // user.
-    actor_->OnLoadSuccess(terms_of_service);
+    view_->OnLoadSuccess(terms_of_service);
   }
 }
 

diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h
index d4fff4da..7d6ac22 100644
--- a/chrome/browser/chromeos/login/screens/terms_of_service_screen.h
+++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen.h

@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/terms_of_service_screen_view.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace net {
@@ -27,11 +27,11 @@
 // Terms of Service before proceeding. Currently, Terms of Service are available
 // for public sessions only.
 class TermsOfServiceScreen : public BaseScreen,
-                             public TermsOfServiceScreenActor::Delegate,
+                             public TermsOfServiceScreenView::Delegate,
                              public net::URLFetcherDelegate {
  public:
   TermsOfServiceScreen(BaseScreenDelegate* base_screen_delegate,
-                       TermsOfServiceScreenActor* actor);
+                       TermsOfServiceScreenView* view);
   ~TermsOfServiceScreen() override;
 
   // BaseScreen:
@@ -41,7 +41,7 @@
   // TermsOfServiceScreenActor::Delegate:
   void OnDecline() override;
   void OnAccept() override;
-  void OnActorDestroyed(TermsOfServiceScreenActor* actor) override;
+  void OnViewDestroyed(TermsOfServiceScreenView* view) override;
 
  private:
   // Start downloading the Terms of Service.
@@ -53,7 +53,7 @@
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
-  TermsOfServiceScreenActor* actor_;
+  TermsOfServiceScreenView* view_;
 
   std::unique_ptr<net::URLFetcher> terms_of_service_fetcher_;
 

diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h
deleted file mode 100644
index b52b3268..0000000
--- a/chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h
+++ /dev/null

@@ -1,55 +0,0 @@
-// Copyright (c) 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface for dependency injection between TermsOfServiceScreen and its
-// WebUI representation.
-class TermsOfServiceScreenActor {
- public:
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // Called when the user declines the Terms of Service.
-    virtual void OnDecline() = 0;
-
-    // Called when the user accepts the Terms of Service.
-    virtual void OnAccept() = 0;
-
-    // Called when actor is destroyed so there is no dead reference to it.
-    virtual void OnActorDestroyed(TermsOfServiceScreenActor* actor) = 0;
-  };
-
-  virtual ~TermsOfServiceScreenActor() {}
-
-  // Sets screen this actor belongs to.
-  virtual void SetDelegate(Delegate* screen) = 0;
-
-  // Shows the contents of the screen.
-  virtual void Show() = 0;
-
-  // Hides the contents of the screen.
-  virtual void Hide() = 0;
-
-  // Sets the domain name whose Terms of Service are being shown.
-  virtual void SetDomain(const std::string& domain) = 0;
-
-  // Called when the download of the Terms of Service fails. Show an error
-  // message to the user.
-  virtual void OnLoadError() = 0;
-
-  // Called when the download of the Terms of Service is successful. Shows the
-  // downloaded |terms_of_service| to the user.
-  virtual void OnLoadSuccess(const std::string& terms_of_service) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_ACTOR_H_

diff --git a/chrome/browser/chromeos/login/screens/terms_of_service_screen_view.h b/chrome/browser/chromeos/login/screens/terms_of_service_screen_view.h
new file mode 100644
index 0000000..dcd3ee4
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/terms_of_service_screen_view.h

@@ -0,0 +1,55 @@
+// Copyright (c) 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface for dependency injection between TermsOfServiceScreen and its
+// WebUI representation.
+class TermsOfServiceScreenView {
+ public:
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when the user declines the Terms of Service.
+    virtual void OnDecline() = 0;
+
+    // Called when the user accepts the Terms of Service.
+    virtual void OnAccept() = 0;
+
+    // Called when view is destroyed so there is no dead reference to it.
+    virtual void OnViewDestroyed(TermsOfServiceScreenView* view) = 0;
+  };
+
+  virtual ~TermsOfServiceScreenView() {}
+
+  // Sets screen this view belongs to.
+  virtual void SetDelegate(Delegate* screen) = 0;
+
+  // Shows the contents of the screen.
+  virtual void Show() = 0;
+
+  // Hides the contents of the screen.
+  virtual void Hide() = 0;
+
+  // Sets the domain name whose Terms of Service are being shown.
+  virtual void SetDomain(const std::string& domain) = 0;
+
+  // Called when the download of the Terms of Service fails. Show an error
+  // message to the user.
+  virtual void OnLoadError() = 0;
+
+  // Called when the download of the Terms of Service is successful. Shows the
+  // downloaded |terms_of_service| to the user.
+  virtual void OnLoadSuccess(const std::string& terms_of_service) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_TERMS_OF_SERVICE_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.cc b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.cc
index e073d02c..8b85357b 100644
--- a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.cc
+++ b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.cc

@@ -10,36 +10,36 @@
 namespace chromeos {
 
 WrongHWIDScreen::WrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
-                                 WrongHWIDScreenActor* actor)
+                                 WrongHWIDScreenView* view)
     : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_WRONG_HWID),
-      actor_(actor) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+      view_(view) {
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 WrongHWIDScreen::~WrongHWIDScreen() {
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(nullptr);
 }
 
 void WrongHWIDScreen::Show() {
-  if (actor_)
-    actor_->Show();
+  if (view_)
+    view_->Show();
 }
 
 void WrongHWIDScreen::Hide() {
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
 }
 
 void WrongHWIDScreen::OnExit() {
   Finish(BaseScreenDelegate::WRONG_HWID_WARNING_SKIPPED);
 }
 
-void WrongHWIDScreen::OnActorDestroyed(WrongHWIDScreenActor* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void WrongHWIDScreen::OnViewDestroyed(WrongHWIDScreenView* view) {
+  if (view_ == view)
+    view_ = nullptr;
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h
index ae1fe959..84374036 100644
--- a/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h
+++ b/chrome/browser/chromeos/login/screens/wrong_hwid_screen.h

@@ -10,29 +10,29 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
-#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h"
 
 namespace chromeos {
 
 // Representation independent class that controls screen showing warning about
 // malformed HWID to users.
 class WrongHWIDScreen : public BaseScreen,
-                        public WrongHWIDScreenActor::Delegate {
+                        public WrongHWIDScreenView::Delegate {
  public:
   WrongHWIDScreen(BaseScreenDelegate* base_screen_delegate,
-                  WrongHWIDScreenActor* actor);
+                  WrongHWIDScreenView* view);
   ~WrongHWIDScreen() override;
 
   // BaseScreen implementation:
   void Show() override;
   void Hide() override;
 
-  // WrongHWIDScreenActor::Delegate implementation:
+  // WrongHWIDScreenView::Delegate implementation:
   void OnExit() override;
-  void OnActorDestroyed(WrongHWIDScreenActor* actor) override;
+  void OnViewDestroyed(WrongHWIDScreenView* view) override;
 
  private:
-  WrongHWIDScreenActor* actor_;
+  WrongHWIDScreenView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(WrongHWIDScreen);
 };

diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h b/chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h
deleted file mode 100644
index fa9faac1..0000000
--- a/chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h
+++ /dev/null

@@ -1,39 +0,0 @@
-// Copyright (c) 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_ACTOR_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_ACTOR_H_
-
-#include <string>
-
-namespace chromeos {
-
-// Interface between wrong HWID screen and its representation.
-// Note, do not forget to call OnActorDestroyed in the dtor.
-class WrongHWIDScreenActor {
- public:
-  // Allows us to get info from wrong HWID screen that we need.
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-
-    // Called when screen is exited.
-    virtual void OnExit() = 0;
-
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(WrongHWIDScreenActor* actor) = 0;
-  };
-
-  virtual ~WrongHWIDScreenActor() {}
-
-  virtual void Show() = 0;
-  virtual void Hide() = 0;
-  virtual void SetDelegate(Delegate* delegate) = 0;
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_ACTOR_H_
-

diff --git a/chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h b/chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h
new file mode 100644
index 0000000..9576e66c
--- /dev/null
+++ b/chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h

@@ -0,0 +1,38 @@
+// Copyright (c) 2013 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_VIEW_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_VIEW_H_
+
+#include <string>
+
+namespace chromeos {
+
+// Interface between wrong HWID screen and its representation.
+// Note, do not forget to call OnViewDestroyed in the dtor.
+class WrongHWIDScreenView {
+ public:
+  // Allows us to get info from wrong HWID screen that we need.
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Called when screen is exited.
+    virtual void OnExit() = 0;
+
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(NULL).
+    virtual void OnViewDestroyed(WrongHWIDScreenView* view) = 0;
+  };
+
+  virtual ~WrongHWIDScreenView() {}
+
+  virtual void Show() = 0;
+  virtual void Hide() = 0;
+  virtual void SetDelegate(Delegate* delegate) = 0;
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_WRONG_HWID_SCREEN_VIEW_H_

diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index 604dd3e..cc1090a 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h

@@ -506,8 +506,7 @@
   // Child account status is necessary for InitializeStartUrls call.
   bool waiting_for_child_account_status_;
 
-  scoped_refptr<typename HatsNotificationController::HatsNotificationController>
-      hats_notification_controller_;
+  scoped_refptr<HatsNotificationController> hats_notification_controller_;
 
   base::WeakPtrFactory<UserSessionManager> weak_factory_;
 

diff --git a/chrome/browser/chromeos/login/signin_screen_controller.cc b/chrome/browser/chromeos/login/signin_screen_controller.cc
index e877048..480abc9 100644
--- a/chrome/browser/chromeos/login/signin_screen_controller.cc
+++ b/chrome/browser/chromeos/login/signin_screen_controller.cc

@@ -23,12 +23,12 @@
   DCHECK(!instance_);
   instance_ = this;
 
-  gaia_screen_->SetScreenHandler(oobe_ui_->GetGaiaScreenActor());
+  gaia_screen_->set_view(oobe_ui_->GetGaiaScreenView());
   std::string display_type = oobe_ui->display_type();
   user_selection_screen_.reset(new ChromeUserSelectionScreen(display_type));
   user_selection_screen_->SetLoginDisplayDelegate(login_display_delegate);
 
-  user_board_view_ = oobe_ui_->GetUserBoardScreenActor()->GetWeakPtr();
+  user_board_view_ = oobe_ui_->GetUserBoardView()->GetWeakPtr();
   user_selection_screen_->SetView(user_board_view_.get());
   // TODO(jdufault): Bind and Unbind should be controlled by either the
   // Model/View which are then each responsible for automatically unbinding the
@@ -91,7 +91,6 @@
 void SignInScreenController::SetWebUIHandler(
     LoginDisplayWebUIHandler* webui_handler) {
   webui_handler_ = webui_handler;
-  gaia_screen_->SetLegacyHandler(webui_handler_);
   user_selection_screen_->SetHandler(webui_handler_);
 }
 

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
index 0292ad6..5ef2acb 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

@@ -102,10 +102,10 @@
 
 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
     BaseScreenDelegate* base_screen_delegate,
-    SupervisedUserCreationScreenHandler* actor)
+    SupervisedUserCreationScreenHandler* view)
     : BaseScreen(base_screen_delegate,
                  OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW),
-      actor_(actor),
+      view_(view),
       on_error_screen_(false),
       manager_signin_in_progress_(false),
       last_page_(kNameOfIntroScreen),
@@ -114,30 +114,30 @@
       selected_image_(0),
       histogram_helper_(new ErrorScreensHistogramHelper("Supervised")),
       weak_factory_(this) {
-  DCHECK(actor_);
-  if (actor_)
-    actor_->SetDelegate(this);
+  DCHECK(view_);
+  if (view_)
+    view_->SetDelegate(this);
 }
 
 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   if (sync_service_)
     sync_service_->RemoveObserver(this);
-  if (actor_)
-    actor_->SetDelegate(NULL);
+  if (view_)
+    view_->SetDelegate(NULL);
   network_portal_detector::GetInstance()->RemoveObserver(this);
 }
 
 void SupervisedUserCreationScreen::Show() {
   CameraPresenceNotifier::GetInstance()->AddObserver(this);
-  if (actor_) {
-    actor_->Show();
+  if (view_) {
+    view_->Show();
     // TODO(antrim) : temorary hack (until upcoming hackaton). Should be
     // removed once we have screens reworked.
     if (on_error_screen_)
-      actor_->ShowPage(last_page_);
+      view_->ShowPage(last_page_);
     else
-      actor_->ShowIntroPage();
+      view_->ShowIntroPage();
   }
 
   if (!on_error_screen_)
@@ -169,9 +169,9 @@
 
 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() {
   manager_signin_in_progress_ = false;
-  if (!actor_)
+  if (!view_)
     return;
-  actor_->ShowErrorPage(
+  view_->ShowErrorPage(
       l10n_util::GetStringUTF16(
           IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE),
       l10n_util::GetStringUTF16(
@@ -181,14 +181,14 @@
 }
 
 void SupervisedUserCreationScreen::ShowInitialScreen() {
-  if (actor_)
-    actor_->ShowIntroPage();
+  if (view_)
+    view_->ShowIntroPage();
 }
 
 void SupervisedUserCreationScreen::Hide() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
-  if (actor_)
-    actor_->Hide();
+  if (view_)
+    view_->Hide();
   if (!on_error_screen_)
     network_portal_detector::GetInstance()->RemoveObserver(this);
 }
@@ -273,11 +273,10 @@
 
   // We should not get here with existing user selected, so just display error.
   if (exists) {
-    actor_->ShowErrorPage(
+    view_->ShowErrorPage(
         l10n_util::GetStringUTF16(
             IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE),
-        l10n_util::GetStringUTF16(
-            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
+        l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
         l10n_util::GetStringUTF16(
             IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON));
     return;
@@ -333,11 +332,10 @@
 
   // We should not get here with existing user selected, so just display error.
   if (exists) {
-    actor_->ShowErrorPage(
+    view_->ShowErrorPage(
         l10n_util::GetStringUTF16(
             IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_TITLE),
-        l10n_util::GetStringUTF16(
-            IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
+        l10n_util::GetStringUTF16(IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR),
         l10n_util::GetStringUTF16(
             IDS_CREATE_SUPERVISED_USER_GENERIC_ERROR_BUTTON));
     return;
@@ -354,8 +352,8 @@
 
 void SupervisedUserCreationScreen::OnManagerLoginFailure() {
   manager_signin_in_progress_ = false;
-  if (actor_)
-    actor_->ShowManagerPasswordError();
+  if (view_)
+    view_->ShowManagerPasswordError();
 }
 
 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(
@@ -370,8 +368,8 @@
   ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer();
 
   controller_->SetManagerProfile(manager_profile);
-  if (actor_)
-    actor_->ShowUsernamePage();
+  if (view_)
+    view_->ShowUsernamePage();
 
   last_page_ = kNameOfNewUserParametersScreen;
   CHECK(!sync_service_);
@@ -389,16 +387,18 @@
 }
 
 void SupervisedUserCreationScreen::OnManagerCryptohomeAuthenticated() {
-  if (actor_) {
-    actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-        IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE));
+  if (view_) {
+    view_->ShowStatusMessage(
+        true /* progress */,
+        l10n_util::GetStringUTF16(
+            IDS_CREATE_SUPERVISED_USER_CREATION_AUTH_PROGRESS_MESSAGE));
   }
 }
 
-void SupervisedUserCreationScreen::OnActorDestroyed(
-    SupervisedUserCreationScreenHandler* actor) {
-  if (actor_ == actor)
-    actor_ = NULL;
+void SupervisedUserCreationScreen::OnViewDestroyed(
+    SupervisedUserCreationScreenHandler* view) {
+  if (view_ == view)
+    view_ = NULL;
 }
 
 void SupervisedUserCreationScreen::OnCreationError(
@@ -433,21 +433,25 @@
     case SupervisedUserCreationController::NO_ERROR:
       NOTREACHED();
   }
-  if (actor_)
-    actor_->ShowErrorPage(title, message, button);
+  if (view_)
+    view_->ShowErrorPage(title, message, button);
 }
 
 void SupervisedUserCreationScreen::OnCreationTimeout() {
-  if (actor_) {
-    actor_->ShowStatusMessage(false /* error */, l10n_util::GetStringUTF16(
-        IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE));
+  if (view_) {
+    view_->ShowStatusMessage(
+        false /* error */,
+        l10n_util::GetStringUTF16(
+            IDS_CREATE_SUPERVISED_USER_CREATION_CREATION_TIMEOUT_MESSAGE));
   }
 }
 
 void SupervisedUserCreationScreen::OnLongCreationWarning() {
-  if (actor_) {
-    actor_->ShowStatusMessage(true /* progress */, l10n_util::GetStringUTF16(
-        IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN));
+  if (view_) {
+    view_->ShowStatusMessage(
+        true /* progress */,
+        l10n_util::GetStringUTF16(
+            IDS_PROFILES_CREATE_SUPERVISED_JUST_SIGNED_IN));
   }
 }
 
@@ -501,7 +505,7 @@
       break;
   }
   // Proceed to tutorial.
-  actor_->ShowTutorialPage();
+  view_->ShowTutorialPage();
 }
 
 void SupervisedUserCreationScreen::OnCreationSuccess() {
@@ -510,8 +514,8 @@
 
 void SupervisedUserCreationScreen::OnCameraPresenceCheckDone(
     bool is_camera_present) {
-  if (actor_)
-    actor_->SetCameraPresent(is_camera_present);
+  if (view_)
+    view_->SetCameraPresent(is_camera_present);
 }
 
 void SupervisedUserCreationScreen::OnGetSupervisedUsers(
@@ -583,7 +587,7 @@
     existing_users_->Set(it.key(), local_copy);
     ui_users->Append(std::move(ui_copy));
   }
-  actor_->ShowExistingSupervisedUsers(ui_users.get());
+  view_->ShowExistingSupervisedUsers(ui_users.get());
 }
 
 void SupervisedUserCreationScreen::OnPhotoTaken(

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h
index cc79735..018f924 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h

@@ -37,7 +37,7 @@
       public CameraPresenceNotifier::Observer {
  public:
   SupervisedUserCreationScreen(BaseScreenDelegate* base_screen_delegate,
-                               SupervisedUserCreationScreenHandler* actor);
+                               SupervisedUserCreationScreenHandler* view);
   ~SupervisedUserCreationScreen() override;
 
   static SupervisedUserCreationScreen* Get(ScreenManager* manager);
@@ -79,7 +79,7 @@
   void Hide() override;
 
   // SupervisedUserCreationScreenHandler::Delegate implementation:
-  void OnActorDestroyed(SupervisedUserCreationScreenHandler* actor) override;
+  void OnViewDestroyed(SupervisedUserCreationScreenHandler* view) override;
   void CreateSupervisedUser(
       const base::string16& display_name,
       const std::string& supervised_user_password) override;
@@ -123,7 +123,7 @@
   void ApplyPicture();
   void OnGetSupervisedUsers(const base::DictionaryValue* users);
 
-  SupervisedUserCreationScreenHandler* actor_;
+  SupervisedUserCreationScreenHandler* view_;
 
   std::unique_ptr<SupervisedUserCreationController> controller_;
   std::unique_ptr<base::DictionaryValue> existing_users_;

diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index 9abe621..f93c2245 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc

@@ -41,7 +41,8 @@
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
+#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
@@ -63,7 +64,6 @@
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
-#include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -1024,11 +1024,11 @@
   if (new_bounds.IsEmpty()) {
     // Keyboard has been hidden.
     if (GetOobeUI())
-      GetOobeUI()->GetCoreOobeActor()->ShowControlBar(true);
+      GetOobeUI()->GetCoreOobeView()->ShowControlBar(true);
   } else if (!new_bounds.IsEmpty()) {
     // Keyboard has been shown.
     if (GetOobeUI())
-      GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
+      GetOobeUI()->GetCoreOobeView()->ShowControlBar(false);
   }
 }
 
@@ -1055,8 +1055,8 @@
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
-    GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
-                                                       size.height());
+    GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
+                                                      size.height());
   }
 }
 
@@ -1329,7 +1329,7 @@
 void LoginDisplayHostImpl::DisableRestrictiveProxyCheckForTest() {
   static_cast<chromeos::LoginDisplayHostImpl*>(default_host())
       ->GetOobeUI()
-      ->GetGaiaScreenActor()
+      ->GetGaiaScreenView()
       ->DisableRestrictiveProxyCheckForTest();
 }
 

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index a5be676..851dbcd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc

@@ -372,41 +372,41 @@
   } else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
     return new EulaScreen(this, this, oobe_ui_->GetEulaView());
   } else if (screen == OobeScreen::SCREEN_OOBE_ENROLLMENT) {
-    return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenActor());
+    return new EnrollmentScreen(this, oobe_ui_->GetEnrollmentScreenView());
   } else if (screen == OobeScreen::SCREEN_OOBE_RESET) {
     return new chromeos::ResetScreen(this, oobe_ui_->GetResetView());
   } else if (screen == OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING) {
     return new EnableDebuggingScreen(this,
-                                     oobe_ui_->GetEnableDebuggingScreenActor());
+                                     oobe_ui_->GetEnableDebuggingScreenView());
   } else if (screen == OobeScreen::SCREEN_KIOSK_ENABLE) {
-    return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenActor());
+    return new KioskEnableScreen(this, oobe_ui_->GetKioskEnableScreenView());
   } else if (screen == OobeScreen::SCREEN_KIOSK_AUTOLAUNCH) {
     return new KioskAutolaunchScreen(this,
-                                     oobe_ui_->GetKioskAutolaunchScreenActor());
+                                     oobe_ui_->GetKioskAutolaunchScreenView());
   } else if (screen == OobeScreen::SCREEN_TERMS_OF_SERVICE) {
     return new TermsOfServiceScreen(this,
-                                    oobe_ui_->GetTermsOfServiceScreenActor());
+                                    oobe_ui_->GetTermsOfServiceScreenView());
   } else if (screen == OobeScreen::SCREEN_ARC_TERMS_OF_SERVICE) {
     return new ArcTermsOfServiceScreen(
-        this, oobe_ui_->GetArcTermsOfServiceScreenActor());
+        this, oobe_ui_->GetArcTermsOfServiceScreenView());
   } else if (screen == OobeScreen::SCREEN_WRONG_HWID) {
-    return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenActor());
+    return new WrongHWIDScreen(this, oobe_ui_->GetWrongHWIDScreenView());
   } else if (screen == OobeScreen::SCREEN_CREATE_SUPERVISED_USER_FLOW) {
     return new SupervisedUserCreationScreen(
-        this, oobe_ui_->GetSupervisedUserCreationScreenActor());
+        this, oobe_ui_->GetSupervisedUserCreationScreenView());
   } else if (screen == OobeScreen::SCREEN_OOBE_HID_DETECTION) {
     return new chromeos::HIDDetectionScreen(this,
                                             oobe_ui_->GetHIDDetectionView());
   } else if (screen == OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK) {
     return new AutoEnrollmentCheckScreen(
-        this, oobe_ui_->GetAutoEnrollmentCheckScreenActor());
+        this, oobe_ui_->GetAutoEnrollmentCheckScreenView());
   } else if (screen == OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING) {
     if (!shark_controller_) {
       shark_controller_.reset(
           new pairing_chromeos::BluetoothControllerPairingController());
     }
     return new ControllerPairingScreen(
-        this, this, oobe_ui_->GetControllerPairingScreenActor(),
+        this, this, oobe_ui_->GetControllerPairingScreenView(),
         shark_controller_.get());
   } else if (screen == OobeScreen::SCREEN_OOBE_HOST_PAIRING) {
     if (!remora_controller_) {
@@ -416,11 +416,11 @@
       remora_controller_->StartPairing();
     }
     return new HostPairingScreen(this, this,
-                                 oobe_ui_->GetHostPairingScreenActor(),
+                                 oobe_ui_->GetHostPairingScreenView(),
                                  remora_controller_.get());
   } else if (screen == OobeScreen::SCREEN_DEVICE_DISABLED) {
     return new DeviceDisabledScreen(this,
-                                    oobe_ui_->GetDeviceDisabledScreenActor());
+                                    oobe_ui_->GetDeviceDisabledScreenView());
   }
 
   return nullptr;

diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index ebebd51..7e0f1b7 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc

@@ -25,7 +25,7 @@
 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
-#include "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/mock_device_disabled_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/mock_enable_debugging_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_eula_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_network_screen.h"
@@ -200,13 +200,12 @@
 class MockOutShowHide : public T {
  public:
   template <class P> explicit  MockOutShowHide(P p) : T(p) {}
-  template <class P> MockOutShowHide(P p, H* actor)
-      : T(p, actor), actor_(actor) {}
+  template <class P>
+  MockOutShowHide(P p, H* view) : T(p, view), view_(view) {}
   template <class P, class Q>
-  MockOutShowHide(P p, Q q, H* actor)
-      : T(p, q, actor), actor_(actor) {}
+  MockOutShowHide(P p, Q q, H* view) : T(p, q, view), view_(view) {}
 
-  H* actor() const { return actor_.get(); }
+  H* view() const { return view_.get(); }
 
   MOCK_METHOD0(Show, void());
   MOCK_METHOD0(Hide, void());
@@ -220,24 +219,24 @@
   }
 
  private:
-  std::unique_ptr<H> actor_;
+  std::unique_ptr<H> view_;
 };
 
-#define MOCK(mock_var, screen_name, mocked_class, actor_class)    \
-  mock_var = new MockOutShowHide<mocked_class, actor_class>(      \
-      WizardController::default_controller(), new actor_class);   \
+#define MOCK(mock_var, screen_name, mocked_class, view_class)     \
+  mock_var = new MockOutShowHide<mocked_class, view_class>(       \
+      WizardController::default_controller(), new view_class);    \
   WizardController::default_controller()->screens_[screen_name] = \
       make_linked_ptr(mock_var);                                  \
   EXPECT_CALL(*mock_var, Show()).Times(0);                        \
   EXPECT_CALL(*mock_var, Hide()).Times(0);
 
-#define MOCK_WITH_DELEGATE(mock_var, screen_name, mocked_class, actor_class) \
-  mock_var = new MockOutShowHide<mocked_class, actor_class>(                 \
-      WizardController::default_controller(),                                \
-      WizardController::default_controller(), new actor_class);              \
-  WizardController::default_controller()->screens_[screen_name] =            \
-      make_linked_ptr(mock_var);                                             \
-  EXPECT_CALL(*mock_var, Show()).Times(0);                                   \
+#define MOCK_WITH_DELEGATE(mock_var, screen_name, mocked_class, view_class) \
+  mock_var = new MockOutShowHide<mocked_class, view_class>(                 \
+      WizardController::default_controller(),                               \
+      WizardController::default_controller(), new view_class);              \
+  WizardController::default_controller()->screens_[screen_name] =           \
+      make_linked_ptr(mock_var);                                            \
+  EXPECT_CALL(*mock_var, Show()).Times(0);                                  \
   EXPECT_CALL(*mock_var, Hide()).Times(0);
 
 class WizardControllerTest : public WizardInProcessBrowserTest {
@@ -433,20 +432,20 @@
     MOCK_WITH_DELEGATE(mock_eula_screen_, OobeScreen::SCREEN_OOBE_EULA,
                        MockEulaScreen, MockEulaView);
     MOCK(mock_enrollment_screen_, OobeScreen::SCREEN_OOBE_ENROLLMENT,
-         MockEnrollmentScreen, MockEnrollmentScreenActor);
+         MockEnrollmentScreen, MockEnrollmentScreenView);
     MOCK(mock_auto_enrollment_check_screen_,
          OobeScreen::SCREEN_AUTO_ENROLLMENT_CHECK,
-         MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenActor);
+         MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenView);
     MOCK(mock_wrong_hwid_screen_, OobeScreen::SCREEN_WRONG_HWID,
-         MockWrongHWIDScreen, MockWrongHWIDScreenActor);
+         MockWrongHWIDScreen, MockWrongHWIDScreenView);
     MOCK(mock_enable_debugging_screen_,
          OobeScreen::SCREEN_OOBE_ENABLE_DEBUGGING, MockEnableDebuggingScreen,
-         MockEnableDebuggingScreenActor);
-    device_disabled_screen_actor_.reset(new MockDeviceDisabledScreenActor);
+         MockEnableDebuggingScreenView);
+    device_disabled_screen_view_.reset(new MockDeviceDisabledScreenView);
     wizard_controller->screens_[OobeScreen::SCREEN_DEVICE_DISABLED] =
         make_linked_ptr(new DeviceDisabledScreen(
-            wizard_controller, device_disabled_screen_actor_.get()));
-    EXPECT_CALL(*device_disabled_screen_actor_, Show()).Times(0);
+            wizard_controller, device_disabled_screen_view_.get()));
+    EXPECT_CALL(*device_disabled_screen_view_, Show()).Times(0);
 
     // Switch to the initial screen.
     EXPECT_EQ(NULL, wizard_controller->current_screen());
@@ -456,7 +455,7 @@
 
   void TearDownOnMainThread() override {
     mock_network_screen_.reset();
-    device_disabled_screen_actor_.reset();
+    device_disabled_screen_view_.reset();
     WizardControllerTest::TearDownOnMainThread();
   }
 
@@ -520,15 +519,16 @@
   linked_ptr<MockNetworkScreen> mock_network_screen_;
   MockOutShowHide<MockUpdateScreen, MockUpdateView>* mock_update_screen_;
   MockOutShowHide<MockEulaScreen, MockEulaView>* mock_eula_screen_;
-  MockOutShowHide<MockEnrollmentScreen,
-      MockEnrollmentScreenActor>* mock_enrollment_screen_;
+  MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
+      mock_enrollment_screen_;
   MockOutShowHide<MockAutoEnrollmentCheckScreen,
-      MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
-  MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenActor>*
+                  MockAutoEnrollmentCheckScreenView>*
+      mock_auto_enrollment_check_screen_;
+  MockOutShowHide<MockWrongHWIDScreen, MockWrongHWIDScreenView>*
       mock_wrong_hwid_screen_;
-  MockOutShowHide<MockEnableDebuggingScreen,
-      MockEnableDebuggingScreenActor>* mock_enable_debugging_screen_;
-  std::unique_ptr<MockDeviceDisabledScreenActor> device_disabled_screen_actor_;
+  MockOutShowHide<MockEnableDebuggingScreen, MockEnableDebuggingScreenView>*
+      mock_enable_debugging_screen_;
+  std::unique_ptr<MockDeviceDisabledScreenView> device_disabled_screen_view_;
 
  private:
   NetworkPortalDetectorTestImpl* network_portal_detector_;
@@ -672,7 +672,7 @@
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
   EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
   WizardController::default_controller()->SkipUpdateEnrollAfterEula();
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))
@@ -715,7 +715,7 @@
                        ControlFlowEnrollmentCompleted) {
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
   EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))
@@ -877,7 +877,7 @@
   g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState,
                                         device_state);
   EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_SERVER_FORCED)))
@@ -966,9 +966,9 @@
   device_state.SetString(policy::kDeviceStateDisabledMessage, kDisabledMessage);
   g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState,
                                         device_state);
-  EXPECT_CALL(*device_disabled_screen_actor_,
-              UpdateMessage(kDisabledMessage)).Times(1);
-  EXPECT_CALL(*device_disabled_screen_actor_, Show()).Times(1);
+  EXPECT_CALL(*device_disabled_screen_view_, UpdateMessage(kDisabledMessage))
+      .Times(1);
+  EXPECT_CALL(*device_disabled_screen_view_, Show()).Times(1);
   OnExit(*mock_auto_enrollment_check_screen_,
          BaseScreenDelegate::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
 
@@ -1112,7 +1112,7 @@
 
 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
                        ControlFlowKioskForcedEnrollment) {
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_LOCAL_FORCED)))
@@ -1154,7 +1154,7 @@
 
 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
                        ControlFlowEnrollmentBack) {
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(mock_enrollment_screen_,
                             EnrollmentModeMatches(
                                 policy::EnrollmentConfig::MODE_LOCAL_FORCED)))
@@ -1256,7 +1256,7 @@
     MOCK_WITH_DELEGATE(mock_network_screen_, OobeScreen::SCREEN_OOBE_NETWORK,
                        MockNetworkScreen, MockNetworkView);
     MOCK(mock_enrollment_screen_, OobeScreen::SCREEN_OOBE_ENROLLMENT,
-         MockEnrollmentScreen, MockEnrollmentScreenActor);
+         MockEnrollmentScreen, MockEnrollmentScreenView);
   }
 
   void OnExit(BaseScreen& screen, BaseScreenDelegate::ExitCodes exit_code) {
@@ -1269,8 +1269,8 @@
   }
 
   MockOutShowHide<MockNetworkScreen, MockNetworkView>* mock_network_screen_;
-  MockOutShowHide<MockEnrollmentScreen,
-      MockEnrollmentScreenActor>* mock_enrollment_screen_;
+  MockOutShowHide<MockEnrollmentScreen, MockEnrollmentScreenView>*
+      mock_enrollment_screen_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WizardControllerOobeResumeTest);
@@ -1283,7 +1283,7 @@
   WizardController::default_controller()->AdvanceToScreen(
       OobeScreen::SCREEN_OOBE_NETWORK);
   CheckCurrentScreen(OobeScreen::SCREEN_OOBE_NETWORK);
-  EXPECT_CALL(*mock_enrollment_screen_->actor(),
+  EXPECT_CALL(*mock_enrollment_screen_->view(),
               SetParameters(
                   mock_enrollment_screen_,
                   EnrollmentModeMatches(policy::EnrollmentConfig::MODE_MANUAL)))

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index a5eeea9f..3baf9c98 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc

@@ -58,8 +58,21 @@
 
 namespace chromeos {
 
+namespace {
+
 static const char kFallbackInputMethodLocale[] = "en-US";
 
+// The keyboard preferences that determine how we remap modifier keys. These
+// preferences will be saved in global user preferences dictionary so that they
+// can be used on signin screen.
+const char* const kLanguageRemapPrefs[] = {
+    prefs::kLanguageRemapSearchKeyTo, prefs::kLanguageRemapControlKeyTo,
+    prefs::kLanguageRemapAltKeyTo,    prefs::kLanguageRemapCapsLockKeyTo,
+    prefs::kLanguageRemapEscapeKeyTo, prefs::kLanguageRemapBackspaceKeyTo,
+    prefs::kLanguageRemapDiamondKeyTo};
+
+}  // namespace
+
 Preferences::Preferences()
     : prefs_(NULL),
       input_method_manager_(input_method::InputMethodManager::Get()),
@@ -400,6 +413,8 @@
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(prefs::kResolveTimezoneByGeolocation, callback);
   pref_change_registrar_.Add(prefs::kUse24HourClock, callback);
+  for (auto remap_pref : kLanguageRemapPrefs)
+    pref_change_registrar_.Add(remap_pref, callback);
 }
 
 void Preferences::Init(Profile* profile, const user_manager::User* user) {
@@ -715,6 +730,14 @@
                                              prefs::kUse24HourClock, value);
   }
 
+  for (auto remap_pref : kLanguageRemapPrefs) {
+    if (pref_name == remap_pref || reason != REASON_ACTIVE_USER_CHANGED) {
+      const int value = prefs_->GetInteger(remap_pref);
+      user_manager::known_user::SetIntegerPref(user_->GetAccountId(),
+                                               remap_pref, value);
+    }
+  }
+
   system::InputDeviceSettings::Get()->UpdateTouchDevicesStatusFromPrefs();
 }
 

diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification.cc b/chrome/browser/chromeos/printing/cups_print_job_notification.cc
index 504dd63..f3b4119 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification.cc
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification.cc

@@ -84,6 +84,10 @@
 CupsPrintJobNotification::~CupsPrintJobNotification() {}
 
 void CupsPrintJobNotification::OnPrintJobStatusUpdated() {
+  // After cancellation, ignore all updates.
+  if (cancelled_by_user_)
+    return;
+
   UpdateNotification();
 }
 
@@ -109,9 +113,7 @@
         // only clean up the nofitication if cancel was successful.
         g_browser_process->notification_ui_manager()->CancelById(
             GetNotificationId(), profile_id);
-        // |print_job_| is deleted by CupsPrintManager when the print job is
-        // cancelled, thus set it to nullptr.
-        print_job_ = nullptr;
+        cancelled_by_user_ = true;
       }
       break;
     case ButtonCommand::PAUSE_PRINTING:
@@ -130,8 +132,6 @@
 }
 
 void CupsPrintJobNotification::UpdateNotification() {
-  DCHECK(print_job_->state() != CupsPrintJob::State::STATE_CANCELLED);
-
   UpdateNotificationTitle();
   UpdateNotificationIcon();
   UpdateNotificationBodyMessage();
@@ -184,11 +184,11 @@
       notification_->set_icon(
           bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_DONE));
       break;
+    case CupsPrintJob::State::STATE_CANCELLED:
     case CupsPrintJob::State::STATE_ERROR:
       notification_->set_icon(
           bundle.GetImageNamed(IDR_PRINT_NOTIFICATION_ERROR));
-      break;
-    default:
+    case CupsPrintJob::State::STATE_NONE:
       break;
   }
 }
@@ -220,6 +220,7 @@
           base::IntToString16(print_job_->total_page_number()),
           base::UTF8ToUTF16(print_job_->printer().display_name()));
       break;
+    case CupsPrintJob::State::STATE_CANCELLED:
     case CupsPrintJob::State::STATE_ERROR:
       message = l10n_util::GetStringFUTF16(
           IDS_PRINT_JOB_ERROR_NOTIFICATION_MESSAGE,
@@ -246,7 +247,7 @@
     case CupsPrintJob::State::STATE_WAITING:
     case CupsPrintJob::State::STATE_DOCUMENT_DONE:
     case CupsPrintJob::State::STATE_ERROR:
-    default:
+    case CupsPrintJob::State::STATE_CANCELLED:
       notification_->set_type(message_center::NOTIFICATION_TYPE_SIMPLE);
       break;
   }
@@ -280,6 +281,7 @@
       commands->push_back(ButtonCommand::CANCEL_PRINTING);
       break;
     case CupsPrintJob::State::STATE_ERROR:
+    case CupsPrintJob::State::STATE_CANCELLED:
       commands->push_back(ButtonCommand::GET_HELP);
       break;
     default:

diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification.h b/chrome/browser/chromeos/printing/cups_print_job_notification.h
index a5f211d..c554863 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification.h
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification.h

@@ -5,6 +5,10 @@
 #ifndef CHROME_BROWSER_CHROMEOS_PRINTING_CUPS_PRINT_JOB_NOTIFICATION_H_
 #define CHROME_BROWSER_CHROMEOS_PRINTING_CUPS_PRINT_JOB_NOTIFICATION_H_
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_delegate.h"
 
@@ -59,6 +63,10 @@
   // and only show the print job done or failed notification.
   bool closed_in_middle_ = false;
 
+  // If this is true, the user cancelled the job using the cancel button and
+  // should not be notified of events.
+  bool cancelled_by_user_ = false;
+
   // Maintains a list of button actions according to the print job's current
   // status.
   std::unique_ptr<std::vector<ButtonCommand>> button_commands_;

diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.cc b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.cc
index b7a6636..b7a5c7a 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.cc
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.cc

@@ -31,31 +31,34 @@
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobStarted(CupsPrintJob* job) {
-  DCHECK(base::ContainsKey(notification_map_, job));
-  notification_map_[job]->OnPrintJobStatusUpdated();
+  UpdateNotification(job);
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobUpdated(CupsPrintJob* job) {
-  DCHECK(base::ContainsKey(notification_map_, job));
-  notification_map_[job]->OnPrintJobStatusUpdated();
+  UpdateNotification(job);
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobSuspended(CupsPrintJob* job) {
-  DCHECK(base::ContainsKey(notification_map_, job));
-  notification_map_[job]->OnPrintJobStatusUpdated();
+  UpdateNotification(job);
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobResumed(CupsPrintJob* job) {
-  DCHECK(base::ContainsKey(notification_map_, job));
-  notification_map_[job]->OnPrintJobStatusUpdated();
+  UpdateNotification(job);
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobDone(CupsPrintJob* job) {
-  DCHECK(base::ContainsKey(notification_map_, job));
-  notification_map_[job]->OnPrintJobStatusUpdated();
+  UpdateNotification(job);
 }
 
 void CupsPrintJobNotificationManager::OnPrintJobError(CupsPrintJob* job) {
+  UpdateNotification(job);
+}
+
+void CupsPrintJobNotificationManager::OnPrintJobCancelled(CupsPrintJob* job) {
+  UpdateNotification(job);
+}
+
+void CupsPrintJobNotificationManager::UpdateNotification(CupsPrintJob* job) {
   DCHECK(base::ContainsKey(notification_map_, job));
   notification_map_[job]->OnPrintJobStatusUpdated();
 }

diff --git a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h
index bad14c89..1f7c304 100644
--- a/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h
+++ b/chrome/browser/chromeos/printing/cups_print_job_notification_manager.h

@@ -9,6 +9,7 @@
 #include <string>
 #include <unordered_map>
 
+#include "base/macros.h"
 #include "chrome/browser/chromeos/printing/cups_print_job_manager.h"
 #include "chrome/browser/chromeos/printing/cups_print_job_notification.h"
 
@@ -36,8 +37,11 @@
   void OnPrintJobResumed(CupsPrintJob* job) override;
   void OnPrintJobDone(CupsPrintJob* job) override;
   void OnPrintJobError(CupsPrintJob* job) override;
+  void OnPrintJobCancelled(CupsPrintJob* job) override;
 
  private:
+  void UpdateNotification(CupsPrintJob* job);
+
   PrintJobNotificationMap notification_map_;
   CupsPrintJobManager* print_job_manager_;
   Profile* profile_;

diff --git a/chrome/browser/chromeos/system/device_disabling_browsertest.cc b/chrome/browser/chromeos/system/device_disabling_browsertest.cc
index 66bf309..23a0d934 100644
--- a/chrome/browser/chromeos/system/device_disabling_browsertest.cc
+++ b/chrome/browser/chromeos/system/device_disabling_browsertest.cc

@@ -203,7 +203,7 @@
   ASSERT_TRUE(network_state_informer);
   network_state_informer->AddObserver(this);
   SigninScreenHandler* const signin_screen_handler =
-      oobe_ui->signin_screen_handler_for_test();
+      oobe_ui->signin_screen_handler();
   ASSERT_TRUE(signin_screen_handler);
   signin_screen_handler->ZeroOfflineTimeoutForTesting();
   SimulateNetworkOffline();

diff --git a/chrome/browser/chromeos/system_logs/command_line_log_source.cc b/chrome/browser/chromeos/system_logs/command_line_log_source.cc
index a1675314..df312dc 100644
--- a/chrome/browser/chromeos/system_logs/command_line_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/command_line_log_source.cc

@@ -15,6 +15,7 @@
 #include "base/logging.h"
 #include "base/process/launch.h"
 #include "base/sys_info.h"
+#include "base/task_scheduler/post_task.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -106,10 +107,11 @@
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
-  BrowserThread::PostBlockingPoolTaskAndReply(
-      FROM_HERE,
-      base::Bind(&ExecuteCommandLines, response),
-      base::Bind(callback, base::Owned(response)));
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   base::Bind(&ExecuteCommandLines, response),
+                                   base::Bind(callback, base::Owned(response)));
 }
 
 }  // namespace system_logs

diff --git a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
index 993183d..fc6049a 100644
--- a/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc
+++ b/chrome/browser/chromeos/system_logs/debug_daemon_log_source.cc

@@ -15,6 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -150,13 +151,13 @@
               (*it)->username_hash()));
     }
 
-    content::BrowserThread::PostBlockingPoolTaskAndReply(
-        FROM_HERE,
-        base::Bind(&DebugDaemonLogSource::ReadUserLogFiles,
-                   user_log_files, profile_dirs, response),
+    base::PostTaskWithTraitsAndReply(
+        FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
+                       base::TaskPriority::BACKGROUND),
+        base::Bind(&DebugDaemonLogSource::ReadUserLogFiles, user_log_files,
+                   profile_dirs, response),
         base::Bind(&DebugDaemonLogSource::MergeResponse,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   base::Owned(response)));
+                   weak_ptr_factory_.GetWeakPtr(), base::Owned(response)));
   } else {
     (*response_)[kUserLogFileKeyName] = kNotAvailable;
     RequestCompleted();

diff --git a/chrome/browser/chromeos/system_logs/debug_log_writer.cc b/chrome/browser/chromeos/system_logs/debug_log_writer.cc
index 9c8a2271..e7d4b654 100644
--- a/chrome/browser/chromeos/system_logs/debug_log_writer.cc
+++ b/chrome/browser/chromeos/system_logs/debug_log_writer.cc

@@ -13,9 +13,9 @@
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/common/logging_chrome.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -195,13 +195,12 @@
   base::FilePath user_log_dir =
       logging::GetSessionLogDir(*base::CommandLine::ForCurrentProcess());
 
-  content::BrowserThread::PostBlockingPoolTask(
+  base::PostTaskWithTraits(
       FROM_HERE,
-      base::Bind(&AddUserLogsToArchive,
-                 user_log_dir,
-                 tar_file_path,
-                 compressed_output_path,
-                 callback));
+      base::TaskTraits().MayBlock().WithPriority(
+          base::TaskPriority::BACKGROUND),
+      base::Bind(&AddUserLogsToArchive, user_log_dir, tar_file_path,
+                 compressed_output_path, callback));
 }
 
 void InitializeLogFile(base::File* file,

diff --git a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
index 6a76479..d7ba8e9 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc
+++ b/chrome/browser/chromeos/system_logs/touch_log_source_ozone.cc

@@ -15,9 +15,8 @@
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/task_scheduler/post_task.h"
 #include "components/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/ozone/public/input_controller.h"
@@ -87,8 +86,6 @@
 // analysis tools.
 void PackEventLog(system_logs::SystemLogsResponse* response,
                   std::unique_ptr<std::vector<base::FilePath>> log_paths) {
-  DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-
   // Combine logs with a command line call that tars them up and uuencode the
   // result in one string. This is to be compatible with the X11 behavior.
   std::vector<std::pair<std::string, base::CommandLine>> commands;
@@ -128,8 +125,11 @@
   }
 
   // Cleanup these temporary log files.
-  BrowserThread::PostBlockingPoolTask(
-      FROM_HERE, base::Bind(CleanupEventLog, base::Passed(&log_paths)));
+  base::PostTaskWithTraits(
+      FROM_HERE,
+      base::TaskTraits().MayBlock().WithPriority(
+          base::TaskPriority::BACKGROUND),
+      base::Bind(CleanupEventLog, base::Passed(&log_paths)));
 }
 
 // Callback for handing the outcome of GetTouchEventLog().
@@ -148,8 +148,10 @@
                  base::Passed(&log_paths));
   const base::Closure callback_closure =
       base::Bind(callback, base::Owned(response.release()));
-  BrowserThread::PostBlockingPoolTaskAndReply(FROM_HERE, pack_closure,
-                                              callback_closure);
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   pack_closure, callback_closure);
 }
 
 // Callback for handing the outcome of GetTouchDeviceStatus().

diff --git a/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc b/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc
index 5cf40d1..1ff4135 100644
--- a/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc
+++ b/chrome/browser/chromeos/system_logs/touch_log_source_x11.cc

@@ -11,6 +11,7 @@
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/process/launch.h"
+#include "base/task_scheduler/post_task.h"
 #include "components/feedback/feedback_util.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -61,9 +62,11 @@
   DCHECK(!callback.is_null());
 
   SystemLogsResponse* response = new SystemLogsResponse;
-  BrowserThread::PostBlockingPoolTaskAndReply(
-      FROM_HERE, base::Bind(&GetTouchLogsX11, response),
-      base::Bind(callback, base::Owned(response)));
+  base::PostTaskWithTraitsAndReply(FROM_HERE,
+                                   base::TaskTraits().MayBlock().WithPriority(
+                                       base::TaskPriority::BACKGROUND),
+                                   base::Bind(&GetTouchLogsX11, response),
+                                   base::Bind(callback, base::Owned(response)));
 }
 
 }  // namespace system_logs

diff --git a/chrome/browser/component_updater/component_updater_utils.cc b/chrome/browser/component_updater/component_updater_utils.cc
index 49acf65..7da8bdb 100644
--- a/chrome/browser/component_updater/component_updater_utils.cc
+++ b/chrome/browser/component_updater/component_updater_utils.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/component_updater/component_updater_utils.h"
 
-#include "base/files/file_path.h"
-#include "base/path_service.h"
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include "chrome/installer/util/install_util.h"
@@ -15,9 +13,7 @@
 
 bool IsPerUserInstall() {
 #if defined(OS_WIN)
-  base::FilePath exe_path;
-  PathService::Get(base::FILE_EXE, &exe_path);
-  return InstallUtil::IsPerUserInstall(exe_path);
+  return InstallUtil::IsPerUserInstall();
 #else
   return true;
 #endif

diff --git a/chrome/browser/component_updater/ev_whitelist_component_installer.cc b/chrome/browser/component_updater/ev_whitelist_component_installer.cc
index c0bf9c9..0f4f0a0 100644
--- a/chrome/browser/component_updater/ev_whitelist_component_installer.cc
+++ b/chrome/browser/component_updater/ev_whitelist_component_installer.cc

@@ -15,6 +15,7 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/path_service.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/version.h"
 #include "components/component_updater/component_updater_paths.h"
@@ -106,11 +107,11 @@
   VLOG(1) << "Component ready, version " << version.GetString() << " in "
           << install_dir.value();
 
-  if (!content::BrowserThread::PostBlockingPoolTask(
-          FROM_HERE, base::Bind(&LoadWhitelistFromDisk,
-                                GetInstalledPath(install_dir), version))) {
-    NOTREACHED();
-  }
+  base::PostTaskWithTraits(FROM_HERE,
+                           base::TaskTraits().MayBlock().WithPriority(
+                               base::TaskPriority::BACKGROUND),
+                           base::Bind(&LoadWhitelistFromDisk,
+                                      GetInstalledPath(install_dir), version));
 }
 
 // Called during startup and installation before ComponentReady().

diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc
index 06e076a3..1f81a547 100644
--- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc

@@ -15,10 +15,10 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/path_service.h"
+#include "base/task_scheduler/post_task.h"
 #include "base/version.h"
 #include "chrome/common/safe_browsing/file_type_policies.h"
 #include "components/component_updater/component_updater_paths.h"
-#include "content/public/browser/browser_thread.h"
 
 using component_updater::ComponentUpdateService;
 
@@ -85,11 +85,11 @@
   VLOG(1) << "Component ready, version " << version.GetString() << " in "
           << install_dir.value();
 
-  if (!content::BrowserThread::PostBlockingPoolTask(
-          FROM_HERE,
-          base::Bind(&LoadFileTypesFromDisk, GetInstalledPath(install_dir)))) {
-    NOTREACHED();
-  }
+  base::PostTaskWithTraits(
+      FROM_HERE,
+      base::TaskTraits().MayBlock().WithPriority(
+          base::TaskPriority::BACKGROUND),
+      base::Bind(&LoadFileTypesFromDisk, GetInstalledPath(install_dir)));
 }
 
 // Called during startup and installation before ComponentReady().

diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 086d405d..9f79c136 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc

@@ -341,7 +341,16 @@
 
 update_client::InstallerAttributes
 FlashComponentInstallerTraits::GetInstallerAttributes() const {
-  return update_client::InstallerAttributes();
+  // For Chrome OS, send the built-in flash player version to the server,
+  // otherwise it will serve component updates of outdated flash players.
+  update_client::InstallerAttributes attrs;
+#if defined(OS_CHROMEOS)
+  const std::string flash_version =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kPpapiFlashVersion);
+  attrs["built_in_version"] = flash_version;
+#endif  // #defined(OS_CHROMEOS)
+  return attrs;
 }
 
 std::vector<std::string> FlashComponentInstallerTraits::GetMimeTypes() const {

diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc
index c558cfd..b3d32a7 100644
--- a/chrome/browser/component_updater/sw_reporter_installer_win.cc
+++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc

@@ -29,7 +29,6 @@
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
@@ -138,17 +137,7 @@
     const base::Version& version) {
   content::BrowserThread::PostAfterStartupTask(
       FROM_HERE, base::ThreadTaskRunnerHandle::Get(),
-      base::Bind(&safe_browsing::RunSwReporters, invocations, version,
-                 base::ThreadTaskRunnerHandle::Get(),
-                 // Runs LaunchAndWaitForExit() which creates (MayBlock()) and
-                 // joins (WithBaseSyncPrimitives()) a process.
-                 base::CreateTaskRunnerWithTraits(
-                     base::TaskTraits()
-                         .WithShutdownBehavior(
-                             base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
-                         .WithPriority(base::TaskPriority::BACKGROUND)
-                         .MayBlock()
-                         .WithBaseSyncPrimitives())));
+      base::Bind(&safe_browsing::RunSwReporters, invocations, version));
 }
 
 // Ensures |str| contains only alphanumeric characters and characters from

diff --git a/chrome/browser/conflicts/OWNERS b/chrome/browser/conflicts/OWNERS
index 2ffdf656..186b2df 100644
--- a/chrome/browser/conflicts/OWNERS
+++ b/chrome/browser/conflicts/OWNERS

@@ -1,2 +1,4 @@
 chrisha@chromium.org
 pmonette@chromium.org
+
+# COMPONENT: Internals>Core

diff --git a/chrome/browser/conflicts/module_database_win.cc b/chrome/browser/conflicts/module_database_win.cc
index c5a090f..399d931 100644
--- a/chrome/browser/conflicts/module_database_win.cc
+++ b/chrome/browser/conflicts/module_database_win.cc

@@ -289,9 +289,10 @@
     uint32_t module_time_date_stamp) {
   auto result = modules_.emplace(
       std::piecewise_construct,
-      std::forward_as_tuple(ModuleInfoKey(
-          module_path, module_size, module_time_date_stamp, modules_.size())),
-      std::forward_as_tuple(ModuleInfoData()));
+      std::forward_as_tuple(module_path, module_size, module_time_date_stamp,
+                            modules_.size()),
+      std::forward_as_tuple());
+
   return &(*result.first);
 }
 
@@ -320,39 +321,6 @@
   processes_.erase(key);
 }
 
-// ModuleDatabase::ModuleInfoKey -----------------------------------------------
-
-ModuleDatabase::ModuleInfoKey::ModuleInfoKey(const base::FilePath& module_path,
-                                             uint32_t module_size,
-                                             uint32_t module_time_date_stamp,
-                                             uint32_t module_id)
-    : module_path(module_path),
-      module_size(module_size),
-      module_time_date_stamp(module_time_date_stamp),
-      module_id(module_id) {}
-
-bool ModuleDatabase::ModuleInfoKey::operator<(const ModuleInfoKey& mik) const {
-  // The key consists of the triplet of
-  // (module_path, module_size, module_time_date_stamp).
-  // Use the std::tuple lexicographic comparison operator.
-  return std::make_tuple(module_path, module_size, module_time_date_stamp) <
-         std::make_tuple(mik.module_path, mik.module_size,
-                         mik.module_time_date_stamp);
-}
-
-// ModuleDatabase::CertificateInfo ---------------------------------------------
-
-ModuleDatabase::CertificateInfo::CertificateInfo() : type(NO_CERTIFICATE) {}
-
-// ModuleDatabase::ModuleInfoData ----------------------------------------------
-
-ModuleDatabase::ModuleInfoData::ModuleInfoData() : process_types(0) {}
-
-ModuleDatabase::ModuleInfoData::ModuleInfoData(const ModuleInfoData& others) =
-    default;
-
-ModuleDatabase::ModuleInfoData::~ModuleInfoData() = default;
-
 // ModuleDatabase::ProcessInfoKey ----------------------------------------------
 
 ModuleDatabase::ProcessInfoKey::ProcessInfoKey(

diff --git a/chrome/browser/conflicts/module_database_win.h b/chrome/browser/conflicts/module_database_win.h
index 6fa87b8..ef7f4e3 100644
--- a/chrome/browser/conflicts/module_database_win.h
+++ b/chrome/browser/conflicts/module_database_win.h

@@ -6,12 +6,15 @@
 #define CHROME_BROWSER_CONFLICTS_MODULE_DATABASE_WIN_H_
 
 #include <map>
+#include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner.h"
+#include "chrome/browser/conflicts/module_info_win.h"
 #include "content/public/common/process_type.h"
 
 // A class that keeps track of all modules loaded across Chrome processes.
@@ -22,23 +25,7 @@
 // be set as the process-wide singleton via SetInstance.
 class ModuleDatabase {
  public:
-  // Used as a unique identifier for a module in a ModuleSet.
-  using ModuleId = int;
-
-  // The type of certificate found for the module.
-  enum CertificateType {
-    // The module is not signed.
-    NO_CERTIFICATE,
-    // The module is signed and the certificate is in the module.
-    CERTIFICATE_IN_FILE,
-    // The module is signed and the certificate is in an external catalog.
-    CERTIFICATE_IN_CATALOG,
-  };
-
   // Structures for maintaining information about modules.
-  struct ModuleInfoKey;
-  struct CertificateInfo;
-  struct ModuleInfoData;
   using ModuleMap = std::map<ModuleInfoKey, ModuleInfoData>;
   using ModuleInfo = ModuleMap::value_type;
 
@@ -172,95 +159,6 @@
   DISALLOW_COPY_AND_ASSIGN(ModuleDatabase);
 };
 
-// Maintains information about a module. Modules are permanent once added to
-// the ModuleSet, so this structure grows monotonically. In practice this is
-// not an issue as the modules themselves are vastly bigger than the minor
-// amount of metadata tracked here.
-
-// This is the constant portion of the module information, and acts as the key
-// in a std::map.
-struct ModuleDatabase::ModuleInfoKey {
-  ModuleInfoKey(const base::FilePath& module_path,
-                uint32_t module_size,
-                uint32_t module_time_date_stamp,
-                uint32_t module_id);
-
-  // Less-than operator allowing this object to be used in std::map.
-  bool operator<(const ModuleInfoKey& mi) const;
-
-  // Full path to the module on disk. Part of the key for a ModuleInfo.
-  base::FilePath module_path;
-
-  // The module size. Part of the key for a ModuleInfo. This is taken from
-  // SizeOfImage from the module's IMAGE_OPTIONAL_HEADER.
-  uint32_t module_size;
-
-  // The module time date stamp. Part of the key for a ModuleInfo. Taken from
-  // TimeDateStamp from the module's IMAGE_FILE_HEADER.
-  uint32_t module_time_date_stamp;
-
-  // The ID of this module. This is a strictly incrementing value, and is used
-  // to tie a module to the list of running processes in which it is found.
-  // It is not part of the key for the module, but it is immutable. This is
-  // simply the index of the module in the insertion order.
-  ModuleId module_id;
-};
-
-// Information about the certificate of a file.
-struct ModuleDatabase::CertificateInfo {
-  CertificateInfo();
-
-  // The type of signature encountered.
-  CertificateType type;
-
-  // Path to the file containing the certificate. Empty if |type| is
-  // NO_CERTIFICATE.
-  base::FilePath path;
-
-  // The "Subject" name of the certificate. This is the signer (ie,
-  // "Google Inc." or "Microsoft Inc.").
-  base::string16 subject;
-};
-
-// This is the mutable portion of the module information, and is the storage
-// type in a std::map.
-struct ModuleDatabase::ModuleInfoData {
-  ModuleInfoData();
-  ModuleInfoData(const ModuleInfoData& others);
-  ~ModuleInfoData();
-
-  // Set of all process types in which this module has been seen (may not be
-  // currently present in a process of that type). This is a conversion of
-  // ProcessType enumeration to a bitfield. See "ProcessTypeToBit" and
-  // "BitIndexToProcessType" for details.
-  uint32_t process_types;
-
-  // The following pieces of information are determined via a detailed
-  // inspection of the module. This is relatively expensive and uses blocking
-  // IO, so is performed in a background task.
-
-  // The module path, not including the basename. This is cleaned and normalized
-  // so that common paths are converted to their environment variable mappings
-  // (ie, %systemroot%). This makes i18n localized paths easily comparable.
-  base::string16 location;
-
-  // The basename of the module.
-  base::string16 basename;
-
-  // The name of the product the module belongs to.
-  base::string16 product_name;
-
-  // The module file description.
-  base::string16 description;
-
-  // The module version. This is usually in the form a.b.c.d (where a, b, c and
-  // d are integers), but may also have fewer than 4 components.
-  base::string16 version;
-
-  // The certificate info for the module.
-  CertificateInfo certificate_info;
-};
-
 // Information about a running process. This ties modules in a ModuleSet to
 // processes in which they are (or have been) loaded.
 

diff --git a/chrome/browser/conflicts/module_database_win_unittest.cc b/chrome/browser/conflicts/module_database_win_unittest.cc
index a5c3c17..0b4555b 100644
--- a/chrome/browser/conflicts/module_database_win_unittest.cc
+++ b/chrome/browser/conflicts/module_database_win_unittest.cc

@@ -62,7 +62,6 @@
 class TestModuleDatabase : ModuleDatabase {
  public:
   // Types.
-  using ModuleDatabase::ModuleId;
   using ModuleDatabase::ModuleLoadAddresses;
 
   // Constants.
@@ -102,7 +101,7 @@
   // Counts the occurrences of the given |module_id| in the given collection of
   // |load_addresses|.
   static size_t ModuleIdCount(
-      ModuleDatabase::ModuleId module_id,
+      ModuleId module_id,
       const ModuleDatabase::ModuleLoadAddresses& load_addresses) {
     return std::count_if(
         load_addresses.begin(), load_addresses.end(),
@@ -280,7 +279,7 @@
 
     // Generate a shuffled list of IDs. This will be the insertion order.
     // More insertions than elements will occur so that rewrites occur.,
-    std::vector<TMD::ModuleId> ids(11 * n / 10);
+    std::vector<ModuleId> ids(11 * n / 10);
     for (size_t i = 0; i < 11 * n / 10; ++i)
       ids[i] = i % n;
     std::random_shuffle(ids.begin(), ids.end());

diff --git a/chrome/browser/conflicts/module_info_util_win.cc b/chrome/browser/conflicts/module_info_util_win.cc
index 2c6c5995..01b30b2 100644
--- a/chrome/browser/conflicts/module_info_util_win.cc
+++ b/chrome/browser/conflicts/module_info_util_win.cc

@@ -4,6 +4,8 @@
 
 #include "chrome/browser/conflicts/module_info_util_win.h"
 
+#include <windows.h>
+
 #include <tlhelp32.h>
 #include <wincrypt.h>
 #include <wintrust.h>
@@ -11,6 +13,9 @@
 // This must be after wincrypt and wintrust.
 #include <mscat.h>
 
+#include <memory>
+#include <vector>
+
 #include "base/scoped_generic.h"
 #include "base/win/scoped_handle.h"
 
@@ -146,7 +151,7 @@
 // Extracts the subject name and catalog path if the provided file is present in
 // a catalog file.
 void GetCatalogCertificateInfo(const base::FilePath& filename,
-                               ModuleDatabase::CertificateInfo* cert_info) {
+                               CertificateInfo* certificate_info) {
   // Get a crypt context for signature verification.
   ScopedCryptCATContext context;
   {
@@ -202,30 +207,34 @@
   if (subject.empty())
     return;
 
-  cert_info->type = ModuleDatabase::CERTIFICATE_IN_CATALOG;
-  cert_info->path = catalog_path;
-  cert_info->subject = subject;
+  certificate_info->type = CertificateType::CERTIFICATE_IN_CATALOG;
+  certificate_info->path = catalog_path;
+  certificate_info->subject = subject;
 }
 
 }  // namespace
 
+// ModuleDatabase::CertificateInfo ---------------------------------------------
+
+CertificateInfo::CertificateInfo() : type(CertificateType::NO_CERTIFICATE) {}
+
 // Extracts information about the certificate of the given file, if any is
 // found.
 void GetCertificateInfo(const base::FilePath& filename,
-                        ModuleDatabase::CertificateInfo* cert_info) {
-  DCHECK_EQ(ModuleDatabase::NO_CERTIFICATE, cert_info->type);
-  DCHECK(cert_info->path.empty());
-  DCHECK(cert_info->subject.empty());
+                        CertificateInfo* certificate_info) {
+  DCHECK_EQ(CertificateType::NO_CERTIFICATE, certificate_info->type);
+  DCHECK(certificate_info->path.empty());
+  DCHECK(certificate_info->subject.empty());
 
-  GetCatalogCertificateInfo(filename, cert_info);
-  if (cert_info->type == ModuleDatabase::CERTIFICATE_IN_CATALOG)
+  GetCatalogCertificateInfo(filename, certificate_info);
+  if (certificate_info->type == CertificateType::CERTIFICATE_IN_CATALOG)
     return;
 
   base::string16 subject = GetSubjectNameInFile(filename);
   if (subject.empty())
     return;
 
-  cert_info->type = ModuleDatabase::CERTIFICATE_IN_FILE;
-  cert_info->path = filename;
-  cert_info->subject = subject;
+  certificate_info->type = CertificateType::CERTIFICATE_IN_FILE;
+  certificate_info->path = filename;
+  certificate_info->subject = subject;
 }

diff --git a/chrome/browser/conflicts/module_info_util_win.h b/chrome/browser/conflicts/module_info_util_win.h
index ba754f6..9b3e518 100644
--- a/chrome/browser/conflicts/module_info_util_win.h
+++ b/chrome/browser/conflicts/module_info_util_win.h

@@ -5,11 +5,39 @@
 #ifndef CHROME_BROWSER_CONFLICTS_MODULE_INFO_UTIL_WIN_H_
 #define CHROME_BROWSER_CONFLICTS_MODULE_INFO_UTIL_WIN_H_
 
-#include "chrome/browser/conflicts/module_database_win.h"
+#include "base/files/file_path.h"
+#include "base/strings/string16.h"
+
+// The type of certificate found for the module.
+enum class CertificateType {
+  // The module is not signed.
+  NO_CERTIFICATE,
+  // The module is signed and the certificate is in the module.
+  CERTIFICATE_IN_FILE,
+  // The module is signed and the certificate is in an external catalog.
+  CERTIFICATE_IN_CATALOG,
+};
+
+// Information about the certificate of a file.
+struct CertificateInfo {
+  CertificateInfo();
+
+  // The type of signature encountered.
+  CertificateType type;
+
+  // Path to the file containing the certificate. Empty if |type| is
+  // NO_CERTIFICATE.
+  base::FilePath path;
+
+  // The "Subject" name of the certificate. This is the signer (ie,
+  // "Google Inc." or "Microsoft Inc.").
+  base::string16 subject;
+};
 
 // Extracts information about the certificate of the given |file|, populating
-// |cert_info|. It is expected that |cert_info| be freshly constructed.
+// |certificate_info|. It is expected that |certificate_info| be freshly
+// constructed.
 void GetCertificateInfo(const base::FilePath& file,
-                        ModuleDatabase::CertificateInfo* cert_info);
+                        CertificateInfo* certificate_info);
 
 #endif  // CHROME_BROWSER_CONFLICTS_MODULE_INFO_UTIL_WIN_H_

diff --git a/chrome/browser/conflicts/module_info_util_win_unittest.cc b/chrome/browser/conflicts/module_info_util_win_unittest.cc
index f713bd1..4de2a22 100644
--- a/chrome/browser/conflicts/module_info_util_win_unittest.cc
+++ b/chrome/browser/conflicts/module_info_util_win_unittest.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/conflicts/module_info_util_win.h"
 
 #include <memory>
+#include <string>
 
 #include "base/base_paths.h"
 #include "base/environment.h"
@@ -13,17 +14,17 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(ModuleInfoUtil, GetCertificateInfoUnsigned) {
+TEST(ModuleInfoUtilTest, GetCertificateInfoUnsigned) {
   base::FilePath path;
   ASSERT_TRUE(base::PathService::Get(base::FILE_EXE, &path));
-  ModuleDatabase::CertificateInfo cert_info;
+  CertificateInfo cert_info;
   GetCertificateInfo(path, &cert_info);
-  EXPECT_EQ(ModuleDatabase::NO_CERTIFICATE, cert_info.type);
+  EXPECT_EQ(CertificateType::NO_CERTIFICATE, cert_info.type);
   EXPECT_TRUE(cert_info.path.empty());
   EXPECT_TRUE(cert_info.subject.empty());
 }
 
-TEST(ModuleInfoUtil, GetCertificateInfoSigned) {
+TEST(ModuleInfoUtilTest, GetCertificateInfoSigned) {
   std::unique_ptr<base::Environment> env = base::Environment::Create();
   std::string sysroot;
   ASSERT_TRUE(env->GetVar("SYSTEMROOT", &sysroot));
@@ -31,9 +32,9 @@
   base::FilePath path =
       base::FilePath::FromUTF8Unsafe(sysroot).Append(L"system32\\kernel32.dll");
 
-  ModuleDatabase::CertificateInfo cert_info;
+  CertificateInfo cert_info;
   GetCertificateInfo(path, &cert_info);
-  EXPECT_NE(ModuleDatabase::NO_CERTIFICATE, cert_info.type);
+  EXPECT_NE(CertificateType::NO_CERTIFICATE, cert_info.type);
   EXPECT_FALSE(cert_info.path.empty());
   EXPECT_FALSE(cert_info.subject.empty());
 }

diff --git a/chrome/browser/conflicts/module_info_win.cc b/chrome/browser/conflicts/module_info_win.cc
new file mode 100644
index 0000000..3b82030
--- /dev/null
+++ b/chrome/browser/conflicts/module_info_win.cc

@@ -0,0 +1,33 @@
+// Copyright 2017 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 "chrome/browser/conflicts/module_info_win.h"
+
+// ModuleInfoKey ---------------------------------------------------------------
+
+ModuleInfoKey::ModuleInfoKey(const base::FilePath& module_path,
+                             uint32_t module_size,
+                             uint32_t module_time_date_stamp,
+                             uint32_t module_id)
+    : module_path(module_path),
+      module_size(module_size),
+      module_time_date_stamp(module_time_date_stamp),
+      module_id(module_id) {}
+
+bool ModuleInfoKey::operator<(const ModuleInfoKey& mik) const {
+  // The key consists of the triplet of
+  // (module_path, module_size, module_time_date_stamp).
+  // Use the std::tuple lexicographic comparison operator.
+  return std::make_tuple(module_path, module_size, module_time_date_stamp) <
+         std::make_tuple(mik.module_path, mik.module_size,
+                         mik.module_time_date_stamp);
+}
+
+// ModuleInfoData --------------------------------------------------------------
+
+ModuleInfoData::ModuleInfoData() : process_types(0) {}
+
+ModuleInfoData::ModuleInfoData(const ModuleInfoData& others) = default;
+
+ModuleInfoData::~ModuleInfoData() = default;

diff --git a/chrome/browser/conflicts/module_info_win.h b/chrome/browser/conflicts/module_info_win.h
new file mode 100644
index 0000000..368bfd7
--- /dev/null
+++ b/chrome/browser/conflicts/module_info_win.h

@@ -0,0 +1,85 @@
+// Copyright 2017 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 CHROME_BROWSER_CONFLICTS_MODULE_INFO_WIN_H_
+#define CHROME_BROWSER_CONFLICTS_MODULE_INFO_WIN_H_
+
+#include "base/files/file_path.h"
+#include "chrome/browser/conflicts/module_info_util_win.h"
+
+// ModuleInfoKey and ModuleInfoData are used in pair by the ModuleDatabase to
+// maintain information about a module, usually in a std::map.
+
+// Used by the ModuleDatabase as a unique identifier for a module.
+using ModuleId = int;
+
+// This is the constant portion of the module information, and is used to
+// uniquely identify one.
+struct ModuleInfoKey {
+  ModuleInfoKey(const base::FilePath& module_path,
+                uint32_t module_size,
+                uint32_t module_time_date_stamp,
+                uint32_t module_id);
+
+  // Less-than operator allowing this object to be used in std::map.
+  bool operator<(const ModuleInfoKey& mi) const;
+
+  // Full path to the module on disk. Part of the key for a ModuleInfo.
+  base::FilePath module_path;
+
+  // The module size. Part of the key for a ModuleInfo. This is taken from
+  // SizeOfImage from the module's IMAGE_OPTIONAL_HEADER.
+  uint32_t module_size;
+
+  // The module time date stamp. Part of the key for a ModuleInfo. Taken from
+  // TimeDateStamp from the module's IMAGE_FILE_HEADER.
+  uint32_t module_time_date_stamp;
+
+  // The ID of this module. This is a strictly incrementing value, and is used
+  // by the ModuleDatabase to tie a module to the list of running processes in
+  // which it is found. It is not part of the key for the module, but it is
+  // immutable. This is simply the index of the module in the insertion order.
+  ModuleId module_id;
+};
+
+// Holds more detailed information about a given module. Because most of this
+// information is expensive to gather and require disk access, it should be
+// collected on a task runner that allow blocking.
+struct ModuleInfoData {
+  ModuleInfoData();
+  ModuleInfoData(const ModuleInfoData& others);
+  ~ModuleInfoData();
+
+  // Set of all process types in which this module has been seen (may not be
+  // currently present in a process of that type). This is a conversion of
+  // ProcessType enumeration to a bitfield. See "ProcessTypeToBit" and
+  // "BitIndexToProcessType" for details.
+  uint32_t process_types;
+
+  // The following pieces of information are determined via a detailed
+  // inspection of the module.
+
+  // The module path, not including the basename. This is cleaned and normalized
+  // so that common paths are converted to their environment variable mappings
+  // (ie, %systemroot%). This makes i18n localized paths easily comparable.
+  base::string16 location;
+
+  // The basename of the module.
+  base::string16 basename;
+
+  // The name of the product the module belongs to.
+  base::string16 product_name;
+
+  // The module file description.
+  base::string16 description;
+
+  // The module version. This is usually in the form a.b.c.d (where a, b, c and
+  // d are integers), but may also have fewer than 4 components.
+  base::string16 version;
+
+  // The certificate info for the module.
+  CertificateInfo certificate_info;
+};
+
+#endif  // CHROME_BROWSER_CONFLICTS_MODULE_INFO_WIN_H_

diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index dc79a45..65d486fe 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

@@ -224,7 +224,7 @@
 
   // Check that last_used data has been deleted.
   EXPECT_TRUE(prefs->GetDictionary(kGeolocationPrefPath)->empty());
-  auto mic_prefs = prefs->GetDictionary(kMicPrefPath);
+  auto* mic_prefs = prefs->GetDictionary(kMicPrefPath);
   const base::DictionaryValue* mic_result_pattern_data;
   ASSERT_TRUE(mic_prefs->GetDictionaryWithoutPathExpansion(
       kPattern, &mic_result_pattern_data));

diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index 5b2a92b9..bc953c1 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc

@@ -90,12 +90,7 @@
 
   bool ExecuteImpl(DiagnosticsModel::Observer* observer) override {
 #if defined(OS_WIN)
-    base::FilePath chrome_exe;
-    if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-      RecordFailure(DIAG_RECON_INSTALL_PATH_PROVIDER, "Path provider failure");
-      return false;
-    }
-    user_level_ = InstallUtil::IsPerUserInstall(chrome_exe);
+    user_level_ = InstallUtil::IsPerUserInstall();
     const char* type = user_level_ ? "User Level" : "System Level";
     std::string install_type(type);
 #else

diff --git a/chrome/browser/diagnostics/recon_diagnostics.h b/chrome/browser/diagnostics/recon_diagnostics.h
index c94c368..df28dfc7 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.h
+++ b/chrome/browser/diagnostics/recon_diagnostics.h

@@ -18,7 +18,7 @@
   DIAG_RECON_PRE_WINDOW_XP_SP2,
 
   // InstallTypeTest
-  DIAG_RECON_INSTALL_PATH_PROVIDER,
+  DIAG_RECON_INSTALL_PATH_PROVIDER_OBSOLETE,  // Retained to preserve numbering.
 
   // VersionTest
   DIAG_RECON_NO_VERSION,

diff --git a/chrome/browser/downgrade/OWNER b/chrome/browser/downgrade/OWNER
deleted file mode 100644
index 975e914..0000000
--- a/chrome/browser/downgrade/OWNER
+++ /dev/null

@@ -1 +0,0 @@
-georgesak@chromium.org

diff --git a/chrome/browser/downgrade/OWNERS b/chrome/browser/downgrade/OWNERS
new file mode 100644
index 0000000..fcf1b41
--- /dev/null
+++ b/chrome/browser/downgrade/OWNERS

@@ -0,0 +1,2 @@
+georgesak@chromium.org
+zmin@chromium.org

diff --git a/chrome/browser/downgrade/user_data_downgrade.cc b/chrome/browser/downgrade/user_data_downgrade.cc
index 485912c..7438365 100644
--- a/chrome/browser/downgrade/user_data_downgrade.cc
+++ b/chrome/browser/downgrade/user_data_downgrade.cc

@@ -103,16 +103,10 @@
   DeleteAllRenamedUserDirectories(disk_cache_dir);
 }
 
-enum InstallLevel { SYSTEM_INSTALL, USER_INSTALL, UNKNOWN };
+enum InstallLevel { SYSTEM_INSTALL, USER_INSTALL };
 
 InstallLevel GetInstallLevel() {
-  base::FilePath cur_chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &cur_chrome_exe))
-    return UNKNOWN;
-  if (InstallUtil::IsPerUserInstall(cur_chrome_exe))
-    return USER_INSTALL;
-  else
-    return SYSTEM_INSTALL;
+  return InstallUtil::IsPerUserInstall() ? USER_INSTALL : SYSTEM_INSTALL;
 }
 
 }  // namespace
@@ -127,8 +121,6 @@
   if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
     return;
   InstallLevel install_level = GetInstallLevel();
-  if (install_level == UNKNOWN)
-    return;
   base::Version current_version(chrome::kChromeVersion);
   base::Version downgrade_version = InstallUtil::GetDowngradeVersion(
       install_level == SYSTEM_INSTALL, BrowserDistribution::GetDistribution());
@@ -182,8 +174,7 @@
   InstallLevel install_level = GetInstallLevel();
   base::win::RegKey key;
   DWORD is_msi = 3;
-  return install_level != UNKNOWN &&
-         key.Open((install_level == SYSTEM_INSTALL) ? HKEY_LOCAL_MACHINE
+  return key.Open((install_level == SYSTEM_INSTALL) ? HKEY_LOCAL_MACHINE
                                                     : HKEY_CURRENT_USER,
                   BrowserDistribution::GetDistribution()->GetStateKey().c_str(),
                   KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS &&

diff --git a/chrome/browser/download/OWNERS b/chrome/browser/download/OWNERS
index f2c44aba..eb1546d8 100644
--- a/chrome/browser/download/OWNERS
+++ b/chrome/browser/download/OWNERS

@@ -4,3 +4,5 @@
 
 per-file download_dir_policy_handler*=atwilson@chromium.org
 per-file download_request_limiter*=dominickn@chromium.org
+
+# COMPONENT: UI>Browser>Downloads

diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index a8f8f84..5d3552f6 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc

@@ -68,7 +68,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/content/browser/download_conversions.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_service.h"

diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc
index f0865e2..c1f0721 100644
--- a/chrome/browser/download/download_history.cc
+++ b/chrome/browser/download/download_history.cc

@@ -33,7 +33,7 @@
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/download/download_crx_util.h"
-#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/content/browser/download_conversions.h"
 #include "components/history/core/browser/download_database.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_service.h"
@@ -96,6 +96,7 @@
   // order to save memory.
   history::DownloadRow* info() { return info_.get(); }
   void set_info(const history::DownloadRow& i) {
+    // TODO(qinmin): avoid creating a new copy each time.
     info_.reset(new history::DownloadRow(i));
   }
   void clear_info() {
@@ -141,8 +142,7 @@
       std::string(),  // Hash value (not available yet)
       history::ToHistoryDownloadId(item->GetId()), item->GetGuid(),
       item->GetOpened(), by_ext_id, by_ext_name,
-      // TODO(qinmin): get the slice information.
-      std::vector<history::DownloadSliceInfo>());
+      history::GetHistoryDownloadSliceInfos(*item));
 }
 
 enum class ShouldUpdateHistoryResult {
@@ -179,7 +179,8 @@
       (previous->hash != current.hash) ||
       (previous->opened != current.opened) ||
       (previous->by_ext_id != current.by_ext_id) ||
-      (previous->by_ext_name != current.by_ext_name)) {
+      (previous->by_ext_name != current.by_ext_name) ||
+      (previous->download_slice_info != current.download_slice_info)) {
     return ShouldUpdateHistoryResult::UPDATE;
   }
 
@@ -297,7 +298,7 @@
         history::ToContentDownloadState(it->state),
         history::ToContentDownloadDangerType(it->danger_type),
         history::ToContentDownloadInterruptReason(it->interrupt_reason),
-        it->opened);
+        it->opened, history::ToContentReceivedSlices(it->download_slice_info));
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     if (!it->by_ext_id.empty() && !it->by_ext_name.empty()) {
       new extensions::DownloadedByExtension(

diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc
index 24b1b4bf..66276599 100644
--- a/chrome/browser/download/download_history_unittest.cc
+++ b/chrome/browser/download/download_history_unittest.cc

@@ -15,7 +15,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
-#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/content/browser/download_conversions.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_service.h"
@@ -235,7 +235,8 @@
           history::ToContentDownloadState(row.state),
           history::ToContentDownloadDangerType(row.danger_type),
           history::ToContentDownloadInterruptReason(row.interrupt_reason),
-          row.opened);
+          row.opened,
+          history::ToContentReceivedSlices(row.download_slice_info));
       EXPECT_CALL(manager(), MockCreateDownloadItem(adapter))
         .WillOnce(DoAll(
             InvokeWithoutArgs(
@@ -347,7 +348,8 @@
              "abc", 100, 100, state,
              content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
              content::DOWNLOAD_INTERRUPT_REASON_NONE, false, std::string(),
-             std::string(), info);
+             std::string(), std::vector<content::DownloadItem::ReceivedSlice>(),
+             info);
   }
 
   void InitItem(const std::string& guid,
@@ -373,6 +375,8 @@
                 bool opened,
                 const std::string& by_extension_id,
                 const std::string& by_extension_name,
+                const std::vector<content::DownloadItem::ReceivedSlice>&
+                    received_slices,
                 history::DownloadRow* info) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -433,6 +437,8 @@
         .WillRepeatedly(ReturnRefOfCopy(last_modified));
     EXPECT_CALL(item(index), GetReceivedBytes())
         .WillRepeatedly(Return(received_bytes));
+    EXPECT_CALL(item(index), GetReceivedSlices())
+        .WillRepeatedly(ReturnRefOfCopy(received_slices));
     EXPECT_CALL(item(index), GetTotalBytes())
         .WillRepeatedly(Return(total_bytes));
     EXPECT_CALL(item(index), GetState()).WillRepeatedly(Return(state));
@@ -452,6 +458,9 @@
         &item(index), by_extension_id, by_extension_name);
 #endif
 
+    info->download_slice_info = history::GetHistoryDownloadSliceInfos(
+        item(index));
+
     std::vector<content::DownloadItem*> items;
     for (size_t i = 0; i < items_.size(); ++i) {
       items.push_back(&item(i));
@@ -692,6 +701,16 @@
   item(0).NotifyObserversDownloadUpdated();
   ExpectDownloadUpdated(info, false);
 
+  // received slices
+  std::vector<content::DownloadItem::ReceivedSlice> slices;
+  slices.push_back(content::DownloadItem::ReceivedSlice(0, 100));
+  slices.push_back(content::DownloadItem::ReceivedSlice(1000, 500));
+  EXPECT_CALL(item(0), GetReceivedSlices()).WillRepeatedly(
+      ReturnRefOfCopy(slices));
+  info.download_slice_info = history::GetHistoryDownloadSliceInfos(item(0));
+  item(0).NotifyObserversDownloadUpdated();
+  ExpectDownloadUpdated(info, false);
+
   // total_bytes
   EXPECT_CALL(item(0), GetTotalBytes()).WillRepeatedly(Return(102));
   info.total_bytes = 102;

diff --git a/chrome/browser/download/download_ui_controller_unittest.cc b/chrome/browser/download/download_ui_controller_unittest.cc
index cf06d70..b77cf64 100644
--- a/chrome/browser/download/download_ui_controller_unittest.cc
+++ b/chrome/browser/download/download_ui_controller_unittest.cc

@@ -234,6 +234,8 @@
   EXPECT_CALL(*item, GetLastReason())
       .WillRepeatedly(Return(content::DOWNLOAD_INTERRUPT_REASON_NONE));
   EXPECT_CALL(*item, GetReceivedBytes()).WillRepeatedly(Return(0));
+  EXPECT_CALL(*item, GetReceivedSlices()).WillRepeatedly(
+      ReturnRefOfCopy(std::vector<content::DownloadItem::ReceivedSlice>()));
   EXPECT_CALL(*item, GetTotalBytes()).WillRepeatedly(Return(0));
   EXPECT_CALL(*item, GetTargetDisposition()).WillRepeatedly(
       Return(content::DownloadItem::TARGET_DISPOSITION_OVERWRITE));

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 7e1814b..fa5f9b65 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn

@@ -72,7 +72,6 @@
     "api/autofill_private/autofill_private_event_router_factory.h",
     "api/autofill_private/autofill_util.cc",
     "api/autofill_private/autofill_util.h",
-    "api/automation_internal/automation_action_adapter.h",
     "api/automation_internal/automation_event_router.cc",
     "api/automation_internal/automation_event_router.h",
     "api/automation_internal/automation_internal_api.cc",
@@ -828,6 +827,7 @@
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:chrome_unscaled_resources",
     "//chrome/app/theme:theme_resources",
+    "//chrome/app/vector_icons",
     "//chrome/browser/devtools",
     "//chrome/browser/media/router",
     "//chrome/common",

diff --git a/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h b/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h
deleted file mode 100644
index a5323cd9..0000000
--- a/chrome/browser/extensions/api/automation_internal/automation_action_adapter.h
+++ /dev/null

@@ -1,28 +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 CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_ACTION_ADAPTER_H_
-#define CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_ACTION_ADAPTER_H_
-
-#include <stdint.h>
-
-#include "ui/accessibility/ax_enums.h"
-#include "ui/gfx/geometry/point.h"
-
-namespace ui {
-struct AXActionData;
-}
-
-namespace extensions {
-
-// Adapts an object to receive actions from the Automation extension API.
-class AutomationActionAdapter {
- public:
-  // Performs an action on the target node.
-  virtual void PerformAction(const ui::AXActionData& data) = 0;
-};
-
-}  // namespace extensions
-
-#endif  // CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_ACTION_ADAPTER_H_

diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
index ccaf89d..823afdd 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc

@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
@@ -13,7 +14,6 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ -39,6 +39,8 @@
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ui/accessibility/ax_action_data.h"
+#include "ui/accessibility/ax_host_delegate.h"
+#include "ui/accessibility/ax_tree_id_registry.h"
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
@@ -155,25 +157,6 @@
                                                       &unused_error);
 }
 
-// Helper class that implements an action adapter for a |RenderFrameHost|.
-class RenderFrameHostActionAdapter : public AutomationActionAdapter {
- public:
-  explicit RenderFrameHostActionAdapter(content::RenderFrameHost* rfh)
-      : rfh_(rfh) {}
-
-  virtual ~RenderFrameHostActionAdapter() {}
-
-  // AutomationActionAdapter implementation.
-  void PerformAction(const ui::AXActionData& data) override {
-    rfh_->AccessibilityPerformAction(data);
-  }
-
- private:
-  content::RenderFrameHost* rfh_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderFrameHostActionAdapter);
-};
-
 }  // namespace
 
 // Helper class that receives accessibility data from |WebContents|.
@@ -345,6 +328,63 @@
 }
 
 ExtensionFunction::ResponseAction
+AutomationInternalPerformActionFunction::ConvertToAXActionData(
+    api::automation_internal::PerformAction::Params* params,
+    ui::AXActionData* action) {
+  action->target_node_id = params->args.automation_node_id;
+  switch (params->args.action_type) {
+    case api::automation_internal::ACTION_TYPE_DODEFAULT:
+      action->action = ui::AX_ACTION_DO_DEFAULT;
+      break;
+    case api::automation_internal::ACTION_TYPE_FOCUS:
+      action->action = ui::AX_ACTION_FOCUS;
+      break;
+    case api::automation_internal::ACTION_TYPE_GETIMAGEDATA: {
+      api::automation_internal::GetImageDataParams get_image_data_params;
+      EXTENSION_FUNCTION_VALIDATE(
+          api::automation_internal::GetImageDataParams::Populate(
+              params->opt_args.additional_properties, &get_image_data_params));
+      action->action = ui::AX_ACTION_GET_IMAGE_DATA;
+      action->target_rect = gfx::Rect(0, 0, get_image_data_params.max_width,
+                                      get_image_data_params.max_height);
+      break;
+    }
+    case api::automation_internal::ACTION_TYPE_MAKEVISIBLE:
+      action->action = ui::AX_ACTION_SCROLL_TO_MAKE_VISIBLE;
+      break;
+    case api::automation_internal::ACTION_TYPE_SETSELECTION: {
+      api::automation_internal::SetSelectionParams selection_params;
+      EXTENSION_FUNCTION_VALIDATE(
+          api::automation_internal::SetSelectionParams::Populate(
+              params->opt_args.additional_properties, &selection_params));
+      action->anchor_node_id = params->args.automation_node_id;
+      action->anchor_offset = selection_params.anchor_offset;
+      action->focus_node_id = selection_params.focus_node_id;
+      action->focus_offset = selection_params.focus_offset;
+      action->action = ui::AX_ACTION_SET_SELECTION;
+      break;
+    }
+    case api::automation_internal::ACTION_TYPE_SHOWCONTEXTMENU: {
+      action->action = ui::AX_ACTION_SHOW_CONTEXT_MENU;
+      break;
+    }
+    case api::automation_internal::ACTION_TYPE_SETACCESSIBILITYFOCUS: {
+      action->action = ui::AX_ACTION_SET_ACCESSIBILITY_FOCUS;
+      break;
+    }
+    case api::automation_internal::
+        ACTION_TYPE_SETSEQUENTIALFOCUSNAVIGATIONSTARTINGPOINT: {
+      action->action =
+          ui::AX_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT;
+      break;
+    }
+    default:
+      NOTREACHED();
+  }
+  return RespondNow(NoArguments());
+}
+
+ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::Run() {
   const AutomationInfo* automation_info = AutomationInfo::Get(extension());
   EXTENSION_FUNCTION_VALIDATE(automation_info && automation_info->interact);
@@ -352,11 +392,14 @@
   using api::automation_internal::PerformAction::Params;
   std::unique_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
-
-  if (params->args.tree_id == api::automation::kDesktopTreeID) {
+  ui::AXTreeIDRegistry* registry = ui::AXTreeIDRegistry::GetInstance();
+  ui::AXHostDelegate* delegate =
+      registry->GetHostDelegate(params->args.tree_id);
+  if (delegate) {
 #if defined(USE_AURA)
-    return RouteActionToAdapter(params.get(),
-                                AutomationManagerAura::GetInstance());
+    ui::AXActionData data;
+    ConvertToAXActionData(params.get(), &data);
+    delegate->PerformAction(data);
 #else
     NOTREACHED();
     return RespondNow(Error("Unexpected action on desktop automation tree;"
@@ -397,76 +440,11 @@
     session->Suspend(content::MediaSession::SuspendType::SYSTEM);
     return RespondNow(NoArguments());
   }
-
-  RenderFrameHostActionAdapter adapter(rfh);
-  return RouteActionToAdapter(params.get(), &adapter);
-}
-
-ExtensionFunction::ResponseAction
-AutomationInternalPerformActionFunction::RouteActionToAdapter(
-    api::automation_internal::PerformAction::Params* params,
-    AutomationActionAdapter* adapter) {
-  ui::AXActionData action;
-  action.target_node_id = params->args.automation_node_id;
-  switch (params->args.action_type) {
-    case api::automation_internal::ACTION_TYPE_DODEFAULT:
-      action.action = ui::AX_ACTION_DO_DEFAULT;
-      adapter->PerformAction(action);
-      break;
-    case api::automation_internal::ACTION_TYPE_FOCUS:
-      action.action = ui::AX_ACTION_FOCUS;
-      adapter->PerformAction(action);
-      break;
-    case api::automation_internal::ACTION_TYPE_GETIMAGEDATA: {
-      api::automation_internal::GetImageDataParams get_image_data_params;
-      EXTENSION_FUNCTION_VALIDATE(
-          api::automation_internal::GetImageDataParams::Populate(
-              params->opt_args.additional_properties, &get_image_data_params));
-      action.action = ui::AX_ACTION_GET_IMAGE_DATA;
-      action.target_rect = gfx::Rect(
-          0, 0, get_image_data_params.max_width,
-          get_image_data_params.max_height);
-      adapter->PerformAction(action);
-      break;
-    }
-    case api::automation_internal::ACTION_TYPE_MAKEVISIBLE:
-      action.action = ui::AX_ACTION_SCROLL_TO_MAKE_VISIBLE;
-      adapter->PerformAction(action);
-      break;
-    case api::automation_internal::ACTION_TYPE_SETSELECTION: {
-      api::automation_internal::SetSelectionParams selection_params;
-      EXTENSION_FUNCTION_VALIDATE(
-          api::automation_internal::SetSelectionParams::Populate(
-              params->opt_args.additional_properties, &selection_params));
-      action.anchor_node_id = params->args.automation_node_id;
-      action.anchor_offset = selection_params.anchor_offset;
-      action.focus_node_id = selection_params.focus_node_id;
-      action.focus_offset = selection_params.focus_offset;
-      action.action = ui::AX_ACTION_SET_SELECTION;
-      adapter->PerformAction(action);
-      break;
-    }
-    case api::automation_internal::ACTION_TYPE_SHOWCONTEXTMENU: {
-      action.action = ui::AX_ACTION_SHOW_CONTEXT_MENU;
-      adapter->PerformAction(action);
-      break;
-    }
-    case api::automation_internal::ACTION_TYPE_SETACCESSIBILITYFOCUS: {
-      action.action = ui::AX_ACTION_SET_ACCESSIBILITY_FOCUS;
-      adapter->PerformAction(action);
-      break;
-    }
-    case api::automation_internal::
-        ACTION_TYPE_SETSEQUENTIALFOCUSNAVIGATIONSTARTINGPOINT: {
-      action.action =
-          ui::AX_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT;
-      adapter->PerformAction(action);
-      break;
-    }
-    default:
-      NOTREACHED();
-  }
-  return RespondNow(NoArguments());
+  ui::AXActionData data;
+  ExtensionFunction::ResponseAction result =
+      ConvertToAXActionData(params.get(), &data);
+  rfh->AccessibilityPerformAction(data);
+  return result;
 }
 
 ExtensionFunction::ResponseAction
@@ -505,14 +483,12 @@
   std::unique_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  if (params->args.tree_id == api::automation::kDesktopTreeID) {
-    return RespondNow(
-        Error("domQuerySelector queries may not be used on the desktop."));
-  }
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromAXTreeID(params->args.tree_id);
-  if (!rfh)
-    return RespondNow(Error("domQuerySelector query sent on destroyed tree."));
+  if (!rfh) {
+    return RespondNow(
+        Error("domQuerySelector query sent on non-web or destroyed tree."));
+  }
 
   content::WebContents* contents =
       content::WebContents::FromRenderFrameHost(rfh);

diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.h b/chrome/browser/extensions/api/automation_internal/automation_internal_api.h
index 9e651751..ffce688 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.h
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.h

@@ -5,12 +5,13 @@
 #ifndef CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_INTERNAL_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_AUTOMATION_INTERNAL_AUTOMATION_INTERNAL_API_H_
 
+#include <string>
+
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace extensions {
-class AutomationActionAdapter;
 
 namespace api {
 namespace automation_internal {
@@ -21,6 +22,10 @@
 }  // namespace api
 }  // namespace extensions
 
+namespace ui {
+struct AXActionData;
+}  // namespace ui
+
 namespace extensions {
 
 // Implementation of the chrome.automation API.
@@ -44,10 +49,10 @@
   ExtensionFunction::ResponseAction Run() override;
 
  private:
-  // Helper function to route an action to an action adapter.
-  ExtensionFunction::ResponseAction RouteActionToAdapter(
+  // Helper function to convert extension action to ax action.
+  ExtensionFunction::ResponseAction ConvertToAXActionData(
       api::automation_internal::PerformAction::Params* params,
-      AutomationActionAdapter* adapter);
+      ui::AXActionData* data);
 };
 
 class AutomationInternalEnableFrameFunction : public UIThreadExtensionFunction {

diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index f6e22bdf..ec5b4b1 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc

@@ -432,7 +432,8 @@
           (history_info[i].state != content::DownloadItem::CANCELLED
                ? content::DOWNLOAD_INTERRUPT_REASON_NONE
                : content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED),
-          false);  // opened
+          false,                  // opened
+          std::vector<DownloadItem::ReceivedSlice>());
       items->push_back(item);
     }
 

diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index d954ed0..533dac8c 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc

@@ -219,7 +219,8 @@
       if (url_service_->loaded()) {
         url_service_->RegisterOmniboxKeyword(
             extension->id(), extension->name(), keyword,
-            GetTemplateURLStringForExtension(extension->id()));
+            GetTemplateURLStringForExtension(extension->id()),
+            ExtensionPrefs::Get(profile_)->GetInstallTime(extension->id()));
       } else {
         pending_extensions_.insert(extension);
       }
@@ -247,11 +248,11 @@
 void OmniboxAPI::OnTemplateURLsLoaded() {
   // Register keywords for pending extensions.
   template_url_sub_.reset();
-  for (PendingExtensions::const_iterator i(pending_extensions_.begin());
-       i != pending_extensions_.end(); ++i) {
+  for (const auto* i : pending_extensions_) {
     url_service_->RegisterOmniboxKeyword(
-        (*i)->id(), (*i)->name(), OmniboxInfo::GetKeyword(*i),
-        GetTemplateURLStringForExtension((*i)->id()));
+        i->id(), i->name(), OmniboxInfo::GetKeyword(i),
+        GetTemplateURLStringForExtension(i->id()),
+        ExtensionPrefs::Get(profile_)->GetInstallTime(i->id()));
   }
   pending_extensions_.clear();
 }

diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index 6d07d74..59d18bb 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -23,7 +24,6 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 
@@ -90,6 +90,6 @@
 void ExtensionIconManager::EnsureDefaultIcon() {
   if (default_icon_.IsEmpty()) {
     default_icon_ = gfx::Image(gfx::CreateVectorIcon(
-        gfx::VectorIconId::EXTENSION, gfx::kFaviconSize, gfx::kChromeIconGrey));
+        kExtensionIcon, gfx::kFaviconSize, gfx::kChromeIconGrey));
   }
 }

diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 4038a71..9451f23 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc

@@ -10,6 +10,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ -25,7 +26,6 @@
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void ThemeInstalledInfoBarDelegate::Create(
@@ -116,8 +116,8 @@
   return THEME_INSTALLED_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId ThemeInstalledInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::PAINTBRUSH;
+const gfx::VectorIcon& ThemeInstalledInfoBarDelegate::GetVectorIcon() const {
+  return kPaintbrushIcon;
 }
 
 ThemeInstalledInfoBarDelegate*

diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index ba71229..46b82bf 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h

@@ -43,7 +43,7 @@
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   ThemeInstalledInfoBarDelegate* AsThemePreviewInfobarDelegate() override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;

diff --git a/chrome/browser/feedback/feedback_profile_observer.cc b/chrome/browser/feedback/feedback_profile_observer.cc
index 90415a8..7e43034 100644
--- a/chrome/browser/feedback/feedback_profile_observer.cc
+++ b/chrome/browser/feedback/feedback_profile_observer.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/feedback/feedback_profile_observer.h"
 
 #include "base/callback.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/feedback/feedback_report.h"
@@ -59,7 +60,9 @@
     content::BrowserContext* context) {
   feedback::FeedbackUploader* uploader =
       feedback::FeedbackUploaderFactory::GetForBrowserContext(context);
-  BrowserThread::PostBlockingPoolTask(FROM_HERE,
+  base::PostTaskWithTraits(
+      FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
+                     base::TaskPriority::BACKGROUND),
       base::Bind(
           &FeedbackReport::LoadReportsAndQueue,
           uploader->GetFeedbackReportsPath(),

diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index 2e0de2e4..80acaac6 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc

@@ -6,6 +6,7 @@
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/sys_info.h"
+#include "base/task_scheduler/post_task.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
@@ -71,7 +72,7 @@
   return std::string();
 }
 
-void GetEntriesOnBlockingPool(SystemLogsResponse* response) {
+void GetEntriesAsync(SystemLogsResponse* response) {
   DCHECK(response);
 
   chromeos::system::StatisticsProvider* stats =
@@ -135,8 +136,10 @@
   // Get the entries that should be retrieved on the blocking pool and invoke
   // the callback later when done.
   SystemLogsResponse* response_ptr = response.release();
-  content::BrowserThread::PostBlockingPoolTaskAndReply(
-      FROM_HERE, base::Bind(&GetEntriesOnBlockingPool, response_ptr),
+  base::PostTaskWithTraitsAndReply(
+      FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
+                     base::TaskPriority::BACKGROUND),
+      base::Bind(&GetEntriesAsync, response_ptr),
       base::Bind(callback, base::Owned(response_ptr)));
 #else
   // On other platforms, we're done. Invoke the callback.

diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc
index 2fb7c2a..d707c2ed 100644
--- a/chrome/browser/first_run/first_run_internal_win.cc
+++ b/chrome/browser/first_run/first_run_internal_win.cc

@@ -112,10 +112,7 @@
   // making sure shortcuts are created promptly to avoid annoying the user by
   // re-creating shortcuts they previously deleted.
   static const int64_t kTiggerActiveSetupDelaySeconds = 5;
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED();
-  } else if (!InstallUtil::IsPerUserInstall(chrome_exe)) {
+  if (!InstallUtil::IsPerUserInstall()) {
     content::BrowserThread::GetBlockingPool()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&InstallUtil::TriggerActiveSetupCommand),
@@ -132,7 +129,7 @@
   // from the application directory to the user data directory.
   base::FilePath exe_path;
   if (PathService::Get(base::DIR_EXE, &exe_path) &&
-      InstallUtil::IsPerUserInstall(exe_path)) {
+      InstallUtil::IsPerUserInstall()) {
     base::FilePath legacy_sentinel = exe_path.Append(chrome::kFirstRunSentinel);
     if (base::PathExists(legacy_sentinel)) {
       // Copy the file instead of moving it to avoid breaking developer builds

diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc
index e5d12288..9670c26 100644
--- a/chrome/browser/first_run/upgrade_util_win.cc
+++ b/chrome/browser/first_run/upgrade_util_win.cc

@@ -109,13 +109,10 @@
 bool SwapNewChromeExeIfPresent() {
   if (!IsUpdatePendingRestart())
     return false;
-  base::FilePath cur_chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &cur_chrome_exe))
-    return false;
 
   // If this is a system-level install, ask Google Update to launch an elevated
   // process to rename Chrome executables.
-  if (!InstallUtil::IsPerUserInstall(cur_chrome_exe))
+  if (!InstallUtil::IsPerUserInstall())
     return InvokeGoogleUpdateForRename();
 
   // If this is a user-level install, directly launch a process to rename Chrome

diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc
index 1271cfc2..0c0d6cc1 100644
--- a/chrome/browser/google/google_update_win.cc
+++ b/chrome/browser/google/google_update_win.cc

@@ -92,8 +92,7 @@
 GoogleUpdateErrorCode CanUpdateCurrentChrome(
     const base::FilePath& chrome_exe_path,
     bool system_level_install) {
-  DCHECK_NE(InstallUtil::IsPerUserInstall(chrome_exe_path),
-            system_level_install);
+  DCHECK_NE(InstallUtil::IsPerUserInstall(), system_level_install);
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::FilePath user_exe_path = installer::GetChromeInstallPath(false, dist);
   base::FilePath machine_exe_path = installer::GetChromeInstallPath(true, dist);
@@ -504,7 +503,7 @@
     if (!PathService::Get(base::DIR_EXE, &chrome_exe))
       NOTREACHED();
 
-    system_level_install_ = !InstallUtil::IsPerUserInstall(chrome_exe);
+    system_level_install_ = !InstallUtil::IsPerUserInstall();
 
     // Make sure ATL is initialized in this module.
     ui::win::CreateATLModuleIfNeeded();

diff --git a/chrome/browser/local_discovery/OWNERS b/chrome/browser/local_discovery/OWNERS
index 58265a3..4633094 100644
--- a/chrome/browser/local_discovery/OWNERS
+++ b/chrome/browser/local_discovery/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index a905b440..5ae78f1 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc

@@ -559,12 +559,7 @@
   TestConfigChange(ConfigChangeType::CLEAR_TO_CLEAR);
 }
 
-// TODO(xhwang): Support switching from clear to encrypted and fix the test
-// expectation. Currently this test passes when we do decrypt-and-decode but
-// fails when we do decrypt-only due to how decoder reselection during config
-// change is handled. See http://crbug.com/597443
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_ConfigChangeVideo_ClearToEncrypted) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToEncrypted) {
   TestConfigChange(ConfigChangeType::CLEAR_TO_ENCRYPTED);
 }
 

diff --git a/chrome/browser/metrics/variations/chrome_variations_service_client.cc b/chrome/browser/metrics/variations/chrome_variations_service_client.cc
index 184f7d3..e4bfb1e8 100644
--- a/chrome/browser/metrics/variations/chrome_variations_service_client.cc
+++ b/chrome/browser/metrics/variations/chrome_variations_service_client.cc

@@ -13,9 +13,7 @@
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
-#include "base/files/file_path.h"
 #include "base/metrics/histogram_macros.h"
-#include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -57,12 +55,7 @@
 
   // Note that all registry operations are done here on the UI thread as there
   // are no threading restrictions on them.
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED() << "Failed to get chrome exe path";
-    return;
-  }
-  const bool is_system_install = !InstallUtil::IsPerUserInstall(chrome_exe);
+  const bool is_system_install = !InstallUtil::IsPerUserInstall();
 
   // Read the current bits from the registry.
   base::string16 registry_labels;

diff --git a/chrome/browser/net/file_downloader.cc b/chrome/browser/net/file_downloader.cc
index 87ade7a9..ffbb4f9 100644
--- a/chrome/browser/net/file_downloader.cc
+++ b/chrome/browser/net/file_downloader.cc

@@ -20,13 +20,16 @@
 
 const int kNumRetries = 1;
 
-FileDownloader::FileDownloader(const GURL& url,
-                               const base::FilePath& path,
-                               bool overwrite,
-                               net::URLRequestContextGetter* request_context,
-                               const DownloadFinishedCallback& callback)
+FileDownloader::FileDownloader(
+    const GURL& url,
+    const base::FilePath& path,
+    bool overwrite,
+    net::URLRequestContextGetter* request_context,
+    const DownloadFinishedCallback& callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation)
     : callback_(callback),
-      fetcher_(URLFetcher::Create(url, URLFetcher::GET, this)),
+      fetcher_(
+          URLFetcher::Create(url, URLFetcher::GET, this, traffic_annotation)),
       local_path_(path),
       weak_ptr_factory_(this) {
   fetcher_->SetRequestContext(request_context);

diff --git a/chrome/browser/net/file_downloader.h b/chrome/browser/net/file_downloader.h
index 79f6311..7f264af 100644
--- a/chrome/browser/net/file_downloader.h
+++ b/chrome/browser/net/file_downloader.h

@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace net {
@@ -42,7 +43,8 @@
                  const base::FilePath& path,
                  bool overwrite,
                  net::URLRequestContextGetter* request_context,
-                 const DownloadFinishedCallback& callback);
+                 const DownloadFinishedCallback& callback,
+                 const net::NetworkTrafficAnnotationTag& traffic_annotation);
   ~FileDownloader() override;
 
   static bool IsSuccess(Result result) { return result != FAILED; }

diff --git a/chrome/browser/net/file_downloader_unittest.cc b/chrome/browser/net/file_downloader_unittest.cc
index 47bf213..c34763a 100644
--- a/chrome/browser/net/file_downloader_unittest.cc
+++ b/chrome/browser/net/file_downloader_unittest.cc

@@ -12,6 +12,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/public/browser/browser_thread.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -63,7 +64,8 @@
     FileDownloader downloader(
         GURL(kURL), path_, overwrite, request_context_.get(),
         base::Bind(&FileDownloaderTest::OnDownloadFinished,
-                   base::Unretained(this)));
+                   base::Unretained(this)),
+        TRAFFIC_ANNOTATION_FOR_TESTS);
     EXPECT_CALL(*this, OnDownloadFinished(expected_result));
     // Wait for the FileExists check to happen if necessary.
     if (!overwrite)

diff --git a/chrome/browser/ntp_snippets/fake_download_item.cc b/chrome/browser/ntp_snippets/fake_download_item.cc
index ef06a28..2f2db42 100644
--- a/chrome/browser/ntp_snippets/fake_download_item.cc
+++ b/chrome/browser/ntp_snippets/fake_download_item.cc

@@ -326,6 +326,13 @@
   return 1;
 }
 
+const std::vector<DownloadItem::ReceivedSlice>&
+FakeDownloadItem::GetReceivedSlices() const {
+  NOTREACHED();
+  static const std::vector<DownloadItem::ReceivedSlice> slices;
+  return slices;
+}
+
 bool FakeDownloadItem::CanShowInFolder() {
   NOTREACHED();
   return true;

diff --git a/chrome/browser/ntp_snippets/fake_download_item.h b/chrome/browser/ntp_snippets/fake_download_item.h
index 37edfd6..09f54e5 100644
--- a/chrome/browser/ntp_snippets/fake_download_item.h
+++ b/chrome/browser/ntp_snippets/fake_download_item.h

@@ -107,6 +107,8 @@
   bool AllDataSaved() const override;
   int64_t GetTotalBytes() const override;
   int64_t GetReceivedBytes() const override;
+  const std::vector<DownloadItem::ReceivedSlice>& GetReceivedSlices()
+      const override;
   bool CanShowInFolder() override;
   bool CanOpenDownload() override;
   bool ShouldOpenFileBasedOnExtension() override;

diff --git a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.cc
index b1ca8e1..07b0399f 100644
--- a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.cc

@@ -44,3 +44,18 @@
           (navigation_start_ - base::TimeTicks()).InMicroseconds()),
       static_cast<jlong>(first_contentful_paint_ms));
 }
+
+void AndroidPageLoadMetricsObserver::OnLoadEventStart(
+    const page_load_metrics::PageLoadTiming& timing,
+    const page_load_metrics::PageLoadExtraInfo& info) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  int64_t load_event_start_ms = timing.load_event_start->InMilliseconds();
+  base::android::ScopedJavaLocalRef<jobject> java_web_contents =
+      web_contents_->GetJavaWebContents();
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_PageLoadMetrics_onLoadEventStart(
+      env, java_web_contents,
+      static_cast<jlong>(
+          (navigation_start_ - base::TimeTicks()).InMicroseconds()),
+      static_cast<jlong>(load_event_start_ms));
+}

diff --git a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.h
index ceee273..823ae858 100644
--- a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.h
+++ b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer.h

@@ -29,6 +29,9 @@
   void OnFirstContentfulPaint(
       const page_load_metrics::PageLoadTiming& timing,
       const page_load_metrics::PageLoadExtraInfo& extra_info) override;
+  void OnLoadEventStart(
+      const page_load_metrics::PageLoadTiming& timing,
+      const page_load_metrics::PageLoadExtraInfo& info) override;
 
  private:
   content::WebContents* web_contents_;

diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc
index 7ee700a..4caf2cf 100644
--- a/chrome/browser/pepper_broker_infobar_delegate.cc
+++ b/chrome/browser/pepper_broker_infobar_delegate.cc

@@ -4,6 +4,7 @@
 
 #include "chrome/browser/pepper_broker_infobar_delegate.h"
 
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ -22,7 +23,6 @@
 #include "content/public/common/referrer.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void PepperBrokerInfoBarDelegate::Create(
@@ -92,8 +92,8 @@
   return PEPPER_BROKER_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId PepperBrokerInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::EXTENSION;
+const gfx::VectorIcon& PepperBrokerInfoBarDelegate::GetVectorIcon() const {
+  return kExtensionIcon;
 }
 
 base::string16 PepperBrokerInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/pepper_broker_infobar_delegate.h b/chrome/browser/pepper_broker_infobar_delegate.h
index 9a533b6..5479b2e 100644
--- a/chrome/browser/pepper_broker_infobar_delegate.h
+++ b/chrome/browser/pepper_broker_infobar_delegate.h

@@ -43,7 +43,7 @@
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;

diff --git a/chrome/browser/permissions/permission_request_impl.cc b/chrome/browser/permissions/permission_request_impl.cc
index cf17b1c..1a5bfad 100644
--- a/chrome/browser/permissions/permission_request_impl.cc
+++ b/chrome/browser/permissions/permission_request_impl.cc

@@ -76,10 +76,10 @@
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       return ui::kMidiIcon;
     case CONTENT_SETTINGS_TYPE_PLUGINS:
-      return ui::kExtensionIcon;
+      return kExtensionIcon;
     default:
       NOTREACHED();
-      return ui::kExtensionIcon;
+      return kExtensionIcon;
   }
 #endif
 }

diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
index 39b7a13..73c715c5 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc

@@ -10,6 +10,7 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
@@ -31,7 +32,6 @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugin_installer.h"
@@ -110,8 +110,8 @@
   content::RecordAction(UserMetricsAction("OutdatedPluginInfobar.Dismissed"));
 }
 
-gfx::VectorIconId OutdatedPluginInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::EXTENSION;
+const gfx::VectorIcon& OutdatedPluginInfoBarDelegate::GetVectorIcon() const {
+  return kExtensionIcon;
 }
 
 base::string16 OutdatedPluginInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/plugins/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h
index a70df817..93f1e01 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.h
+++ b/chrome/browser/plugins/plugin_infobar_delegates.h

@@ -46,7 +46,7 @@
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   void InfoBarDismissed() override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;

diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index 82c9555..48157a8c 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc

@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ -40,7 +41,6 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
 #include "chrome/browser/plugins/plugin_installer.h"
@@ -136,7 +136,7 @@
 
   // ConfirmInfobarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
@@ -169,8 +169,8 @@
   return RELOAD_PLUGIN_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId ReloadPluginInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::EXTENSION_CRASHED;
+const gfx::VectorIcon& ReloadPluginInfoBarDelegate::GetVectorIcon() const {
+  return kExtensionCrashedIcon;
 }
 
 base::string16 ReloadPluginInfoBarDelegate::GetMessageText() const {
@@ -437,8 +437,7 @@
       PluginService::GetInstance()->GetPluginDisplayNameByPath(plugin_path);
   SimpleAlertInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents()),
-      infobars::InfoBarDelegate::PLUGIN_OBSERVER, 0,
-      gfx::VectorIconId::EXTENSION_CRASHED,
+      infobars::InfoBarDelegate::PLUGIN_OBSERVER, &kExtensionCrashedIcon,
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
                                  plugin_name),
       true);

diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index fda3b28..1c77345b 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc

@@ -230,6 +230,7 @@
 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #endif  // defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
 
 using content::BrowserThread;
@@ -3613,8 +3614,10 @@
  protected:
   bool HasMediaRouterActionAtInit() const {
     const std::set<std::string>& component_ids =
-        ComponentToolbarActionsFactory::GetInstance()->GetInitialComponentIds(
-            browser()->profile());
+        ToolbarActionsModel::Get(browser()->profile())
+            ->component_actions_factory()
+            ->GetInitialComponentIds();
+
     return base::ContainsKey(
         component_ids, ComponentToolbarActionsFactory::kMediaRouterActionId);
   }

diff --git a/chrome/browser/predictors/resource_prefetcher.cc b/chrome/browser/predictors/resource_prefetcher.cc
index cc1d466..69607a6e 100644
--- a/chrome/browser/predictors/resource_prefetcher.cc
+++ b/chrome/browser/predictors/resource_prefetcher.cc

@@ -140,7 +140,7 @@
 
 void ResourcePrefetcher::SendRequest(const GURL& url) {
   std::unique_ptr<net::URLRequest> url_request =
-      delegate_->GetURLRequestContext()->CreateRequest(url, net::LOW, this);
+      delegate_->GetURLRequestContext()->CreateRequest(url, net::IDLE, this);
   host_inflight_counts_[url.host()] += 1;
 
   url_request->set_method("GET");

diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 7403f6bd..d57d2c7 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc

@@ -778,6 +778,8 @@
 
 void PrerenderContents::AddNetworkBytes(int64_t bytes) {
   network_bytes_ += bytes;
+  for (Observer& observer : observer_list_)
+    observer.OnPrerenderNetworkBytesChanged(this);
 }
 
 }  // namespace prerender

diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 1926ce3..082fa62d 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h

@@ -89,6 +89,10 @@
     // destroyed.
     virtual void OnPrerenderStop(PrerenderContents* contents) {}
 
+    // Signals that a resource finished loading and altered the running byte
+    // count.
+    virtual void OnPrerenderNetworkBytesChanged(PrerenderContents* contents) {}
+
    protected:
     Observer() {}
     virtual ~Observer() = 0;
@@ -238,6 +242,9 @@
     return prerendering_has_been_cancelled_;
   }
 
+  // Running byte count. Increased when each resource completes loading.
+  int64_t network_bytes() { return network_bytes_; }
+
  protected:
   PrerenderContents(PrerenderManager* prerender_manager,
                     Profile* profile,

diff --git a/chrome/browser/prerender/prerender_handle.cc b/chrome/browser/prerender/prerender_handle.cc
index 8c51ff7..ee6f638f 100644
--- a/chrome/browser/prerender/prerender_handle.cc
+++ b/chrome/browser/prerender/prerender_handle.cc

@@ -109,6 +109,13 @@
     observer_->OnPrerenderStop(this);
 }
 
+void PrerenderHandle::OnPrerenderNetworkBytesChanged(
+    PrerenderContents* prerender_contents) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  if (observer_)
+    observer_->OnPrerenderNetworkBytesChanged(this);
+}
+
 bool PrerenderHandle::RepresentingSamePrerenderAs(
     PrerenderHandle* other) const {
   return other && other->prerender_data_ && prerender_data_ &&

diff --git a/chrome/browser/prerender/prerender_handle.h b/chrome/browser/prerender/prerender_handle.h
index 9beac51..e16fed1d 100644
--- a/chrome/browser/prerender/prerender_handle.h
+++ b/chrome/browser/prerender/prerender_handle.h

@@ -38,6 +38,10 @@
     // Signals that the prerender has stopped running.
     virtual void OnPrerenderStop(PrerenderHandle* handle) = 0;
 
+    // Signals that a resource finished loading and altered the running byte
+    // count.
+    virtual void OnPrerenderNetworkBytesChanged(PrerenderHandle* handle) = 0;
+
    protected:
     Observer();
     virtual ~Observer();
@@ -86,6 +90,8 @@
   void OnPrerenderDomContentLoaded(
       PrerenderContents* prerender_contents) override;
   void OnPrerenderStop(PrerenderContents* prerender_contents) override;
+  void OnPrerenderNetworkBytesChanged(
+      PrerenderContents* prerender_contents) override;
 
   Observer* observer_;
 

diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc
index c764f4c..e54068d 100644
--- a/chrome/browser/prerender/prerender_link_manager.cc
+++ b/chrome/browser/prerender/prerender_link_manager.cc

@@ -132,6 +132,8 @@
     }
   }
 
+  void OnPrerenderNetworkBytesChanged(PrerenderContents* launcher) override {}
+
  private:
   // A pointer to the parent PrerenderLinkManager.
   PrerenderLinkManager* link_manager_;
@@ -531,4 +533,7 @@
   StartPrerenders();
 }
 
+void PrerenderLinkManager::OnPrerenderNetworkBytesChanged(
+    PrerenderHandle* prerender_handle) {}
+
 }  // namespace prerender

diff --git a/chrome/browser/prerender/prerender_link_manager.h b/chrome/browser/prerender/prerender_link_manager.h
index 2348b85..d7e3d9b 100644
--- a/chrome/browser/prerender/prerender_link_manager.h
+++ b/chrome/browser/prerender/prerender_link_manager.h

@@ -149,6 +149,8 @@
   void OnPrerenderStopLoading(PrerenderHandle* prerender_handle) override;
   void OnPrerenderDomContentLoaded(PrerenderHandle* prerender_handle) override;
   void OnPrerenderStop(PrerenderHandle* prerender_handle) override;
+  void OnPrerenderNetworkBytesChanged(
+      PrerenderHandle* prerender_handle) override;
 
   bool has_shutdown_;
 

diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
index be3bfa0..f949fc8 100644
--- a/chrome/browser/prerender/prerender_unittest.cc
+++ b/chrome/browser/prerender/prerender_unittest.cc

@@ -96,6 +96,30 @@
   FinalStatus expected_final_status_;
 };
 
+class TestNetworkBytesChangedObserver
+    : public prerender::PrerenderHandle::Observer {
+ public:
+  TestNetworkBytesChangedObserver() : network_bytes_changed_(false) {}
+
+  // prerender::PrerenderHandle::Observer
+  void OnPrerenderStart(PrerenderHandle* prerender_handle) override {}
+  void OnPrerenderStopLoading(PrerenderHandle* prerender_handle) override {}
+  void OnPrerenderDomContentLoaded(PrerenderHandle* prerender_handle) override {
+  }
+  void OnPrerenderStop(PrerenderHandle* prerender_handle) override {}
+  void OnPrerenderNetworkBytesChanged(
+      PrerenderHandle* prerender_handle) override {
+    network_bytes_changed_ = true;
+  }
+
+  bool network_bytes_changed() const { return network_bytes_changed_; }
+
+ private:
+  bool network_bytes_changed_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestNetworkBytesChangedObserver);
+};
+
 int DummyPrerenderContents::g_next_route_id_ = 0;
 
 const gfx::Size kSize(640, 480);
@@ -1999,4 +2023,20 @@
   EXPECT_FALSE(prerender_contents->IsValidHttpMethod("WHATEVER"));
 }
 
+TEST_F(PrerenderTest, PrerenderContentsIncrementsByteCount) {
+  GURL url("http://www.google.com/");
+  DummyPrerenderContents* prerender_contents = nullptr;
+  prerender_contents = prerender_manager()->CreateNextPrerenderContents(
+      url, ORIGIN_OFFLINE, FINAL_STATUS_MANAGER_SHUTDOWN);
+  std::unique_ptr<PrerenderHandle> prerender_handle =
+      prerender_manager()->AddPrerenderForOffline(url, nullptr, kSize);
+
+  TestNetworkBytesChangedObserver observer;
+  prerender_handle->SetObserver(&observer);
+
+  prerender_contents->AddNetworkBytes(12);
+  EXPECT_TRUE(observer.network_bytes_changed());
+  EXPECT_EQ(12, prerender_contents->network_bytes());
+}
+
 }  // namespace prerender

diff --git a/chrome/browser/printing/cloud_print/OWNERS b/chrome/browser/printing/cloud_print/OWNERS
index adb99ff8..3a21c291 100644
--- a/chrome/browser/printing/cloud_print/OWNERS
+++ b/chrome/browser/printing/cloud_print/OWNERS

@@ -1,3 +1,5 @@
 gene@chromium.org
 scottbyer@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/profiles/OWNERS b/chrome/browser/profiles/OWNERS
index 9b3d1bc..57502e8 100644
--- a/chrome/browser/profiles/OWNERS
+++ b/chrome/browser/profiles/OWNERS

@@ -16,3 +16,5 @@
 per-file incognito_mode_policy_handler*=atwilson@chromium.org
 
 per-file host_zoom_map_browsertest.cc=wjmaclean@chromium.org
+
+# COMPONENT: UI>Browser>Profiles

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 2735519a..c3707d93 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc

@@ -115,6 +115,10 @@
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #endif
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/first_run/first_run.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -975,7 +979,11 @@
                                    supervised_user_id);
   }
 #if !defined(OS_ANDROID)
-  if (profile->IsNewProfile())
+  // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is
+  // new even if the "Preferences" file already existed (For example: The
+  // master_preferences file is dumped into the default profile on first run,
+  // before profile creation).
+  if (profile->IsNewProfile() || first_run::IsChromeFirstRun())
     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
 #endif
 }

diff --git a/chrome/browser/renderer_context_menu/open_with_menu_factory_ash.h b/chrome/browser/renderer_context_menu/open_with_menu_factory_ash.h
index 66657a1..fe3209d 100644
--- a/chrome/browser/renderer_context_menu/open_with_menu_factory_ash.h
+++ b/chrome/browser/renderer_context_menu/open_with_menu_factory_ash.h

@@ -53,7 +53,6 @@
   bool IsCommandIdChecked(int command_id) override;
   bool IsCommandIdEnabled(int command_id) override;
   void ExecuteCommand(int command_id) override;
-  void OnMenuCancel() override {}
 
   // ash::OpenWithItems::Delegate overrides:
   void ModelChanged(const std::vector<ash::LinkHandlerInfo>& handlers) override;

diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
index 0af7672b..355d84d 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc

@@ -21,7 +21,6 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
-#include "components/spellcheck/browser/feedback_sender.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/spellcheck/browser/spellcheck_host_metrics.h"
 #include "components/spellcheck/browser/spellcheck_platform.h"
@@ -46,7 +45,6 @@
     : proxy_(proxy),
       loading_frame_(0),
       succeeded_(false),
-      misspelling_hash_(0),
       client_(new SpellingServiceClient) {
   if (proxy_ && proxy_->GetBrowserContext()) {
     Profile* profile = Profile::FromBrowserContext(proxy_->GetBrowserContext());
@@ -75,7 +73,6 @@
 
   suggestions_ = params.dictionary_suggestions;
   misspelled_word_ = params.misspelled_word;
-  misspelling_hash_ = params.misspelling_hash;
 
   bool use_suggestions = SpellingServiceClient::IsAvailable(
       browser_context, SpellingServiceClient::SUGGEST);
@@ -242,8 +239,6 @@
       if (spellcheck) {
         if (spellcheck->GetMetrics())
           spellcheck->GetMetrics()->RecordReplacedWordStats(1);
-        spellcheck->GetFeedbackSender()->SelectedSuggestion(
-            misspelling_hash_, suggestion_index);
       }
     }
     return;
@@ -268,7 +263,6 @@
       if (spellcheck) {
         spellcheck->GetCustomDictionary()->AddWord(base::UTF16ToUTF8(
             misspelled_word_));
-        spellcheck->GetFeedbackSender()->AddedToDictionary(misspelling_hash_);
       }
     }
 #if BUILDFLAG(USE_BROWSER_SPELLCHECKER)
@@ -303,17 +297,6 @@
   }
 }
 
-void SpellingMenuObserver::OnMenuCancel() {
-  content::BrowserContext* browser_context = proxy_->GetBrowserContext();
-  if (!browser_context)
-    return;
-  SpellcheckService* spellcheck =
-      SpellcheckServiceFactory::GetForContext(browser_context);
-  if (!spellcheck)
-    return;
-  spellcheck->GetFeedbackSender()->IgnoredSuggestions(misspelling_hash_);
-}
-
 void SpellingMenuObserver::OnTextCheckComplete(
     SpellingServiceClient::ServiceType type,
     bool success,

diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.h b/chrome/browser/renderer_context_menu/spelling_menu_observer.h
index 46e1fe7..8b4b76a 100644
--- a/chrome/browser/renderer_context_menu/spelling_menu_observer.h
+++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.h

@@ -52,7 +52,6 @@
   bool IsCommandIdChecked(int command_id) override;
   bool IsCommandIdEnabled(int command_id) override;
   void ExecuteCommand(int command_id) override;
-  void OnMenuCancel() override;
 
   // A callback function called when the Spelling service finishes checking a
   // misspelled word.
@@ -92,10 +91,6 @@
   // this word to the custom-word dictionary.
   base::string16 misspelled_word_;
 
-  // The hash identifier for the misspelled word. Used for collecting user
-  // feedback to spellcheck suggestions.
-  uint32_t misspelling_hash_;
-
   // The string representing the result of this call. This string is a
   // suggestion when this call finished successfully. Otherwise it is error
   // text. Until we receive a response from the Spelling service, this string

diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.cc b/chrome/browser/renderer_host/chrome_extension_message_filter.cc
index 2306f56..0ba1d828 100644
--- a/chrome/browser/renderer_host/chrome_extension_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_extension_message_filter.cc

@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/task_scheduler/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
@@ -245,20 +245,18 @@
     paths_to_load.push_back(imported_extension->path());
   }
 
-  BrowserThread::PostBlockingPoolTask(
-      FROM_HERE,
-      base::Bind(
-          &ChromeExtensionMessageFilter::OnGetExtMessageBundleOnBlockingPool,
-          this, paths_to_load, extension_id, default_locale, reply_msg));
+  // This blocks tab loading. Priority is inherited from the calling context.
+  base::PostTaskWithTraits(
+      FROM_HERE, base::TaskTraits().MayBlock(),
+      base::Bind(&ChromeExtensionMessageFilter::OnGetExtMessageBundleAsync,
+                 this, paths_to_load, extension_id, default_locale, reply_msg));
 }
 
-void ChromeExtensionMessageFilter::OnGetExtMessageBundleOnBlockingPool(
+void ChromeExtensionMessageFilter::OnGetExtMessageBundleAsync(
     const std::vector<base::FilePath>& extension_paths,
     const std::string& main_extension_id,
     const std::string& default_locale,
     IPC::Message* reply_msg) {
-  DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-
   std::unique_ptr<extensions::MessageBundle::SubstitutionMap> dictionary_map(
       extensions::file_util::LoadMessageBundleSubstitutionMapFromPaths(
           extension_paths, main_extension_id, default_locale));

diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.h b/chrome/browser/renderer_host/chrome_extension_message_filter.h
index b746f50..55568bd 100644
--- a/chrome/browser/renderer_host/chrome_extension_message_filter.h
+++ b/chrome/browser/renderer_host/chrome_extension_message_filter.h

@@ -71,7 +71,7 @@
                      const extensions::Message& message);
   void OnGetExtMessageBundle(const std::string& extension_id,
                              IPC::Message* reply_msg);
-  void OnGetExtMessageBundleOnBlockingPool(
+  void OnGetExtMessageBundleAsync(
       const std::vector<base::FilePath>& extension_paths,
       const std::string& main_extension_id,
       const std::string& default_locale,

diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
index 31c63b3..480b444 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors.js

@@ -83,7 +83,7 @@
   while (nodeWalker) {
     this.ancestry_.push(nodeWalker);
     nodeWalker = nodeWalker.parent;
-    if (nodeWalker && AutomationPredicate.root(nodeWalker))
+    if (nodeWalker && nodeWalker.role == RoleType.WINDOW)
       break;
   }
 };

diff --git a/chrome/browser/resources/cloud_print_app/OWNERS b/chrome/browser/resources/cloud_print_app/OWNERS
index 58265a3..4633094 100644
--- a/chrome/browser/resources/cloud_print_app/OWNERS
+++ b/chrome/browser/resources/cloud_print_app/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/resources/inspect/inspect.css b/chrome/browser/resources/inspect/inspect.css
index 86b22a5b..b25cb2e 100644
--- a/chrome/browser/resources/inspect/inspect.css
+++ b/chrome/browser/resources/inspect/inspect.css

@@ -11,6 +11,7 @@
   font-size: 13px;
   margin: 0;
   min-width: 47em;
+  overflow: hidden;
 }
 
 .hidden {

diff --git a/chrome/browser/resources/local_discovery/OWNERS b/chrome/browser/resources/local_discovery/OWNERS
index 58265a3..4633094 100644
--- a/chrome/browser/resources/local_discovery/OWNERS
+++ b/chrome/browser/resources/local_discovery/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/resources/print_preview/OWNERS b/chrome/browser/resources/print_preview/OWNERS
index a13ff1cd..ef10fbb9 100644
--- a/chrome/browser/resources/print_preview/OWNERS
+++ b/chrome/browser/resources/print_preview/OWNERS

@@ -1,3 +1,5 @@
 dpapad@chromium.org
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: UI>Browser>PrintPreview

diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
index b117220..df810bfb 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html

@@ -58,7 +58,7 @@
 
       iron-icon {
         -webkit-margin-end: var(--about-page-image-space);
-        width: 32px;  /* The width of the product-logo img. */
+        min-width: 32px;  /* The width of the product-logo img. */
       }
 
       iron-icon[icon='settings:check-circle'] {
@@ -69,6 +69,10 @@
         fill: var(--paper-red-600);
       }
 
+      .settings-box .start {
+        overflow-x: auto;
+      }
+
       #regulatoryInfo img {
         width: 330px;
       }
@@ -86,7 +90,8 @@
             <div class="settings-box two-line">
               <img id="product-logo" on-tap="onProductLogoTap_"
                   srcset="chrome://theme/current-channel-logo@1x 1x,
-                          chrome://theme/current-channel-logo@2x 2x" alt="">
+                          chrome://theme/current-channel-logo@2x 2x"
+                  alt="$i18n{aboutProductLogoAlt}">
               <span class="product-title">$i18n{aboutProductTitle}</span>
             </div>
             <div class="settings-box two-line">

diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js
index 0f54c43..cb26f366 100644
--- a/chrome/browser/resources/settings/about_page/about_page.js
+++ b/chrome/browser/resources/settings/about_page/about_page.js

@@ -277,17 +277,16 @@
         return this.i18n('aboutUpgradeUpdating');
       default:
         function formatMessage(msg) {
-          return '<div>' +
-              parseHtmlSubset('<b>' + msg + '</b>').firstChild.innerHTML +
-              '</div>';
+          return parseHtmlSubset(
+              '<b>' + msg + '</b>', ['br', 'pre']).firstChild.innerHTML;
         }
         var result = '';
         var message = this.currentUpdateStatusEvent_.message;
-        if (!!message)
+        if (message)
           result += formatMessage(message);
         var connectMessage = this.currentUpdateStatusEvent_.connectionTypes;
-        if (!!connectMessage)
-          result += formatMessage(connectMessage);
+        if (connectMessage)
+          result += '<div>' + formatMessage(connectMessage) + '</div>';
         return result;
     }
   },

diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index a50f367..3e2e0de 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -168,7 +168,7 @@
             </div>
           </div>
           <button class="subpage-arrow" is="paper-icon-button-light"
-              aria-label="[[siteSettingsPageTitle_()]]"
+              aria-label$="[[siteSettingsPageTitle_()]]"
               aria-describedby="siteSettingsSecondary"></button>
         </div>
         <div class="settings-box two-line" id="clearBrowsingData"

diff --git a/chrome/browser/resources/vr_shell/vr_shell_ui.js b/chrome/browser/resources/vr_shell/vr_shell_ui.js
index a6eedc1..de42168 100644
--- a/chrome/browser/resources/vr_shell/vr_shell_ui.js
+++ b/chrome/browser/resources/vr_shell/vr_shell_ui.js

@@ -51,14 +51,14 @@
       element.setTranslation(0, 0, -this.BROWSING_SCREEN_DISTANCE);
       this.elementId = ui.addElement(element);
 
-      // Place an invisible but hittable plane behind the content quad, to keep
-      // the reticle roughly planar with the content if near content.
+      // Place an invisible (fill none) but hittable plane behind the content
+      // quad, to keep the reticle roughly planar with the content if near
+      // content.
       let backPlane = new api.UiElement(0, 0, 0, 0);
-      backPlane.setVisible(false);
-      backPlane.setHitTestable(true);
       backPlane.setSize(1000, 1000);
       backPlane.setTranslation(0, 0, -0.01);
       backPlane.setParentId(this.elementId);
+      backPlane.setFill(new api.NoFill());
       ui.addElement(backPlane);
 
       this.updateState();

diff --git a/chrome/browser/resources/vr_shell/vr_shell_ui_api.js b/chrome/browser/resources/vr_shell/vr_shell_ui_api.js
index 48d2f26..5090f826 100644
--- a/chrome/browser/resources/vr_shell/vr_shell_ui_api.js
+++ b/chrome/browser/resources/vr_shell/vr_shell_ui_api.js

@@ -140,6 +140,12 @@
   }
 }
 
+api.NoFill = class extends api.Fill {
+  constructor() {
+    super(api.FillType.NONE);
+  }
+}
+
 api.Sprite = class extends api.Fill {
   constructor(pixelX, pixelY, pixelWidth, pixelHeight) {
     super(api.FillType.SPRITE);

diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
index 077da98c..8804366f 100644
--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

@@ -37,7 +37,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/history/content/browser/content_visit_delegate.h"
-#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/content/browser/download_conversions.h"
 #include "components/history/content/browser/history_database_helper.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"

diff --git a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
index 55590dd..2e1fead 100644
--- a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc

@@ -1911,7 +1911,7 @@
   // Trigger download by user gesture.
   TriggerDownloadViaHtml5FileApi(true /* has_user_gesture */);
   std::string test_server_ip(embedded_test_server()->host_port_pair().host());
-  auto nav_list = navigation_event_list();
+  auto* nav_list = navigation_event_list();
   ASSERT_TRUE(nav_list);
   ASSERT_EQ(1U, nav_list->Size());
   VerifyNavigationEvent(GURL(),       // source_url
@@ -1945,7 +1945,7 @@
   // Trigger download without user gesture.
   TriggerDownloadViaHtml5FileApi(false /* has_user_gesture */);
   std::string test_server_ip(embedded_test_server()->host_port_pair().host());
-  auto nav_list = navigation_event_list();
+  auto* nav_list = navigation_event_list();
   ASSERT_TRUE(nav_list);
   ASSERT_EQ(1U, nav_list->Size());
   VerifyNavigationEvent(GURL(),       // source_url

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.cc b/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.cc
index ef27c16..2e8c64d 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.cc

@@ -14,6 +14,10 @@
   name = extension->name();
 }
 
+ExtensionInfo::ExtensionInfo(const extensions::ExtensionId& id,
+                             const std::string& name)
+    : id(id), name(name) {}
+
 ExtensionInfo::~ExtensionInfo() {}
 
 }  // namespace safe_browsing

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.h b/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.h
index 613d1035..d9efefa2 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/extension_info.h

@@ -17,6 +17,8 @@
 
 struct ExtensionInfo {
   explicit ExtensionInfo(const extensions::Extension* extension);
+  // Convenience constructor for tests.
+  ExtensionInfo(const extensions::ExtensionId& id, const std::string& name);
   ~ExtensionInfo();
 
   extensions::ExtensionId id;

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.cc
index 5f992dde..f8a302d 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.cc

@@ -25,20 +25,16 @@
 
 constexpr char kSettingsResetPromptFeatureName[] = "SettingsResetPrompt";
 
+bool IsPromptEnabled() {
+  return base::FeatureList::IsEnabled(kSettingsResetPrompt);
+}
+
 }  // namespace.
 
 const base::Feature kSettingsResetPrompt{kSettingsResetPromptFeatureName,
                                          base::FEATURE_DISABLED_BY_DEFAULT};
 
 // static
-bool SettingsResetPromptConfig::IsPromptEnabled() {
-  // TODO(alito): Add prefs to local state to track when the user was
-  // last prompted and ensure that we only prompt once per reset prompt
-  // wave.
-  return base::FeatureList::IsEnabled(kSettingsResetPrompt);
-}
-
-// static
 std::unique_ptr<SettingsResetPromptConfig> SettingsResetPromptConfig::Create() {
   if (!IsPromptEnabled())
     return nullptr;

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h
index a2676ec5..ffdaab65 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h

@@ -19,15 +19,12 @@
 
 namespace safe_browsing {
 
-// Exposed for testing.
 extern const base::Feature kSettingsResetPrompt;
 
 // Encapsulates the state of the reset prompt experiment as well as
 // associated data.
 class SettingsResetPromptConfig {
  public:
-  // Returns true if the settings reset prompt study is enabled.
-  static bool IsPromptEnabled();
   // Factory method for creating instances of SettingsResetPromptConfig.
   // Returns nullptr if |IsPromptEnabled()| is false or if something is wrong
   // with the config parameters.

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc
index 4b27e8c..90be575 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config_unittest.cc

@@ -22,6 +22,10 @@
 const char kDomainHash[] =
     "0a79eaf6adb7b1e60d3fa548aa63105f525a00448efbb59ee965b9351a90ac31";
 
+bool IsPromptEnabled() {
+  return base::FeatureList::IsEnabled(kSettingsResetPrompt);
+}
+
 // Test class that initializes a ScopedFeatureList so that all tests
 // start off with all features disabled.
 class SettingsResetPromptConfigTest : public ::testing::Test {
@@ -49,15 +53,8 @@
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 
-TEST_F(SettingsResetPromptConfigTest, IsPromptEnabled) {
-  EXPECT_FALSE(SettingsResetPromptConfig::IsPromptEnabled());
-
-  SetFeatureParams(GetDefaultFeatureParams());
-  EXPECT_TRUE(SettingsResetPromptConfig::IsPromptEnabled());
-}
-
 TEST_F(SettingsResetPromptConfigTest, Create) {
-  ASSERT_FALSE(SettingsResetPromptConfig::IsPromptEnabled());
+  ASSERT_FALSE(IsPromptEnabled());
 
   // |Create()| should return nullptr when feature is not enabled.
   EXPECT_FALSE(SettingsResetPromptConfig::Create());
@@ -65,7 +62,7 @@
   // |Create()| should return false when feature is enabled, but parameters are
   // |missing.
   scoped_feature_list_.InitAndEnableFeature(kSettingsResetPrompt);
-  ASSERT_TRUE(SettingsResetPromptConfig::IsPromptEnabled());
+  ASSERT_TRUE(IsPromptEnabled());
   EXPECT_FALSE(SettingsResetPromptConfig::Create());
   SetFeatureParams(Parameters());
   EXPECT_FALSE(SettingsResetPromptConfig::Create());

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
new file mode 100644
index 0000000..d3f8076
--- /dev/null
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc

@@ -0,0 +1,270 @@
+// Copyright 2017 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 "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
+
+#include <utility>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/i18n/rtl.h"
+#include "base/location.h"
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h"
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
+#include "components/url_formatter/elide_url.h"
+#include "components/url_formatter/url_formatter.h"
+#include "content/public/browser/browser_thread.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "url/gurl.h"
+
+namespace safe_browsing {
+
+namespace {
+
+base::string16 FormatUrlForDisplay(const GURL& url) {
+  return base::i18n::GetDisplayStringInLTRDirectionality(
+      url_formatter::FormatUrl(url));
+}
+
+base::string16 FormatSearchEngineForDisplay(const GURL& search_url) {
+  return url_formatter::FormatUrlForSecurityDisplay(search_url);
+}
+
+// Helper function that chooses and, if necessary, formats a message string
+// based on the number of extensions that need to be disabled.
+base::string16 ChooseActionMessage(size_t extensions_to_disable,
+                                   int no_extensions_message,
+                                   int one_extension_message,
+                                   int multiple_extensions_message) {
+  if (extensions_to_disable == 0U)
+    return l10n_util::GetStringUTF16(no_extensions_message);
+  if (extensions_to_disable == 1U)
+    return l10n_util::GetStringUTF16(one_extension_message);
+  // If extensions_to_disable > 1U.
+  return l10n_util::GetStringFUTF16(
+      multiple_extensions_message,
+      base::SizeTToString16(extensions_to_disable));
+}
+
+}  // namespace.
+
+SettingsResetPromptController::LabelInfo::LabelInfo(LabelType type,
+                                                    const base::string16& text)
+    : type(type), text(text) {}
+
+SettingsResetPromptController::LabelInfo::LabelInfo(LabelType type,
+                                                    int message_id)
+    : type(type), text(l10n_util::GetStringUTF16(message_id)) {}
+
+SettingsResetPromptController::LabelInfo::~LabelInfo() {}
+
+SettingsResetPromptController::SettingsResetPromptController(
+    std::unique_ptr<SettingsResetPromptModel> model)
+    : model_(std::move(model)) {
+  DCHECK(model_);
+  DCHECK(model_->ShouldPromptForReset());
+
+  InitMainText();
+  InitDetailsText();
+}
+
+SettingsResetPromptController::~SettingsResetPromptController() {}
+
+base::string16 SettingsResetPromptController::GetWindowTitle() const {
+  return l10n_util::GetStringUTF16(IDS_SETTINGS_RESET_PROMPT_TITLE);
+}
+
+base::string16 SettingsResetPromptController::GetButtonLabel() const {
+  return l10n_util::GetStringUTF16(
+      IDS_SETTINGS_RESET_PROMPT_ACCEPT_BUTTON_LABEL);
+}
+
+base::string16 SettingsResetPromptController::GetShowDetailsLabel() const {
+  return l10n_util::GetStringUTF16(
+      IDS_SETTINGS_RESET_PROMPT_SHOW_DETAILS_BUTTON_LABEL);
+}
+
+base::string16 SettingsResetPromptController::GetHideDetailsLabel() const {
+  return l10n_util::GetStringUTF16(
+      IDS_SETTINGS_RESET_PROMPT_HIDE_DETAILS_BUTTON_LABEL);
+}
+
+const std::vector<SettingsResetPromptController::LabelInfo>&
+SettingsResetPromptController::GetMainText() const {
+  DCHECK(!main_text_.empty());
+  return main_text_;
+}
+
+const std::vector<SettingsResetPromptController::LabelInfo>&
+SettingsResetPromptController::GetDetailsText() const {
+  DCHECK(!details_text_.empty());
+  return details_text_;
+}
+
+void SettingsResetPromptController::Accept() {
+  model_->PerformReset(
+      base::Bind(&SettingsResetPromptController::OnInteractionDone,
+                 base::Unretained(this)));
+}
+
+void SettingsResetPromptController::Cancel() {
+  OnInteractionDone();
+}
+
+void SettingsResetPromptController::InitMainText() {
+  DCHECK(main_text_.empty());
+
+  const bool reset_search = model_->default_search_reset_state() ==
+                            SettingsResetPromptModel::RESET_REQUIRED;
+  const bool reset_startup_urls = model_->startup_urls_reset_state() ==
+                                  SettingsResetPromptModel::RESET_REQUIRED;
+  const bool reset_homepage = model_->homepage_reset_state() ==
+                              SettingsResetPromptModel::RESET_REQUIRED;
+  DCHECK(reset_search || reset_startup_urls || reset_homepage);
+
+  base::string16 action_message;
+  if (int{reset_search} + int{reset_startup_urls} + int{reset_homepage} > 1) {
+    // When multiple settings need to be reset, display a bulleted list of
+    // settings with a common explanation text.
+    main_text_.push_back(
+        LabelInfo(LabelInfo::PARAGRAPH,
+                  IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_MULTIPLE_SETTINGS));
+    if (reset_search) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::BULLET_ITEM,
+                    IDS_SETTINGS_RESET_PROMPT_SEARCH_ENGINE_SETTING_NAME));
+    }
+    if (reset_startup_urls) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::BULLET_ITEM,
+                    IDS_SETTINGS_RESET_PROMPT_STARTUP_PAGE_SETTING_NAME));
+    }
+    if (reset_homepage) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::BULLET_ITEM,
+                    IDS_SETTINGS_RESET_PROMPT_HOMEPAGE_SETTING_NAME));
+    }
+
+    // Use a common action message asking if user wants to reset the settings
+    // that were displayed in the list above.
+    main_text_.push_back(LabelInfo(
+        LabelInfo::PARAGRAPH,
+        ChooseActionMessage(
+            model_->extensions_to_disable().size(),
+            IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_NO_EXTENSIONS,
+            IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_ONE_EXTENSION,
+            IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_MULTIPLE_SETTINGS_MULTIPLE_EXTENSIONS)));
+  } else {
+    // When only one setting needs to be reset, display tailored explanation and
+    // action message for each setting.
+    if (reset_search) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::PARAGRAPH,
+                    IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_SEARCH_ENGINE));
+      main_text_.push_back(LabelInfo(
+          LabelInfo::PARAGRAPH,
+          ChooseActionMessage(
+              model_->extensions_to_disable().size(),
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_NO_EXTENSIONS,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_ONE_EXTENSION,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_SEARCH_ENGINE_MULTIPLE_EXTENSIONS)));
+    }
+    if (reset_startup_urls) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::PARAGRAPH,
+                    IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_STARTUP_PAGE));
+      main_text_.push_back(LabelInfo(
+          LabelInfo::PARAGRAPH,
+          ChooseActionMessage(
+              model_->extensions_to_disable().size(),
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_NO_EXTENSIONS,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_ONE_EXTENSION,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_STARTUP_PAGE_MULTIPLE_EXTENSIONS)));
+    }
+    if (reset_homepage) {
+      main_text_.push_back(
+          LabelInfo(LabelInfo::PARAGRAPH,
+                    IDS_SETTINGS_RESET_PROMPT_EXPLANATION_FOR_HOMEPAGE));
+      main_text_.push_back(LabelInfo(
+          LabelInfo::PARAGRAPH,
+          ChooseActionMessage(
+              model_->extensions_to_disable().size(),
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_NO_EXTENSIONS,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_ONE_EXTENSION,
+              IDS_SETTINGS_RESET_PROMPT_ACTION_EXPLANATION_FOR_HOMEPAGE_MULTIPLE_EXTENSIONS)));
+    }
+  }
+}
+
+void SettingsResetPromptController::InitDetailsText() {
+  DCHECK(details_text_.empty());
+
+  // Add the text explaining which settings are going to be reset.
+  details_text_.push_back(LabelInfo(
+      LabelInfo::PARAGRAPH,
+      l10n_util::GetStringUTF16(
+          IDS_SETTINGS_RESET_PROMPT_DETAILS_SECTION_SETTINGS_EXPLANATION)));
+
+  // Enumerate the settings that are going to be reset.
+  if (model_->default_search_reset_state() ==
+      SettingsResetPromptModel::RESET_REQUIRED) {
+    details_text_.push_back(LabelInfo(
+        LabelInfo::PARAGRAPH,
+        l10n_util::GetStringUTF16(
+            IDS_SETTINGS_RESET_PROMPT_DETAILED_SEARCH_ENGINE_SETTING)));
+    details_text_.push_back(
+        LabelInfo(LabelInfo::BULLET_ITEM,
+                  FormatSearchEngineForDisplay(model_->default_search())));
+  }
+  if (model_->homepage_reset_state() ==
+      SettingsResetPromptModel::RESET_REQUIRED) {
+    details_text_.push_back(
+        LabelInfo(LabelInfo::PARAGRAPH,
+                  l10n_util::GetStringUTF16(
+                      IDS_SETTINGS_RESET_PROMPT_DETAILED_HOMEPAGE_SETTING)));
+    details_text_.push_back(LabelInfo(LabelInfo::BULLET_ITEM,
+                                      FormatUrlForDisplay(model_->homepage())));
+  }
+  if (model_->startup_urls_reset_state() ==
+      SettingsResetPromptModel::RESET_REQUIRED) {
+    details_text_.push_back(
+        LabelInfo(LabelInfo::PARAGRAPH,
+                  l10n_util::GetStringUTF16(
+                      IDS_SETTINGS_RESET_PROMPT_DETAILED_STARTUP_SETTINGS)));
+    for (const GURL& url : model_->startup_urls())
+      details_text_.push_back(
+          LabelInfo(LabelInfo::BULLET_ITEM, FormatUrlForDisplay(url)));
+  }
+
+  if (!model_->extensions_to_disable().empty()) {
+    // Add the text explaining which extensions will be disabled.
+    details_text_.push_back(LabelInfo(
+        LabelInfo::PARAGRAPH,
+        l10n_util::GetStringUTF16(
+            IDS_SETTINGS_RESET_PROMPT_DETAILS_SECTION_EXTENSION_EXPLANATION)));
+
+    for (const auto& item : model_->extensions_to_disable()) {
+      const ExtensionInfo& extension_info = item.second;
+      details_text_.push_back(LabelInfo(
+          LabelInfo::BULLET_ITEM, base::UTF8ToUTF16(extension_info.name)));
+    }
+  }
+}
+
+void SettingsResetPromptController::OnInteractionDone() {
+  // TODO(alito): Add metrics reporting here.
+  delete this;
+}
+
+}  // namespace safe_browsing

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h
new file mode 100644
index 0000000..b6c970b
--- /dev/null
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h

@@ -0,0 +1,85 @@
+// Copyright 2017 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 CHROME_BROWSER_SAFE_BROWSING_SETTINGS_RESET_PROMPT_SETTINGS_RESET_PROMPT_CONTROLLER_H_
+#define CHROME_BROWSER_SAFE_BROWSING_SETTINGS_RESET_PROMPT_SETTINGS_RESET_PROMPT_CONTROLLER_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/macros.h"
+#include "base/strings/string16.h"
+
+class Browser;
+
+namespace safe_browsing {
+
+class SettingsResetPromptModel;
+
+// The |SettingsResetPromptController| class is responsible for providing the
+// text that will be displayed in the settings reset dialog. The controller's
+// |Accept()| and |Cancel()| functions will be called based on user
+// interaction. Objects of this class will delete themselves after |Accept()| or
+// |Cancel()| has been called.
+class SettingsResetPromptController {
+ public:
+  // A simple struct representing text to be displayed in the dialog.
+  struct LabelInfo {
+    enum LabelType {
+      // Strings of type PARAGRAPH will be displayed by multiline labels.
+      PARAGRAPH,
+      // Strings of type BULLET_ITEM will be displayed as a (possibly elided)
+      // single-line label starting with a bullet point.
+      BULLET_ITEM,
+    };
+
+    LabelInfo(LabelType type, const base::string16& text);
+    // Convenience constructor for displaying resource strings.
+    LabelInfo(LabelType type, int message_id);
+    ~LabelInfo();
+
+    LabelType type;
+    base::string16 text;
+  };
+
+  // A controller should be created only if |model->ShouldPromptforReset()|
+  // is true.
+  explicit SettingsResetPromptController(
+      std::unique_ptr<SettingsResetPromptModel> model);
+  static void ShowSettingsResetPrompt(
+      Browser* browser,
+      SettingsResetPromptController* controller);
+
+  base::string16 GetWindowTitle() const;
+  base::string16 GetButtonLabel() const;
+  base::string16 GetShowDetailsLabel() const;
+  base::string16 GetHideDetailsLabel() const;
+  const std::vector<LabelInfo>& GetMainText() const;
+  const std::vector<LabelInfo>& GetDetailsText() const;
+  // |Accept()| will be called by the dialog when the user clicks the main
+  // button, after which the dialog will be closed.
+  void Accept();
+  // |Cancel()| will be called by the dialog when the user clicks the dismiss
+  // button on the top right, after which the dialog will be closed.
+  void Cancel();
+
+ private:
+  ~SettingsResetPromptController();
+  void InitMainText();
+  void InitDetailsText();
+  // Function to be called sometime after |Accept()| or |Cancel()| has been
+  // called to perform any final tasks (such as metrcis reporting) and delete
+  // this object.
+  void OnInteractionDone();
+
+  std::unique_ptr<SettingsResetPromptModel> model_;
+  std::vector<SettingsResetPromptController::LabelInfo> details_text_;
+  std::vector<SettingsResetPromptController::LabelInfo> main_text_;
+
+  DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptController);
+};
+
+}  // namespace safe_browsing
+
+#endif  // CHROME_BROWSER_SAFE_BROWSING_SETTINGS_RESET_PROMPT_SETTINGS_RESET_PROMPT_CONTROLLER_H_

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc
index db7d211..1c86448 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc

@@ -176,6 +176,10 @@
 
 SettingsResetPromptModel::~SettingsResetPromptModel() {}
 
+Profile* SettingsResetPromptModel::profile() const {
+  return profile_;
+}
+
 SettingsResetPromptConfig* SettingsResetPromptModel::config() const {
   return prompt_config_.get();
 }

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
index a1790a1..2860ebe 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h

@@ -54,37 +54,47 @@
       std::unique_ptr<BrandcodedDefaultSettings> default_settings,
       std::unique_ptr<ProfileResetter> profile_resetter);
 
-  ~SettingsResetPromptModel();
+  virtual ~SettingsResetPromptModel();
 
+  Profile* profile() const;
   SettingsResetPromptConfig* config() const;
 
   // Returns true if reset is enabled for any settings type.
-  bool ShouldPromptForReset() const;
+  virtual bool ShouldPromptForReset() const;
   // Resets the settings whose reset states are set to |RESET_REQUIRED| as
   // returned by the methods below. Should be called only on the UI
   // thread. |done_callback| will called from the UI thread when the reset
   // operation has been completed.
   //
   // NOTE: Can only be called once during the lifetime of this object.
-  void PerformReset(const base::Closure& done_callback);
+  virtual void PerformReset(const base::Closure& done_callback);
 
-  GURL homepage() const;
-  ResetState homepage_reset_state() const;
+  virtual GURL homepage() const;
+  virtual ResetState homepage_reset_state() const;
 
-  GURL default_search() const;
-  ResetState default_search_reset_state() const;
+  virtual GURL default_search() const;
+  virtual ResetState default_search_reset_state() const;
 
   // Returns list of all current startup URLs. Returns empty list if session
   // startup is set to show the NTP or restore last session.
-  const std::vector<GURL>& startup_urls() const;
+  virtual const std::vector<GURL>& startup_urls() const;
   // Returns the list of all startup URLs that have a match in the prompt
   // config. This is a subset of the URLs returned by |startup_urls()|.
-  const std::vector<GURL>& startup_urls_to_reset() const;
-  ResetState startup_urls_reset_state() const;
+  virtual const std::vector<GURL>& startup_urls_to_reset() const;
+  virtual ResetState startup_urls_reset_state() const;
 
   // Returns a map of extension ID -> ExtensionInfo for all extensions that will
   // be disabled.
-  const ExtensionMap& extensions_to_disable() const;
+  virtual const ExtensionMap& extensions_to_disable() const;
+
+ protected:
+  // Exposed for mocking in tests.
+  SettingsResetPromptModel(
+      Profile* profile,
+      std::unique_ptr<SettingsResetPromptConfig> prompt_config,
+      std::unique_ptr<ResettableSettingsSnapshot> settings_snapshot,
+      std::unique_ptr<BrandcodedDefaultSettings> default_settings,
+      std::unique_ptr<ProfileResetter> profile_resetter);
 
  private:
   static void OnSettingsFetched(
@@ -93,13 +103,6 @@
       SettingsResetPromptModel::CreateCallback callback,
       std::unique_ptr<BrandcodedDefaultSettings> default_settings);
 
-  SettingsResetPromptModel(
-      Profile* profile,
-      std::unique_ptr<SettingsResetPromptConfig> prompt_config,
-      std::unique_ptr<ResettableSettingsSnapshot> settings_snapshot,
-      std::unique_ptr<BrandcodedDefaultSettings> default_settings,
-      std::unique_ptr<ProfileResetter> profile_resetter);
-
   void InitHomepageData();
   void InitDefaultSearchData();
   void InitExtensionData();

diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc
index 090a800..902fc79 100644
--- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc
+++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc

@@ -8,6 +8,7 @@
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
+#include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h"

diff --git a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
index 0140984..8f80e7bb 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc
+++ b/chrome/browser/safe_browsing/srt_fetcher_browsertest_win.cc

@@ -4,18 +4,25 @@
 
 #include "chrome/browser/safe_browsing/srt_fetcher_win.h"
 
+#include <initializer_list>
 #include <iterator>
-#include <memory>
 #include <set>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/run_loop.h"
+#include "base/memory/ref_counted.h"
+#include "base/message_loop/message_loop.h"
 #include "base/test/scoped_feature_list.h"
-#include "base/test/test_simple_task_runner.h"
+#include "base/test/test_mock_time_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
+#include "base/version.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/srt_client_info_win.h"
 #include "chrome/browser/ui/browser.h"
@@ -25,7 +32,6 @@
 #include "components/component_updater/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
-#include "content/public/test/test_browser_thread_bundle.h"
 
 namespace safe_browsing {
 
@@ -39,21 +45,67 @@
                        public SwReporterTestingDelegate {
  public:
   void SetUpInProcessBrowserTestFixture() override {
-    task_runner_ = new base::TestSimpleTaskRunner;
-
     SetSwReporterTestingDelegate(this);
   }
 
   void SetUpOnMainThread() override {
+    // During the test, use a task runner with a mock clock.
+    saved_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+    ASSERT_NE(mock_time_task_runner_, saved_task_runner_);
+    base::MessageLoop::current()->SetTaskRunner(mock_time_task_runner_);
+
     InProcessBrowserTest::SetUpOnMainThread();
+
+    // SetDateInLocalState calculates a time as Now() minus an offset. Move the
+    // simulated clock ahead far enough that this calculation won't underflow.
+    mock_time_task_runner_->FastForwardBy(
+        base::TimeDelta::FromDays(kDaysBetweenSuccessfulSwReporterRuns * 2));
+
     ClearLastTimeSentReport();
   }
 
+  void TearDownOnMainThread() override {
+    // Restore the standard task runner to perform browser cleanup, which will
+    // wait forever with the mock clock.
+    base::MessageLoop::current()->SetTaskRunner(saved_task_runner_);
+  }
+
   void TearDownInProcessBrowserTestFixture() override {
     SetSwReporterTestingDelegate(nullptr);
   }
 
-  void RunReporter(const base::FilePath& exe_path = base::FilePath()) {
+  // Records that the prompt was shown.
+  void TriggerPrompt(Browser* browser, const std::string& version) override {
+    prompt_trigger_called_ = true;
+  }
+
+  // Records that the reporter was launched with the parameters given in
+  // |invocation|.
+  int LaunchReporter(const SwReporterInvocation& invocation) override {
+    ++reporter_launch_count_;
+    reporter_launch_parameters_.push_back(invocation);
+    if (first_launch_callback_)
+      std::move(first_launch_callback_).Run();
+    return exit_code_to_report_;
+  }
+
+  // Returns the test's idea of the current time.
+  base::Time Now() const override { return mock_time_task_runner_->Now(); }
+
+  // Returns a task runner to use when launching the reporter (which is
+  // normally a blocking action).
+  base::TaskRunner* BlockingTaskRunner() const override {
+    // Use the test's main task runner so that we don't need to pump another
+    // message loop. Since the test calls LaunchReporter instead of actually
+    // doing a blocking reporter launch, it doesn't matter that the task runner
+    // doesn't have the MayBlock trait.
+    return mock_time_task_runner_.get();
+  }
+
+  // Schedules a single reporter to run.
+  void RunReporter(int exit_code_to_report,
+                   const base::FilePath& exe_path = base::FilePath()) {
+    exit_code_to_report_ = exit_code_to_report;
     auto invocation = SwReporterInvocation::FromFilePath(exe_path);
     invocation.supported_behaviours =
         SwReporterInvocation::BEHAVIOUR_LOG_TO_RAPPOR |
@@ -63,364 +115,259 @@
 
     SwReporterQueue invocations;
     invocations.push(invocation);
-    RunSwReporters(invocations, base::Version("1.2.3"), task_runner_,
-                   task_runner_);
+    RunSwReporters(invocations, base::Version("1.2.3"));
   }
 
-  void RunReporterQueue(const SwReporterQueue& invocations) {
-    RunSwReporters(invocations, base::Version("1.2.3"), task_runner_,
-                   task_runner_);
+  // Schedules a queue of reporters to run.
+  void RunReporterQueue(int exit_code_to_report,
+                        const SwReporterQueue& invocations) {
+    exit_code_to_report_ = exit_code_to_report;
+    RunSwReporters(invocations, base::Version("1.2.3"));
   }
 
-  void TriggerPrompt(Browser* browser, const std::string& version) override {
-    prompt_trigger_called_ = true;
-  }
-
-  int LaunchReporter(const SwReporterInvocation& invocation) override {
-    ++reporter_launch_count_;
-    reporter_launch_parameters_ = invocation;
-    return exit_code_to_report_;
-  }
-
-  void NotifyLaunchReady() override { launch_ready_notified_ = true; }
-
-  void NotifyReporterDone() override { reporter_done_notified_ = true; }
-
   // Sets |path| in the local state to a date corresponding to |days| days ago.
   void SetDateInLocalState(const std::string& path, int days) {
     PrefService* local_state = g_browser_process->local_state();
-    DCHECK_NE(local_state, nullptr);
-    local_state->SetInt64(path,
-                          (base::Time::Now() - base::TimeDelta::FromDays(days))
-                              .ToInternalValue());
+    local_state->SetInt64(
+        path, (Now() - base::TimeDelta::FromDays(days)).ToInternalValue());
   }
 
-  void SetDaysSinceLastReport(int days) {
+  // Sets local state for last time the software reporter ran to |days| days
+  // ago.
+  void SetDaysSinceLastTriggered(int days) {
     SetDateInLocalState(prefs::kSwReporterLastTimeTriggered, days);
   }
 
-  void ExpectToRunAgain(int days) {
-    ASSERT_TRUE(task_runner_->HasPendingTask());
-    EXPECT_LE(task_runner_->NextPendingTaskDelay(),
-              base::TimeDelta::FromDays(days));
-    EXPECT_GT(task_runner_->NextPendingTaskDelay(),
-              base::TimeDelta::FromDays(days) - base::TimeDelta::FromHours(1));
-  }
-
-  // Clears local state for last time the software reporter sent logs to |days|
-  // days ago. This prevents potential false positives that could arise from
-  // state not properly cleaned between successive tests.
-  void ClearLastTimeSentReport() {
-    DCHECK_NE(g_browser_process, nullptr);
-    PrefService* local_state = g_browser_process->local_state();
-    DCHECK_NE(local_state, nullptr);
-    local_state->ClearPref(prefs::kSwReporterLastTimeSentReport);
-  }
-
   // Sets local state for last time the software reporter sent logs to |days|
   // days ago.
   void SetLastTimeSentReport(int days) {
     SetDateInLocalState(prefs::kSwReporterLastTimeSentReport, days);
   }
 
+  // Clears local state for last time the software reporter sent logs. This
+  // prevents potential false positives that could arise from state not
+  // properly cleaned between successive tests.
+  void ClearLastTimeSentReport() {
+    PrefService* local_state = g_browser_process->local_state();
+    local_state->ClearPref(prefs::kSwReporterLastTimeSentReport);
+  }
+
+  // Retrieves the timestamp of the last time the software reporter sent logs.
   int64_t GetLastTimeSentReport() {
     const PrefService* local_state = g_browser_process->local_state();
-    DCHECK_NE(local_state, nullptr);
     DCHECK(local_state->HasPrefPath(prefs::kSwReporterLastTimeSentReport));
     return local_state->GetInt64(prefs::kSwReporterLastTimeSentReport);
   }
 
+  void EnableSBExtendedReporting() {
+    Browser* browser = chrome::FindLastActive();
+    DCHECK(browser);
+    Profile* profile = browser->profile();
+    SetExtendedReportingPref(profile->GetPrefs(), true);
+  }
+
+  // Expects that the reporter has been scheduled to launch again in |days|
+  // days.
+  void ExpectToRunAgain(int days) {
+    EXPECT_TRUE(mock_time_task_runner_->HasPendingTask());
+    EXPECT_LT(base::TimeDelta::FromDays(days) - base::TimeDelta::FromHours(1),
+              mock_time_task_runner_->NextPendingTaskDelay());
+    EXPECT_GE(base::TimeDelta::FromDays(days),
+              mock_time_task_runner_->NextPendingTaskDelay());
+  }
+
+  // Expects that after |days_until_launch| days, the reporter will be
+  // launched |expected_launch_count| times, and TriggerPrompt will be
+  // called if and only if |expect_prompt| is true.
+  void ExpectReporterLaunches(int days_until_launch,
+                              int expected_launch_count,
+                              bool expect_prompt) {
+    EXPECT_TRUE(mock_time_task_runner_->HasPendingTask());
+    reporter_launch_count_ = 0;
+    reporter_launch_parameters_.clear();
+    prompt_trigger_called_ = false;
+
+    mock_time_task_runner_->FastForwardBy(
+        base::TimeDelta::FromDays(days_until_launch));
+
+    EXPECT_EQ(expected_launch_count, reporter_launch_count_);
+    EXPECT_EQ(expect_prompt, prompt_trigger_called_);
+  }
+
+  // Expects that after |days_until_launched| days, the reporter will be
+  // launched once with each path in |expected_launch_paths|, and TriggerPrompt
+  // will be called if and only if |expect_prompt| is true.
+  void ExpectReporterLaunches(
+      int days_until_launch,
+      const std::vector<base::FilePath>& expected_launch_paths,
+      bool expect_prompt) {
+    ExpectReporterLaunches(days_until_launch, expected_launch_paths.size(),
+                           expect_prompt);
+    EXPECT_EQ(expected_launch_paths.size(), reporter_launch_parameters_.size());
+    for (size_t i = 0; i < expected_launch_paths.size() &&
+                       i < reporter_launch_parameters_.size();
+         ++i) {
+      EXPECT_EQ(expected_launch_paths[i],
+                reporter_launch_parameters_[i].command_line.GetProgram());
+    }
+  }
+
   void ExpectLastTimeSentReportNotSet() {
     PrefService* local_state = g_browser_process->local_state();
-    DCHECK_NE(local_state, nullptr);
     EXPECT_FALSE(
         local_state->HasPrefPath(prefs::kSwReporterLastTimeSentReport));
   }
 
   void ExpectLastReportSentInTheLastHour() {
     const PrefService* local_state = g_browser_process->local_state();
-    DCHECK_NE(local_state, nullptr);
-    const base::Time now = base::Time::Now();
+    const base::Time now = Now();
     const base::Time last_time_sent_logs = base::Time::FromInternalValue(
         local_state->GetInt64(prefs::kSwReporterLastTimeSentReport));
 
     // Checks if the last time sent logs is set as no more than one hour ago,
     // which should be enough time if the execution does not fail.
     EXPECT_LT(now - base::TimeDelta::FromHours(1), last_time_sent_logs);
-    EXPECT_LT(last_time_sent_logs, now);
+    EXPECT_GE(now, last_time_sent_logs);
   }
 
-  // Run through the steps needed to launch the reporter, as many times as
-  // needed to launch all the reporters given in |expected_launch_paths|. Test
-  // that each of those launches succeeded. But do not test that ONLY those
-  // launches succeeded.
-  //
-  // After this, if more launches are expected you can call
-  // |TestPartialLaunchCycle| again with another list of paths, to test that
-  // the launch cycle will continue with those paths.
-  //
-  // To test that a list of paths are launched AND NO OTHERS, use
-  // |TestReporterLaunchCycle|.
-  void TestPartialLaunchCycle(
-      const std::vector<base::FilePath>& expected_launch_paths) {
-    // This test has an unfortunate amount of knowledge of the internals of
-    // ReporterRunner, because it needs to pump the right message loops at the
-    // right time so that all its internal messages are delivered. This
-    // function might need to be updated if the internals change.
-    //
-    // The basic sequence is:
-    //
-    // 1. TryToRun kicks the whole thing off. If the reporter should not be
-    // launched now (eg. DaysSinceLastReport is too low) it posts a call to
-    // itself again. (In a regular task runner this will be scheduled with a
-    // delay, but the test task runner ignores delays so TryToRun will be
-    // called again on the next call to RunPendingTasks.)
-    //
-    // 2. When it is time to run a reporter, TryToRun calls NotifyLaunchReady
-    // and then posts a call to LaunchAndWait.
-    //
-    // 3. When the reporter returns, a call to ReporterDone is posted on the UI
-    // thread.
-    //
-    // 4. ReporterDone calls NotifyReporterDone and then posts another call to
-    // TryToRun, which starts the whole process over for the next run.
-    //
-    // Each call to RunPendingTasks only handles messages already on the queue.
-    // It doesn't handle messages posted by those messages. So, we need to call
-    // it in a loop to make sure we're past all pending TryToRun calls before
-    // LaunchAndWaitForExit will be called.
-    //
-    // Once a call to LaunchAndWaitForExit has been posted, TryToRun won't be
-    // called again until we pump the UI message loop in order to run
-    // ReporterDone.
-
-    ASSERT_TRUE(task_runner_->HasPendingTask());
-    ASSERT_FALSE(reporter_done_notified_);
-
-    reporter_launch_count_ = 0;
-    reporter_launch_parameters_ = SwReporterInvocation();
-
-    int current_launch_count = reporter_launch_count_;
-    for (const auto& expected_launch_path : expected_launch_paths) {
-      // If RunReporter was called with no pending messages, and it was already
-      // time to launch the reporter, then |launch_ready_notified_| will
-      // already be true. Otherwise there will be a TryToRun message pending,
-      // which must be processed first.
-      if (!launch_ready_notified_) {
-        task_runner_->RunPendingTasks();
-        // Since we're expecting a launch here, we expect it to schedule
-        // LaunchAndWaitForExit. So NOW |launch_ready_notified_| should be
-        // true.
-        ASSERT_TRUE(task_runner_->HasPendingTask());
-      }
-      ASSERT_TRUE(launch_ready_notified_);
-      ASSERT_EQ(current_launch_count, reporter_launch_count_);
-
-      // Reset |launch_ready_notified_| so that we can tell if TryToRun gets
-      // called again unexpectedly.
-      launch_ready_notified_ = false;
-
-      // Call the pending LaunchAndWaitForExit.
-      task_runner_->RunPendingTasks();
-      ASSERT_FALSE(launch_ready_notified_);
-      ASSERT_FALSE(reporter_done_notified_);
-
-      // At this point LaunchAndWaitForExit has definitely been called if
-      // it's going to be called at all. (If not, TryToRun will have been
-      // scheduled again.)
-      EXPECT_EQ(current_launch_count + 1, reporter_launch_count_);
-      EXPECT_EQ(expected_launch_path,
-                reporter_launch_parameters_.command_line.GetProgram());
-
-      // Pump the UI message loop to process the ReporterDone call (which
-      // will schedule the next TryToRun.) If LaunchAndWaitForExit wasn't
-      // called, this does nothing.
-      base::RunLoop().RunUntilIdle();
-
-      // At this point there are three things that could have happened:
-      //
-      // 1. LaunchAndWaitForExit was not called. There should be a TryToRun
-      // scheduled.
-      //
-      // 2. ReporterDone was called and there was nothing left in the queue
-      // of SwReporterInvocation's. There should be a TryToRun scheduled.
-      //
-      // 3. ReporterDone was called and there were more
-      // SwReporterInvocation's in the queue to run immediately. There should
-      // be a LaunchAndWaitForExit scheduled.
-      //
-      // So in all cases there should be a pending task, and if we are expecting
-      // more launches in this loop, |launch_ready_notified_| will already be
-      // true.
-      ASSERT_TRUE(task_runner_->HasPendingTask());
-
-      // The test task runner does not actually advance the clock. Pretend that
-      // one day has passed. (Otherwise, when we launch the last
-      // SwReporterInvocation in the queue, the next call to TryToRun will
-      // start a whole new launch cycle.)
-      SetDaysSinceLastReport(1);
-
-      reporter_done_notified_ = false;
-      current_launch_count = reporter_launch_count_;
-    }
-  }
-
-  // Run through the steps needed to launch the reporter, as many times as
-  // needed to launch all the reporters given in |expected_launch_paths|. Test
-  // that each of those launches succeeded. Then, run through the steps needed
-  // to launch the reporter again, to test that the launch cycle is complete
-  // (no more reporters will be launched).
-  void TestReporterLaunchCycle(
-      const std::vector<base::FilePath>& expected_launch_paths) {
-    TestPartialLaunchCycle(expected_launch_paths);
-
-    // Now that all expected launches have been tested, run the cycle once more
-    // to make sure no more launches happen.
-    ASSERT_TRUE(task_runner_->HasPendingTask());
-    ASSERT_FALSE(reporter_done_notified_);
-    ASSERT_FALSE(launch_ready_notified_);
-
-    int current_launch_count = reporter_launch_count_;
-
-    // Call the pending TryToRun.
-    task_runner_->RunPendingTasks();
-
-    // We expect that this scheduled another TryToRun. If it scheduled
-    // LaunchAndWaitForExit an unexpected launch is about to happen.
-    ASSERT_TRUE(task_runner_->HasPendingTask());
-    ASSERT_FALSE(launch_ready_notified_);
-    ASSERT_FALSE(reporter_done_notified_);
-    ASSERT_EQ(current_launch_count, reporter_launch_count_);
-  }
-
-  // Expects |reporter_launch_parameters_| to contain exactly the command line
-  // switches specified in |expected_switches|.
-  void ExpectLoggingSwitches(const std::set<std::string>& expected_switches) {
+  // Expects |invocation|'s command line to contain all the switches required
+  // for reporter logging.
+  void ExpectLoggingSwitches(const SwReporterInvocation& invocation,
+                             bool expect_switches) {
     const base::CommandLine::SwitchMap& invocation_switches =
-        reporter_launch_parameters_.command_line.GetSwitches();
+        invocation.command_line.GetSwitches();
+    std::set<std::string> expected_switches;
+    if (expect_switches)
+      expected_switches = {std::begin(kExpectedSwitches),
+                           std::end(kExpectedSwitches)};
     EXPECT_EQ(expected_switches.size(), invocation_switches.size());
     // Checks if all expected switches are in the invocation switches. It's not
     // necessary to check if all invocation switches are expected, since we
     // checked if both sets should have the same size.
     for (const std::string& expected_switch : expected_switches) {
-      EXPECT_NE(invocation_switches.find(expected_switch),
-                invocation_switches.end());
+      EXPECT_NE(invocation_switches.end(),
+                invocation_switches.find(expected_switch));
     }
   }
 
-  void EnableSBExtendedReporting() {
-    Browser* browser = chrome::FindLastActive();
-    ASSERT_NE(browser, nullptr);
-    Profile* profile = browser->profile();
-    ASSERT_NE(profile, nullptr);
-    SetExtendedReportingPref(profile->GetPrefs(), true);
-  }
+  // A task runner with a mock clock.
+  scoped_refptr<base::TestMockTimeTaskRunner> mock_time_task_runner_ =
+      new base::TestMockTimeTaskRunner();
 
-  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  // The task runner that was in use before installing |mock_time_task_runner_|.
+  scoped_refptr<base::SingleThreadTaskRunner> saved_task_runner_;
+
   bool prompt_trigger_called_ = false;
   int reporter_launch_count_ = 0;
-  SwReporterInvocation reporter_launch_parameters_;
+  std::vector<SwReporterInvocation> reporter_launch_parameters_;
   int exit_code_to_report_ = kReporterFailureExitCode;
 
-  // This will be set to true when a call to |LaunchAndWaitForExit| is next in
-  // the task queue.
-  bool launch_ready_notified_ = false;
-
-  bool reporter_done_notified_ = false;
+  // A callback to invoke when the first reporter of a queue is launched. This
+  // can be used to perform actions in the middle of a queue of reporters which
+  // all launch on the same mock clock tick.
+  base::OnceClosure first_launch_callback_;
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, NothingFound) {
-  exit_code_to_report_ = kSwReporterNothingFound;
-  RunReporter();
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(1, reporter_launch_count_);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(prompt_trigger_called_);
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 1, false);
   ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, CleanupNeeded) {
-  exit_code_to_report_ = kSwReporterCleanupNeeded;
-  RunReporter();
-
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(1, reporter_launch_count_);
-  // The reply task from the task posted to run the reporter is run on a
-  // specific thread, as opposed to a specific task runner, and that thread is
-  // the current message loop's thread.
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(prompt_trigger_called_);
+  RunReporter(kSwReporterCleanupNeeded);
+  ExpectReporterLaunches(0, 1, true);
   ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, RanRecently) {
   constexpr int kDaysLeft = 1;
-  SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
-  RunReporter();
-
-  // Here we can't run until idle since the ReporterRunner will re-post
-  // infinitely.
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(0, reporter_launch_count_);
-
+  SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 0, false);
   ExpectToRunAgain(kDaysLeft);
-  task_runner_->ClearPendingTasks();
+  ExpectReporterLaunches(kDaysLeft, 1, false);
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, WaitForBrowser) {
   Profile* profile = browser()->profile();
-  CloseAllBrowsers();
 
-  exit_code_to_report_ = kSwReporterCleanupNeeded;
-  RunReporter();
+  // Ensure that even though we're closing the last browser, we don't enter the
+  // "shutting down" state, which will prevent the test from starting another
+  // browser.
+  ScopedKeepAlive test_keep_alive(KeepAliveOrigin::SESSION_RESTORE,
+                                  KeepAliveRestartOption::ENABLED);
 
-  task_runner_->RunPendingTasks();
+  // Use the standard task runner for browser cleanup, which will wait forever
+  // with the mock clock.
+  base::MessageLoop::current()->SetTaskRunner(saved_task_runner_);
+  CloseBrowserSynchronously(browser());
+  base::MessageLoop::current()->SetTaskRunner(mock_time_task_runner_);
+  ASSERT_EQ(0u, chrome::GetTotalBrowserCount());
+  ASSERT_FALSE(chrome::FindLastActive());
+
+  // Start the reporter while the browser is closed. The prompt should not open.
+  RunReporter(kSwReporterCleanupNeeded);
+  ExpectReporterLaunches(0, 1, false);
+
+  // Create a Browser object directly instead of using helper functions like
+  // CreateBrowser, because they all wait on timed events but do not advance the
+  // mock timer. The Browser constructor registers itself with the global
+  // BrowserList, which is cleaned up when InProcessBrowserTest exits.
+  new Browser(Browser::CreateParams(profile, /*user_gesture=*/false));
+  ASSERT_EQ(1u, chrome::GetTotalBrowserCount());
+
+  // Some browser startup tasks are scheduled to run in the first few minutes
+  // after creation. Make sure they've all been processed so that the only
+  // pending task in the queue is the next reporter check.
+  mock_time_task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(10));
+
+  // On opening the new browser, the prompt should be shown and the reporter
+  // should be scheduled to run later.
   EXPECT_EQ(1, reporter_launch_count_);
-
-  CreateBrowser(profile);
   EXPECT_TRUE(prompt_trigger_called_);
   ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, Failure) {
-  exit_code_to_report_ = kReporterFailureExitCode;
-  RunReporter();
-
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(1, reporter_launch_count_);
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(prompt_trigger_called_);
+  RunReporter(kReporterFailureExitCode);
+  ExpectReporterLaunches(0, 1, false);
   ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, RunDaily) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetBoolean(prefs::kSwReporterPendingPrompt, true);
-  SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns - 1);
-  DCHECK_GT(kDaysBetweenSuccessfulSwReporterRuns - 1,
+  SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - 1);
+  ASSERT_GT(kDaysBetweenSuccessfulSwReporterRuns - 1,
             kDaysBetweenSwReporterRunsForPendingPrompt);
-  RunReporter();
+  RunReporter(kSwReporterNothingFound);
 
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(1, reporter_launch_count_);
-  reporter_launch_count_ = 0;
-  base::RunLoop().RunUntilIdle();
+  // Expect the reporter to run immediately, since a prompt is pending and it
+  // has been more than kDaysBetweenSwReporterRunsForPendingPrompt days.
+  ExpectReporterLaunches(0, 1, false);
   ExpectToRunAgain(kDaysBetweenSwReporterRunsForPendingPrompt);
 
+  // Move the clock ahead kDaysBetweenSwReporterRunsForPendingPrompt days. The
+  // expected run should trigger, but not cause the reporter to launch because
+  // a prompt is no longer pending.
   local_state->SetBoolean(prefs::kSwReporterPendingPrompt, false);
-  task_runner_->RunPendingTasks();
-  EXPECT_EQ(0, reporter_launch_count_);
-  base::RunLoop().RunUntilIdle();
+  ExpectReporterLaunches(kDaysBetweenSwReporterRunsForPendingPrompt, 0, false);
+
+  // Instead it should now run kDaysBetweenSuccessfulSwReporterRuns after the
+  // first prompt (of which kDaysBetweenSwReporterRunsForPendingPrompt has
+  // already passed.)
+  int days_left = kDaysBetweenSuccessfulSwReporterRuns -
+                  kDaysBetweenSwReporterRunsForPendingPrompt;
+  ExpectToRunAgain(days_left);
+  ExpectReporterLaunches(days_left, 1, false);
   ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ParameterChange) {
-  exit_code_to_report_ = kSwReporterNothingFound;
-
   // If the reporter is run several times with different parameters, it should
   // only be launched once, with the last parameter set.
   const base::FilePath path1(L"path1");
@@ -432,29 +379,27 @@
   constexpr int kDaysLeft = 1;
   {
     SCOPED_TRACE("N days left until next reporter run");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
-    RunReporter(path1);
-    TestReporterLaunchCycle({});
+    SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns - kDaysLeft);
+    RunReporter(kSwReporterNothingFound, path1);
+    ExpectReporterLaunches(0, {}, false);
   }
 
   // Schedule path2 just as we enter the next reporting period.
   // Now the reporter should launch, just once, using path2.
   {
     SCOPED_TRACE("Reporter runs now");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporter(path2);
+    RunReporter(kSwReporterNothingFound, path2);
     // Schedule it twice; it should only actually run once.
-    RunReporter(path2);
-    TestReporterLaunchCycle({path2});
+    RunReporter(kSwReporterNothingFound, path2);
+    ExpectReporterLaunches(kDaysLeft, {path2}, false);
   }
 
   // Schedule path3 before any more time has passed.
   // The reporter should not launch.
   {
     SCOPED_TRACE("No more time passed");
-    SetDaysSinceLastReport(0);
-    RunReporter(path3);
-    TestReporterLaunchCycle({});
+    RunReporter(kSwReporterNothingFound, path3);
+    ExpectReporterLaunches(0, {}, false);
   }
 
   // Enter the next reporting period as path3 is still scheduled.
@@ -462,8 +407,8 @@
   // parameters from the first launch aren't reused.)
   {
     SCOPED_TRACE("Previous run still scheduled");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    TestReporterLaunchCycle({path3});
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path3},
+                           false);
   }
 
   // Schedule path3 again in the next reporting period.
@@ -471,15 +416,15 @@
   // passed, even though the parameters haven't changed.
   {
     SCOPED_TRACE("Run with same parameters");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporter(path3);
-    TestReporterLaunchCycle({path3});
+    RunReporter(kSwReporterNothingFound, path3);
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path3},
+                           false);
   }
+
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, MultipleLaunches) {
-  exit_code_to_report_ = kSwReporterNothingFound;
-
   const base::FilePath path1(L"path1");
   const base::FilePath path2(L"path2");
   const base::FilePath path3(L"path3");
@@ -490,100 +435,99 @@
 
   {
     SCOPED_TRACE("Launch 2 times");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporterQueue(invocations);
-    TestReporterLaunchCycle({path1, path2});
+    SetDaysSinceLastTriggered(kDaysBetweenSuccessfulSwReporterRuns);
+    RunReporterQueue(kSwReporterNothingFound, invocations);
+    ExpectReporterLaunches(0, {path1, path2}, false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
   }
 
   // Schedule a launch with 2 elements, then another with the same 2. It should
   // just run 2 times, not 4.
   {
     SCOPED_TRACE("Launch 2 times with retry");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporterQueue(invocations);
-    RunReporterQueue(invocations);
-    TestReporterLaunchCycle({path1, path2});
+    RunReporterQueue(kSwReporterNothingFound, invocations);
+    RunReporterQueue(kSwReporterNothingFound, invocations);
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path1, path2},
+                           false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
   }
 
-  // Schedule a launch with 2 elements, then add a third while the queue is
-  // running.
+  // Another launch with 2 elements is already scheduled. Add a third while the
+  // queue is running.
   {
     SCOPED_TRACE("Add third launch while running");
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporterQueue(invocations);
-
-    // Only test the cycle once, to process the first element in queue.
-    TestPartialLaunchCycle({path1});
-
     invocations.push(SwReporterInvocation::FromFilePath(path3));
-    RunReporterQueue(invocations);
+    first_launch_callback_ = base::BindOnce(
+        &SRTFetcherTest::RunReporterQueue, base::Unretained(this),
+        kSwReporterNothingFound, invocations);
 
-    // There is still a 2nd element on the queue - that should execute, and
-    // nothing more.
-    TestReporterLaunchCycle({path2});
+    // Only the first two elements should execute since the third was added
+    // during the cycle.
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path1, path2},
+                           false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 
     // Time passes... Now the 3-element queue should run.
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    TestReporterLaunchCycle({path1, path2, path3});
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns,
+                           {path1, path2, path3}, false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
   }
 
   // Second launch should not occur after a failure.
   {
     SCOPED_TRACE("Launch multiple times with failure");
-    exit_code_to_report_ = kReporterFailureExitCode;
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    RunReporterQueue(invocations);
-    TestReporterLaunchCycle({path1});
+    RunReporterQueue(kReporterFailureExitCode, invocations);
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path1},
+                           false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 
     // If we try again before the reporting period is up, it should not do
     // anything.
-    TestReporterLaunchCycle({});
+    ExpectReporterLaunches(0, {}, false);
 
     // After enough time has passed, should try the queue again.
-    SetDaysSinceLastReport(kDaysBetweenSuccessfulSwReporterRuns);
-    TestReporterLaunchCycle({path1});
+    ExpectReporterLaunches(kDaysBetweenSuccessfulSwReporterRuns, {path1},
+                           false);
+    ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_NoSBExtendedReporting) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   base::test::ScopedFeatureList scoped_feature_list;
-  RunReporter();
-  TestReporterLaunchCycle({base::FilePath()});
-  ExpectLoggingSwitches({/*expect no switches*/});
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 1, false);
+  ExpectLoggingSwitches(reporter_launch_parameters_.front(), false);
   ExpectLastTimeSentReportNotSet();
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_EnabledFirstRun) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   base::test::ScopedFeatureList scoped_feature_list;
   EnableSBExtendedReporting();
   // Note: don't set last time sent logs in the local state.
   // SBER is enabled and there is no record in the local state of the last time
   // logs have been sent, so we should send logs in this run.
-  RunReporter();
-  TestReporterLaunchCycle({base::FilePath()});
-  ExpectLoggingSwitches(std::set<std::string>(std::begin(kExpectedSwitches),
-                                              std::end(kExpectedSwitches)));
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 1, false);
+  ExpectLoggingSwitches(reporter_launch_parameters_.front(), true);
   ExpectLastReportSentInTheLastHour();
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_EnabledNoRecentLogging) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   base::test::ScopedFeatureList scoped_feature_list;
   // SBER is enabled and last time logs were sent was more than
   // |kDaysBetweenReporterLogsSent| day ago, so we should send logs in this run.
   EnableSBExtendedReporting();
   SetLastTimeSentReport(kDaysBetweenReporterLogsSent + 3);
-  RunReporter();
-  TestReporterLaunchCycle({base::FilePath()});
-  ExpectLoggingSwitches(std::set<std::string>(std::begin(kExpectedSwitches),
-                                              std::end(kExpectedSwitches)));
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 1, false);
+  ExpectLoggingSwitches(reporter_launch_parameters_.front(), true);
   ExpectLastReportSentInTheLastHour();
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_EnabledRecentlyLogged) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   base::test::ScopedFeatureList scoped_feature_list;
   // SBER is enabled, but logs have been sent less than
   // |kDaysBetweenReporterLogsSent| day ago, so we shouldn't send any logs in
@@ -591,14 +535,14 @@
   EnableSBExtendedReporting();
   SetLastTimeSentReport(kDaysBetweenReporterLogsSent - 1);
   int64_t last_time_sent_logs = GetLastTimeSentReport();
-  RunReporter();
-  TestReporterLaunchCycle({base::FilePath()});
-  ExpectLoggingSwitches(std::set<std::string>{/*expect no switches*/});
+  RunReporter(kSwReporterNothingFound);
+  ExpectReporterLaunches(0, 1, false);
+  ExpectLoggingSwitches(reporter_launch_parameters_.front(), false);
   EXPECT_EQ(last_time_sent_logs, GetLastTimeSentReport());
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 IN_PROC_BROWSER_TEST_F(SRTFetcherTest, ReporterLogging_MultipleLaunches) {
-  exit_code_to_report_ = kSwReporterNothingFound;
   base::test::ScopedFeatureList scoped_feature_list;
   EnableSBExtendedReporting();
   SetLastTimeSentReport(kDaysBetweenReporterLogsSent + 3);
@@ -612,27 +556,27 @@
         SwReporterInvocation::BEHAVIOUR_ALLOW_SEND_REPORTER_LOGS;
     invocations.push(invocation);
   }
-  RunReporterQueue(invocations);
+  RunReporterQueue(kSwReporterNothingFound, invocations);
 
   // SBER is enabled and last time logs were sent was more than
   // |kDaysBetweenReporterLogsSent| day ago, so we should send logs in this run.
   {
     SCOPED_TRACE("first launch");
-    TestPartialLaunchCycle({path1});
-    ExpectLoggingSwitches(std::set<std::string>(std::begin(kExpectedSwitches),
-                                                std::end(kExpectedSwitches)));
-    ExpectLastReportSentInTheLastHour();
+    first_launch_callback_ =
+        base::BindOnce(&SRTFetcherTest::ExpectLastReportSentInTheLastHour,
+                       base::Unretained(this));
+    ExpectReporterLaunches(0, {path1, path2}, false);
+    ExpectLoggingSwitches(reporter_launch_parameters_[0], true);
   }
 
   // Logs should also be sent for the next run, even though LastTimeSentReport
   // is now recent, because the run is part of the same set of invocations.
   {
     SCOPED_TRACE("second launch");
-    TestReporterLaunchCycle({path2});
-    ExpectLoggingSwitches(std::set<std::string>(std::begin(kExpectedSwitches),
-                                                std::end(kExpectedSwitches)));
+    ExpectLoggingSwitches(reporter_launch_parameters_[1], true);
     ExpectLastReportSentInTheLastHour();
   }
+  ExpectToRunAgain(kDaysBetweenSuccessfulSwReporterRuns);
 }
 
 }  // namespace safe_browsing

diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.cc b/chrome/browser/safe_browsing/srt_fetcher_win.cc
index 58c8d59..58c74c9 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_win.cc
+++ b/chrome/browser/safe_browsing/srt_fetcher_win.cc

@@ -27,7 +27,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
+#include "base/task_scheduler/post_task.h"
+#include "base/task_scheduler/task_traits.h"
 #include "base/time/time.h"
+#include "base/version.h"
 #include "base/win/registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
@@ -713,6 +716,10 @@
   new SRTFetcher(profile);
 }
 
+base::Time Now() {
+  return g_testing_delegate_ ? g_testing_delegate_->Now() : base::Time::Now();
+}
+
 }  // namespace
 
 // This class tries to run a queue of reporters and react to their exit codes.
@@ -722,11 +729,8 @@
  public:
   // Registers |invocations| to run next time |TryToRun| is scheduled. (And if
   // it's not already scheduled, call it now.)
-  static void ScheduleInvocations(
-      const SwReporterQueue& invocations,
-      const base::Version& version,
-      scoped_refptr<base::TaskRunner> main_thread_task_runner,
-      scoped_refptr<base::TaskRunner> blocking_task_runner) {
+  static void ScheduleInvocations(const SwReporterQueue& invocations,
+                                  const base::Version& version) {
     if (!instance_) {
       instance_ = new ReporterRunner;
       ANNOTATE_LEAKING_OBJECT_PTR(instance_);
@@ -742,9 +746,6 @@
 
     instance_->pending_invocations_ = invocations;
     instance_->version_ = version;
-    instance_->main_thread_task_runner_ = std::move(main_thread_task_runner);
-    instance_->blocking_task_runner_ = std::move(blocking_task_runner);
-
     if (instance_->first_run_) {
       instance_->first_run_ = false;
       instance_->TryToRun();
@@ -771,20 +772,16 @@
     auto next_invocation = current_invocations_.front();
     current_invocations_.pop();
 
-    if (g_testing_delegate_)
-      g_testing_delegate_->NotifyLaunchReady();
-
     AppendInvocationSpecificSwitches(&next_invocation);
 
-    // It's OK to simply |PostTaskAndReplyWithResult| so that
-    // |LaunchAndWaitForExit| doesn't need to access |main_thread_task_runner_|
-    // since the callback is not delayed and the test task runner won't need to
-    // force it.
+    base::TaskRunner* task_runner =
+        g_testing_delegate_ ? g_testing_delegate_->BlockingTaskRunner()
+                            : blocking_task_runner_.get();
     base::PostTaskAndReplyWithResult(
-        blocking_task_runner_.get(), FROM_HERE,
+        task_runner, FROM_HERE,
         base::Bind(&LaunchAndWaitForExit, next_invocation),
-        base::Bind(&ReporterRunner::ReporterDone, base::Unretained(this),
-                   base::Time::Now(), version_, next_invocation));
+        base::Bind(&ReporterRunner::ReporterDone, base::Unretained(this), Now(),
+                   version_, next_invocation));
   }
 
   // This method is called on the UI thread when an invocation of the reporter
@@ -796,11 +793,8 @@
                     int exit_code) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-    if (g_testing_delegate_)
-      g_testing_delegate_->NotifyReporterDone();
-
-    base::TimeDelta reporter_running_time =
-        base::Time::Now() - reporter_start_time;
+    base::Time now = Now();
+    base::TimeDelta reporter_running_time = now - reporter_start_time;
 
     // Don't continue the current queue of reporters if one failed to launch.
     if (exit_code == kReporterFailureExitCode)
@@ -811,7 +805,7 @@
     // retrying earlier, risking running too often if it always fails, since
     // not many users fail here.)
     if (current_invocations_.empty()) {
-      main_thread_task_runner_->PostDelayedTask(
+      base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&ReporterRunner::TryToRun, base::Unretained(this)),
           base::TimeDelta::FromDays(days_between_reporter_runs_));
@@ -839,7 +833,7 @@
         local_state->SetInteger(prefs::kSwReporterLastExitCode, exit_code);
       }
       local_state->SetInt64(prefs::kSwReporterLastTimeTriggered,
-                            base::Time::Now().ToInternalValue());
+                            now.ToInternalValue());
     }
     uma.ReportRuntime(reporter_running_time);
     uma.ReportScanTimes();
@@ -902,7 +896,7 @@
     } else {
       days_between_reporter_runs_ = kDaysBetweenSuccessfulSwReporterRuns;
     }
-    const base::Time now = base::Time::Now();
+    const base::Time now = Now();
     const base::Time last_time_triggered = base::Time::FromInternalValue(
         local_state->GetInt64(prefs::kSwReporterLastTimeTriggered));
     const base::Time next_trigger(
@@ -930,7 +924,7 @@
       current_invocations_ = pending_invocations_;
       ScheduleNextInvocation();
     } else {
-      main_thread_task_runner_->PostDelayedTask(
+      base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&ReporterRunner::TryToRun, base::Unretained(this)),
           next_trigger - now);
@@ -977,7 +971,7 @@
       // state values after the reporter runs, we could send logs again too
       // quickly (for example, if Chrome stops before the reporter finishes).
       local_state->SetInt64(prefs::kSwReporterLastTimeSentReport,
-                            base::Time::Now().ToInternalValue());
+                            Now().ToInternalValue());
     }
 
     if (ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled())
@@ -1003,8 +997,17 @@
   SwReporterQueue pending_invocations_;
 
   base::Version version_;
-  scoped_refptr<base::TaskRunner> main_thread_task_runner_;
-  scoped_refptr<base::TaskRunner> blocking_task_runner_;
+
+  scoped_refptr<base::TaskRunner> blocking_task_runner_ =
+      base::CreateTaskRunnerWithTraits(
+          // LaunchAndWaitForExit() creates (MayBlock()) and joins
+          // (WithBaseSyncPrimitives()) a process.
+          base::TaskTraits()
+              .WithShutdownBehavior(
+                  base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
+              .WithPriority(base::TaskPriority::BACKGROUND)
+              .MayBlock()
+              .WithBaseSyncPrimitives());
 
   // This value is used to identify how long to wait before starting a new run
   // of the reporter queue. It's initialized with the default value and may be
@@ -1054,14 +1057,10 @@
 }
 
 void RunSwReporters(const SwReporterQueue& invocations,
-                    const base::Version& version,
-                    scoped_refptr<base::TaskRunner> main_thread_task_runner,
-                    scoped_refptr<base::TaskRunner> blocking_task_runner) {
+                    const base::Version& version) {
   DCHECK(!invocations.empty());
   DCHECK(version.IsValid());
-  ReporterRunner::ScheduleInvocations(invocations, version,
-                                      std::move(main_thread_task_runner),
-                                      std::move(blocking_task_runner));
+  ReporterRunner::ScheduleInvocations(invocations, version);
 }
 
 bool ReporterFoundUws() {

diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.h b/chrome/browser/safe_browsing/srt_fetcher_win.h
index c5a0f08e..95c63bda 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_win.h
+++ b/chrome/browser/safe_browsing/srt_fetcher_win.h

@@ -11,15 +11,13 @@
 #include <queue>
 #include <string>
 
-#include "base/callback_forward.h"
 #include "base/command_line.h"
-#include "base/feature_list.h"
-#include "base/memory/ref_counted.h"
-#include "base/version.h"
+#include "base/time/time.h"
 
 namespace base {
 class FilePath;
 class TaskRunner;
+class Version;
 }
 
 class Browser;
@@ -95,12 +93,9 @@
 // queue of SwReporters to execute as a single "run". When a new try is
 // scheduled the entire queue is executed.
 //
-// |version| is the version of the tool that will run. The task runners are
-// provided to allow tests to provide their own.
+// |version| is the version of the tool that will run.
 void RunSwReporters(const SwReporterQueue& invocations,
-                    const base::Version& version,
-                    scoped_refptr<base::TaskRunner> main_thread_task_runner,
-                    scoped_refptr<base::TaskRunner> blocking_task_runner);
+                    const base::Version& version);
 
 // Returns true iff Local State is successfully accessed and indicates the most
 // recent Reporter run terminated with an exit code indicating the presence of
@@ -125,11 +120,11 @@
   virtual void TriggerPrompt(Browser* browser,
                              const std::string& reporter_version) = 0;
 
-  // Callback to let the tests know the reporter is ready to launch.
-  virtual void NotifyLaunchReady() = 0;
+  // Returns the test's idea of the current time.
+  virtual base::Time Now() const = 0;
 
-  // Callback to let the tests know the reporter has finished running.
-  virtual void NotifyReporterDone() = 0;
+  // A task runner used to spawn the reporter process (which blocks).
+  virtual base::TaskRunner* BlockingTaskRunner() const = 0;
 };
 
 // Set a delegate for testing. The implementation will not take ownership of

diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc
index 2a5fad9..28cd7dd 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc

@@ -93,7 +93,7 @@
       base::FilePath chrome_exe_path;
       PathService::Get(base::FILE_EXE, &chrome_exe_path);
       srt_command_line.AppendSwitchPath(kChromeExePathSwitch, chrome_exe_path);
-      if (!InstallUtil::IsPerUserInstall(chrome_exe_path))
+      if (!InstallUtil::IsPerUserInstall())
         srt_command_line.AppendSwitch(kChromeSystemInstallSwitch);
 
       if (metrics_enabled) {

diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 68ad9f8..7953aa7e 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc

@@ -418,7 +418,8 @@
   model()->Add(CreateTestTemplateURL(ASCIIToUTF16("key2"), "http://key2.com"));
   std::string fake_id("blahblahblah");
   std::string fake_url = std::string(kOmniboxScheme) + "://" + fake_id;
-  model()->RegisterOmniboxKeyword(fake_id, "unittest", "key3", fake_url);
+  model()->RegisterOmniboxKeyword(fake_id, "unittest", "key3", fake_url,
+                                  Time());
   syncer::SyncDataList all_sync_data =
       model()->GetAllSyncData(syncer::SEARCH_ENGINES);
 
@@ -1076,14 +1077,14 @@
 
   // Add some extension keywords locally.
   model()->RegisterOmniboxKeyword("extension1", "unittest", "keyword1",
-                                  "http://extension1");
+                                  "http://extension1", Time());
   TemplateURL* extension1 =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword1"));
   ASSERT_TRUE(extension1);
   EXPECT_EQ(0U, processor()->change_list_size());
 
   model()->RegisterOmniboxKeyword("extension2", "unittest", "keyword2",
-                                  "http://extension2");
+                                  "http://extension2", Time());
   TemplateURL* extension2 =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword2"));
   ASSERT_TRUE(extension2);
@@ -1099,17 +1100,11 @@
     CreateTestTemplateURL(ASCIIToUTF16("keyword2"), "http://bbb.com")));
   model()->ProcessSyncChanges(FROM_HERE, changes);
 
-  EXPECT_FALSE(model()->GetTemplateURLForHost("aaa.com") == NULL);
+  EXPECT_TRUE(model()->GetTemplateURLForHost("aaa.com"));
+  EXPECT_TRUE(model()->GetTemplateURLForHost("bbb.com"));
   EXPECT_EQ(extension1,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword1")));
-  TemplateURL* url_for_keyword2 =
-      model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword2"));
-  EXPECT_NE(extension2, url_for_keyword2);
-  EXPECT_EQ("http://bbb.com", url_for_keyword2->url());
-
-  EXPECT_EQ(extension1,
-            model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword1")));
-  EXPECT_EQ(model()->GetTemplateURLForHost("bbb.com"),
+  EXPECT_EQ(extension2,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword2")));
 }
 

diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index 07abd017..5d1c2ea 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc

@@ -176,6 +176,12 @@
                                   Time last_modified,
                                   Time last_visited);
 
+  // Add extension controlled search engine with |keyword| to model.
+  TemplateURL* AddExtensionSearchEngine(const std::string& keyword,
+                                        const std::string& extension_name,
+                                        bool wants_to_be_default_engine,
+                                        const base::Time& install_time);
+
   // Verifies the two TemplateURLs are equal.
   void AssertEquals(const TemplateURL& expected, const TemplateURL& actual);
 
@@ -253,6 +259,26 @@
                               last_visited);
 }
 
+TemplateURL* TemplateURLServiceTest::AddExtensionSearchEngine(
+    const std::string& keyword,
+    const std::string& extension_name,
+    bool wants_to_be_default_engine,
+    const base::Time& install_time) {
+  std::unique_ptr<TemplateURLData> turl_data =
+      GenerateDummyTemplateURLData(keyword);
+  turl_data->safe_for_autoreplace = false;
+
+  auto ext_dse = base::MakeUnique<TemplateURL>(
+      *turl_data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+  auto extension_info =
+      base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(extension_name);
+  extension_info->wants_to_be_default_engine = wants_to_be_default_engine;
+  extension_info->install_time = install_time;
+
+  return model()->AddExtensionControlledTURL(std::move(ext_dse),
+                                             std::move(extension_info));
+}
+
 void TemplateURLServiceTest::AssertEquals(const TemplateURL& expected,
                                           const TemplateURL& actual) {
   ASSERT_EQ(expected.short_name(), actual.short_name());
@@ -315,7 +341,7 @@
   auto overrides_list = base::MakeUnique<base::ListValue>();
   overrides_list->Append(std::move(entry));
 
-  auto prefs = test_util()->profile()->GetTestingPrefService();
+  auto* prefs = test_util()->profile()->GetTestingPrefService();
   prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
                      new base::FundamentalValue(1));
   prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides_list.release());
@@ -464,39 +490,42 @@
   EXPECT_EQ(ASCIIToUTF16("test2"), t_url->keyword());
 }
 
-TEST_F(TemplateURLServiceTest, AddExtensionKeyword) {
+TEST_F(TemplateURLServiceTest, AddOmniboxExtensionKeyword) {
   test_util()->VerifyLoad();
 
   AddKeywordWithDate("replaceable", "keyword1", "http://test1", std::string(),
                      std::string(), std::string(), true, "UTF-8", Time(),
                      Time(), Time());
-  TemplateURL* original2 = AddKeywordWithDate(
-      "nonreplaceable", "keyword2", "http://test2", std::string(),
-      std::string(), std::string(), false, "UTF-8", Time(), Time(), Time());
+  AddKeywordWithDate("nonreplaceable", "keyword2", "http://test2",
+                     std::string(), std::string(), std::string(), false,
+                     "UTF-8", Time(), Time(), Time());
   model()->RegisterOmniboxKeyword("test3", "extension", "keyword3",
-                                  "http://test3");
+                                  "http://test3", Time::FromDoubleT(1));
   TemplateURL* original3 =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword3"));
   ASSERT_TRUE(original3);
 
   // Extension keywords should override replaceable keywords.
-  model()->RegisterOmniboxKeyword("id1", "test", "keyword1", "http://test4");
+  model()->RegisterOmniboxKeyword("id1", "test", "keyword1", "http://test4",
+                                  Time());
   TemplateURL* extension1 = model()->FindTemplateURLForExtension(
       "id1", TemplateURL::OMNIBOX_API_EXTENSION);
   EXPECT_TRUE(extension1);
   EXPECT_EQ(extension1,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword1")));
 
-  // They should not override non-replaceable keywords.
-  model()->RegisterOmniboxKeyword("id2", "test", "keyword2", "http://test5");
+  // They should also override non-replaceable keywords.
+  model()->RegisterOmniboxKeyword("id2", "test", "keyword2", "http://test5",
+                                  Time());
   TemplateURL* extension2 = model()->FindTemplateURLForExtension(
       "id2", TemplateURL::OMNIBOX_API_EXTENSION);
   ASSERT_TRUE(extension2);
-  EXPECT_EQ(original2,
+  EXPECT_EQ(extension2,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword2")));
 
   // They should override extension keywords added earlier.
-  model()->RegisterOmniboxKeyword("id3", "test", "keyword3", "http://test6");
+  model()->RegisterOmniboxKeyword("id3", "test", "keyword3", "http://test6",
+                                  Time::FromDoubleT(4));
   TemplateURL* extension3 = model()->FindTemplateURLForExtension(
       "id3", TemplateURL::OMNIBOX_API_EXTENSION);
   ASSERT_TRUE(extension3);
@@ -504,14 +533,14 @@
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword3")));
 }
 
-TEST_F(TemplateURLServiceTest, AddSameKeywordWithExtensionPresent) {
+TEST_F(TemplateURLServiceTest, AddSameKeywordWithOmniboxExtensionPresent) {
   test_util()->VerifyLoad();
 
   // Similar to the AddSameKeyword test, but with an extension keyword masking a
   // replaceable TemplateURL.  We should still do correct conflict resolution
   // between the non-template URLs.
   model()->RegisterOmniboxKeyword("test2", "extension", "keyword",
-                                  "http://test2");
+                                  "http://test2", Time());
   TemplateURL* extension =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
   ASSERT_TRUE(extension);
@@ -531,16 +560,22 @@
   EXPECT_EQ(extension,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
   EXPECT_EQ(t_url, model()->GetTemplateURLForHost("test3"));
+  // Check that previous replaceable engine with keyword is removed.
+  EXPECT_FALSE(model()->GetTemplateURLForHost("test1"));
 
   // Adding a nonreplaceable keyword should remove the existing replaceable
-  // keyword and replace the extension as the associated URL for this keyword,
-  // but not evict the extension from the service entirely.
+  // keyword, yet extension must still be set as the associated URL for this
+  // keyword.
   data.SetShortName(ASCIIToUTF16("name2"));
   data.SetURL("http://test4");
   data.safe_for_autoreplace = false;
-  TemplateURL* t_url2 = model()->Add(base::MakeUnique<TemplateURL>(data));
-  EXPECT_EQ(t_url2,
+  TemplateURL* nonreplaceable =
+      model()->Add(base::MakeUnique<TemplateURL>(data));
+  EXPECT_EQ(extension,
             model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
+  EXPECT_EQ(nonreplaceable, model()->GetTemplateURLForHost("test4"));
+  // Check that previous replaceable engine with keyword is removed.
+  EXPECT_FALSE(model()->GetTemplateURLForHost("test3"));
 }
 
 TEST_F(TemplateURLServiceTest, NotPersistOmniboxExtensionKeyword) {
@@ -548,7 +583,7 @@
 
   // Register an omnibox keyword.
   model()->RegisterOmniboxKeyword("test", "extension", "keyword",
-                                  "chrome-extension://test");
+                                  "chrome-extension://test", Time());
   ASSERT_TRUE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword")));
 
   // Reload the data.
@@ -879,7 +914,7 @@
 
   // Register an extension with bing keyword.
   model()->RegisterOmniboxKeyword("abcdefg", "extension_name", "bing.com",
-                                  "http://abcdefg");
+                                  "http://abcdefg", Time());
   EXPECT_TRUE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("bing.com")));
 
   model()->RepairPrepopulatedSearchEngines();
@@ -892,7 +927,8 @@
             google->GenerateSearchURL(model()->search_terms_data()).host());
 
   // Bing was repaired.
-  bing = model()->GetTemplateURLForKeyword(ASCIIToUTF16("bing.com"));
+  bing =
+      model()->FindNonExtensionTemplateURLForKeyword(ASCIIToUTF16("bing.com"));
   ASSERT_TRUE(bing);
   EXPECT_EQ(TemplateURL::NORMAL, bing->type());
 
@@ -1658,6 +1694,116 @@
   EXPECT_FALSE(model()->GetTemplateURLForKeyword(ASCIIToUTF16("ext2")));
 }
 
+// Checks that correct priority is applied when resolving conflicts between the
+// omnibox extension, search engine extension and user search engines with same
+// keyword.
+TEST_F(TemplateURLServiceTest, CheckEnginesWithSameKeywords) {
+  test_util()->VerifyLoad();
+  // TemplateURLData used for user engines.
+  std::unique_ptr<TemplateURLData> turl_data =
+      GenerateDummyTemplateURLData("common_keyword");
+  turl_data->safe_for_autoreplace = false;
+
+  // Add non replaceable user engine.
+  const TemplateURL* user1 =
+      model()->Add(base::MakeUnique<TemplateURL>(*turl_data));
+
+  // Add default extension engine with same keyword as user engine.
+  const TemplateURL* extension = AddExtensionSearchEngine(
+      "common_keyword", "extension_id", true, Time::FromDoubleT(2));
+
+  // Add another non replaceable user engine with same keyword as extension.
+  const TemplateURL* user2 =
+      model()->Add(base::MakeUnique<TemplateURL>(*turl_data));
+
+  // Check extension DSE is set as default and its keyword is not changed.
+  const TemplateURL* current_dse = model()->GetDefaultSearchProvider();
+  EXPECT_EQ(extension, current_dse);
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), current_dse->keyword());
+
+  // Register omnibox keyword with same keyword as extension.
+  // Use |install_time| value less than in AddExtensionSearchEngine call above
+  // to check that omnibox api keyword is ranked higher even if installed
+  // earlier.
+  model()->RegisterOmniboxKeyword("omnibox_api_extension_id", "extension_name",
+                                  "common_keyword", "http://test3",
+                                  Time::FromDoubleT(1));
+  TemplateURL* omnibox_api = model()->FindTemplateURLForExtension(
+      "omnibox_api_extension_id", TemplateURL::OMNIBOX_API_EXTENSION);
+
+  // Expect that first non replaceable user engine keyword is changed because of
+  // conflict. Second user engine will keep its keyword.
+  EXPECT_NE(ASCIIToUTF16("common_keyword"), user1->keyword());
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), user2->keyword());
+
+  // Check that extensions kept their keywords.
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), extension->keyword());
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), omnibox_api->keyword());
+
+  // Omnibox api is accessible by keyword as most relevant.
+  EXPECT_EQ(omnibox_api,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+  // Extension controlled search engine is still set as default and can be found
+  // in TemplateURLService.
+  EXPECT_EQ(extension, model()->GetDefaultSearchProvider());
+  EXPECT_EQ(extension,
+            model()->FindTemplateURLForExtension(
+                "extension_id", TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION));
+
+  // Test removing engines.
+  // Remove omnibox api extension.
+  model()->RemoveExtensionControlledTURL("omnibox_api_extension_id",
+                                         TemplateURL::OMNIBOX_API_EXTENSION);
+  // Expect that keyword is now corresponds to extension search engine.
+  EXPECT_EQ(extension,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+  // Remove extension engine.
+  model()->RemoveExtensionControlledTURL(
+      "extension_id", TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+  EXPECT_NE(extension, model()->GetDefaultSearchProvider());
+  // Now latest user engine is returned for keyword.
+  EXPECT_EQ(user2,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+}
+
+// Check that two extensions with the same engine are handled correctly.
+TEST_F(TemplateURLServiceTest, ExtensionsWithSameKeywords) {
+  test_util()->VerifyLoad();
+
+  // Add non default extension engine.
+  const TemplateURL* extension1 = AddExtensionSearchEngine(
+      "common_keyword", "extension_id1", false, Time::FromDoubleT(1));
+
+  // Check that GetTemplateURLForKeyword returns last installed extension.
+  EXPECT_EQ(extension1,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+
+  // Add default extension engine with the same keyword.
+  const TemplateURL* extension2 = AddExtensionSearchEngine(
+      "common_keyword", "extension_id2", true, Time::FromDoubleT(2));
+
+  // Check that GetTemplateURLForKeyword now returns extension2 because it was
+  // installed later.
+  EXPECT_EQ(extension2,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+
+  // Add another non default extension with same keyword. This action must not
+  // change any keyword due to conflict.
+  const TemplateURL* extension3 = AddExtensionSearchEngine(
+      "common_keyword", "extension_id3", false, Time::FromDoubleT(3));
+
+  // Check that extension2 is set as default.
+  EXPECT_EQ(extension2, model()->GetDefaultSearchProvider());
+
+  // Check that GetTemplateURLForKeyword returns last installed extension.
+  EXPECT_EQ(extension3,
+            model()->GetTemplateURLForKeyword(ASCIIToUTF16("common_keyword")));
+  // Check that all keywords for extensions are left unchanged.
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), extension1->keyword());
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), extension2->keyword());
+  EXPECT_EQ(ASCIIToUTF16("common_keyword"), extension3->keyword());
+}
+
 TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) {
   // Set a managed preference that establishes a default search provider.
   std::unique_ptr<TemplateURLData> managed = CreateTestSearchEngine();

diff --git a/chrome/browser/service_process/OWNERS b/chrome/browser/service_process/OWNERS
index adb99ff8..3a21c291 100644
--- a/chrome/browser/service_process/OWNERS
+++ b/chrome/browser/service_process/OWNERS

@@ -1,3 +1,5 @@
 gene@chromium.org
 scottbyer@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index dc45ad02..bb6f9fc8 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc

@@ -731,14 +731,8 @@
 base::string16 GetChromiumModelIdForProfile(
     const base::FilePath& profile_path) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED();
-    return dist->GetBaseAppId();
-  }
   return GetAppModelIdForProfile(
-      ShellUtil::GetBrowserModelId(dist,
-                                   InstallUtil::IsPerUserInstall(chrome_exe)),
+      ShellUtil::GetBrowserModelId(dist, InstallUtil::IsPerUserInstall()),
       profile_path);
 }
 
@@ -771,7 +765,7 @@
       path, false,  // not recursive
       base::FileEnumerator::FILES, FILE_PATH_LITERAL("*.lnk"));
 
-  bool is_per_user_install = InstallUtil::IsPerUserInstall(chrome_exe);
+  bool is_per_user_install = InstallUtil::IsPerUserInstall();
 
   int shortcuts_migrated = 0;
   base::FilePath target_path;
@@ -870,34 +864,6 @@
   return shortcuts_migrated;
 }
 
-base::FilePath GetStartMenuShortcut(const base::FilePath& chrome_exe) {
-  static const int kFolderIds[] = {
-    base::DIR_COMMON_START_MENU,
-    base::DIR_START_MENU,
-  };
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  const base::string16 shortcut_name(dist->GetShortcutName() +
-                                     installer::kLnkExt);
-  base::FilePath programs_folder;
-  base::FilePath shortcut;
-
-  // Check both the common and the per-user Start Menu folders for system-level
-  // installs.
-  size_t folder = InstallUtil::IsPerUserInstall(chrome_exe) ? 1 : 0;
-  for (; folder < arraysize(kFolderIds); ++folder) {
-    if (!PathService::Get(kFolderIds[folder], &programs_folder)) {
-      NOTREACHED();
-      continue;
-    }
-
-    shortcut = programs_folder.Append(shortcut_name);
-    if (base::PathExists(shortcut))
-      return shortcut;
-  }
-
-  return base::FilePath();
-}
-
 }  // namespace win
 
 }  // namespace shell_integration

diff --git a/chrome/browser/shell_integration_win.h b/chrome/browser/shell_integration_win.h
index 8e3c4666..5be0e0d 100644
--- a/chrome/browser/shell_integration_win.h
+++ b/chrome/browser/shell_integration_win.h

@@ -82,9 +82,6 @@
 int MigrateShortcutsInPathInternal(const base::FilePath& chrome_exe,
                                    const base::FilePath& path);
 
-// Returns the path to the Start Menu shortcut for the given Chrome.
-base::FilePath GetStartMenuShortcut(const base::FilePath& chrome_exe);
-
 }  // namespace win
 }  // namespace shell_integration
 

diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc
index 43c9a36..7f69a55 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc

@@ -12,10 +12,8 @@
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "components/prefs/pref_service.h"
-#include "components/spellcheck/browser/feedback_sender.h"
 #include "components/spellcheck/browser/spellcheck_host_metrics.h"
 #include "components/spellcheck/browser/spelling_service_client.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "content/public/browser/render_process_host.h"
@@ -35,8 +33,7 @@
   // The message filter overrides the thread for these messages because they
   // access spellcheck data.
   if (message.type() == SpellCheckHostMsg_RequestDictionary::ID ||
-      message.type() == SpellCheckHostMsg_NotifyChecked::ID ||
-      message.type() == SpellCheckHostMsg_RespondDocumentMarkers::ID)
+      message.type() == SpellCheckHostMsg_NotifyChecked::ID)
     *thread = BrowserThread::UI;
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   if (message.type() == SpellCheckHostMsg_CallSpellingService::ID)
@@ -51,8 +48,6 @@
                         OnSpellCheckerRequestDictionary)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_NotifyChecked,
                         OnNotifyChecked)
-    IPC_MESSAGE_HANDLER(SpellCheckHostMsg_RespondDocumentMarkers,
-                        OnRespondDocumentMarkers)
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
     IPC_MESSAGE_HANDLER(SpellCheckHostMsg_CallSpellingService,
                         OnCallSpellingService)
@@ -96,39 +91,19 @@
     spellcheck->GetMetrics()->RecordCheckedWordStats(word, misspelled);
 }
 
-void SpellCheckMessageFilter::OnRespondDocumentMarkers(
-    const std::vector<uint32_t>& markers) {
-  SpellcheckService* spellcheck = GetSpellcheckService();
-  // Spellcheck service may not be available for a renderer process that is
-  // shutting down.
-  if (!spellcheck)
-    return;
-  spellcheck->GetFeedbackSender()->OnReceiveDocumentMarkers(
-      render_process_id_, markers);
-}
-
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
 void SpellCheckMessageFilter::OnCallSpellingService(
     int route_id,
     int identifier,
-    const base::string16& text,
-    std::vector<SpellCheckMarker> markers) {
+    const base::string16& text) {
   DCHECK(!text.empty());
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // Erase invalid markers (with offsets out of boundaries of text length).
-  markers.erase(
-      std::remove_if(
-          markers.begin(),
-          markers.end(),
-          std::not1(SpellCheckMarker::IsValidPredicate(text.length()))),
-      markers.end());
-  CallSpellingService(text, route_id, identifier, markers);
+  CallSpellingService(text, route_id, identifier);
 }
 
 void SpellCheckMessageFilter::OnTextCheckComplete(
     int route_id,
     int identifier,
-    const std::vector<SpellCheckMarker>& markers,
     bool success,
     const base::string16& text,
     const std::vector<SpellCheckResult>& results) {
@@ -138,8 +113,6 @@
   if (!spellcheck)
     return;
   std::vector<SpellCheckResult> results_copy = results;
-  spellcheck->GetFeedbackSender()->OnSpellcheckResults(
-      render_process_id_, text, markers, &results_copy);
 
   // Erase custom dictionary words from the spellcheck results and record
   // in-dictionary feedback.
@@ -149,10 +122,8 @@
   for (iter = write_iter = results_copy.begin();
        iter != results_copy.end();
        ++iter) {
-    if (spellcheck->GetCustomDictionary()->HasWord(
+    if (!spellcheck->GetCustomDictionary()->HasWord(
             text_copy.substr(iter->location, iter->length))) {
-      spellcheck->GetFeedbackSender()->RecordInDictionary(iter->hash);
-    } else {
       if (write_iter != iter)
         *write_iter = *iter;
       ++write_iter;
@@ -166,23 +137,17 @@
 
 // CallSpellingService always executes the callback OnTextCheckComplete.
 // (Which, in turn, sends a SpellCheckMsg_RespondSpellingService)
-void SpellCheckMessageFilter::CallSpellingService(
-    const base::string16& text,
-    int route_id,
-    int identifier,
-    const std::vector<SpellCheckMarker>& markers) {
+void SpellCheckMessageFilter::CallSpellingService(const base::string16& text,
+                                                  int route_id,
+                                                  int identifier) {
   content::RenderProcessHost* host =
       content::RenderProcessHost::FromID(render_process_id_);
 
   client_->RequestTextCheck(
-    host ? host->GetBrowserContext() : NULL,
-    SpellingServiceClient::SPELLCHECK,
-    text,
-    base::Bind(&SpellCheckMessageFilter::OnTextCheckComplete,
-               base::Unretained(this),
-               route_id,
-               identifier,
-               markers));
+      host ? host->GetBrowserContext() : NULL,
+      SpellingServiceClient::SPELLCHECK, text,
+      base::Bind(&SpellCheckMessageFilter::OnTextCheckComplete,
+                 base::Unretained(this), route_id, identifier));
 }
 #endif
 

diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.h b/chrome/browser/spellchecker/spellcheck_message_filter.h
index 84347aff..8f62b1e5 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter.h
+++ b/chrome/browser/spellchecker/spellcheck_message_filter.h

@@ -14,7 +14,6 @@
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "content/public/browser/browser_message_filter.h"
 
-class SpellCheckMarker;
 class SpellcheckService;
 struct SpellCheckResult;
 
@@ -36,19 +35,16 @@
 
   void OnSpellCheckerRequestDictionary();
   void OnNotifyChecked(const base::string16& word, bool misspelled);
-  void OnRespondDocumentMarkers(const std::vector<uint32_t>& markers);
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   void OnCallSpellingService(int route_id,
                              int identifier,
-                             const base::string16& text,
-                             std::vector<SpellCheckMarker> markers);
+                             const base::string16& text);
 
   // A callback function called when the Spelling service finishes checking
   // text. Sends the given results to a renderer.
   void OnTextCheckComplete(
       int route_id,
       int identifier,
-      const std::vector<SpellCheckMarker>& markers,
       bool success,
       const base::string16& text,
       const std::vector<SpellCheckResult>& results);
@@ -59,11 +55,9 @@
   // OnTextCheckComplete. When this function is called before we receive a
   // response for the previous request, this function cancels the previous
   // request and sends a new one.
-  void CallSpellingService(
-      const base::string16& text,
-      int route_id,
-      int identifier,
-      const std::vector<SpellCheckMarker>& markers);
+  void CallSpellingService(const base::string16& text,
+                           int route_id,
+                           int identifier);
 #endif
 
   // Can be overridden for testing.

diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
index 53ca0cb..79e2040 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac.cc

@@ -11,7 +11,6 @@
 #include "base/bind.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
-#include "components/spellcheck/browser/feedback_sender.h"
 #include "components/spellcheck/browser/spellcheck_platform.h"
 #include "components/spellcheck/browser/spelling_service_client.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
@@ -40,8 +39,8 @@
   void RequestCheck(const base::string16& text,
                     int route_id,
                     int identifier,
-                    int document_tag,
-                    const std::vector<SpellCheckMarker>& markers);
+                    int document_tag);
+
  private:
   // Request server-side checking for |text_|.
   void RequestRemoteCheck();
@@ -75,7 +74,6 @@
   int route_id_;
   int identifier_;
   int document_tag_;
-  std::vector<SpellCheckMarker> markers_;
 };
 
 SpellingRequest::SpellingRequest(SpellingServiceClient* client,
@@ -91,12 +89,10 @@
   destination_->AddRef();
 }
 
-void SpellingRequest::RequestCheck(
-    const base::string16& text,
-    int route_id,
-    int identifier,
-    int document_tag,
-    const std::vector<SpellCheckMarker>& markers) {
+void SpellingRequest::RequestCheck(const base::string16& text,
+                                   int route_id,
+                                   int identifier,
+                                   int document_tag) {
   DCHECK(!text.empty());
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -104,7 +100,6 @@
   route_id_ = route_id;
   identifier_ = identifier;
   document_tag_ = document_tag;
-  markers_ = markers;
 
   // Send the remote query out. The barrier owns |this|, ensuring it is deleted
   // after completion.
@@ -169,17 +164,6 @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   remote_success_ = success;
   remote_results_ = results;
-
-  SpellcheckService* spellcheck_service =
-      SpellcheckServiceFactory::GetForRenderProcessId(render_process_id_);
-  if (spellcheck_service) {
-    spellcheck_service->GetFeedbackSender()->OnSpellcheckResults(
-        render_process_id_,
-        text,
-        markers_,
-        &remote_results_);
-  }
-
   completion_barrier_.Run();
 }
 
@@ -277,8 +261,7 @@
 void SpellCheckMessageFilterPlatform::OnRequestTextCheck(
     int route_id,
     int identifier,
-    const base::string16& text,
-    std::vector<SpellCheckMarker> markers) {
+    const base::string16& text) {
   DCHECK(!text.empty());
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -288,18 +271,10 @@
   // happen on UI thread.
   SpellcheckServiceFactory::GetForRenderProcessId(render_process_id_);
 
-  // Erase invalid markers (with offsets out of boundaries of text length).
-  markers.erase(
-      std::remove_if(
-          markers.begin(),
-          markers.end(),
-          std::not1(SpellCheckMarker::IsValidPredicate(text.length()))),
-      markers.end());
   // SpellingRequest self-destructs.
   SpellingRequest* request =
     new SpellingRequest(client_.get(), this, render_process_id_);
-  request->RequestCheck(
-      text, route_id, identifier, ToDocumentTag(route_id), markers);
+  request->RequestCheck(text, route_id, identifier, ToDocumentTag(route_id));
 }
 
 int SpellCheckMessageFilterPlatform::ToDocumentTag(int route_id) {

diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc
index eeff5e0b..4045425 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_platform_mac_browsertest.cc

@@ -49,8 +49,8 @@
   scoped_refptr<TestingSpellCheckMessageFilter> target(
       new TestingSpellCheckMessageFilter(run_loop.QuitWhenIdleClosure()));
 
-  SpellCheckHostMsg_RequestTextCheck to_be_received(
-      123, 456, base::UTF8ToUTF16("zz."), std::vector<SpellCheckMarker>());
+  SpellCheckHostMsg_RequestTextCheck to_be_received(123, 456,
+                                                    base::UTF8ToUTF16("zz."));
   target->OnMessageReceived(to_be_received);
 
   run_loop.Run();

diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc
index 7781c26..35a367b9 100644
--- a/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_message_filter_unittest.cc

@@ -13,7 +13,6 @@
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -38,12 +37,11 @@
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   void OnTextCheckComplete(int route_id,
                            int identifier,
-                           const std::vector<SpellCheckMarker>& markers,
                            bool success,
                            const base::string16& text,
                            const std::vector<SpellCheckResult>& results) {
-    SpellCheckMessageFilter::OnTextCheckComplete(
-        route_id, identifier, markers, success, text, results);
+    SpellCheckMessageFilter::OnTextCheckComplete(route_id, identifier, success,
+                                                 text, results);
   }
 #endif
 
@@ -63,7 +61,6 @@
   static const uint32_t kSpellcheckMessages[] = {
     SpellCheckHostMsg_RequestDictionary::ID,
     SpellCheckHostMsg_NotifyChecked::ID,
-    SpellCheckHostMsg_RespondDocumentMarkers::ID,
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
     SpellCheckHostMsg_CallSpellingService::ID,
 #endif
@@ -86,7 +83,6 @@
   static const std::string kCustomWord = "Helllo";
   static const int kRouteId = 0;
   static const int kCallbackId = 0;
-  static const std::vector<SpellCheckMarker> kMarkers;
   static const base::string16 kText = base::ASCIIToUTF16("Helllo warld.");
   static const bool kSuccess = true;
   static const SpellCheckResult::Decoration kDecoration =
@@ -104,8 +100,7 @@
   scoped_refptr<TestingSpellCheckMessageFilter> filter(
       new TestingSpellCheckMessageFilter);
   filter->GetSpellcheckService()->GetCustomDictionary()->AddWord(kCustomWord);
-  filter->OnTextCheckComplete(
-      kRouteId, kCallbackId, kMarkers, kSuccess, kText, results);
+  filter->OnTextCheckComplete(kRouteId, kCallbackId, kSuccess, kText, results);
   EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size());
 
   SpellCheckMsg_RespondSpellingService::Param params;
@@ -135,8 +130,8 @@
 
   scoped_refptr<TestingSpellCheckMessageFilter> filter(
       new TestingSpellCheckMessageFilter);
-  filter->OnTextCheckComplete(1, 1, std::vector<SpellCheckMarker>(),
-      true,  base::ASCIIToUTF16("Helllo walrd"), results);
+  filter->OnTextCheckComplete(1, 1, true, base::ASCIIToUTF16("Helllo walrd"),
+                              results);
   EXPECT_EQ(static_cast<size_t>(1), filter->sent_messages.size());
 
   SpellCheckMsg_RespondSpellingService::Param params;

diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc
index da56edf..d07712f 100644
--- a/chrome/browser/spellchecker/spellcheck_service.cc
+++ b/chrome/browser/spellchecker/spellcheck_service.cc

@@ -16,7 +16,6 @@
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
-#include "components/spellcheck/browser/feedback_sender.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/spellcheck/browser/spellcheck_host_metrics.h"
 #include "components/spellcheck/browser/spellcheck_platform.h"
@@ -83,15 +82,6 @@
   single_dictionary_pref.SetValue("");
 #endif  // BUILDFLAG(USE_BROWSER_SPELLCHECKER)
 
-  std::string language_code;
-  std::string country_code;
-  spellcheck::GetISOLanguageCountryCodeFromLocale(
-      first_of_dictionaries, &language_code, &country_code);
-  feedback_sender_.reset(new spellcheck::FeedbackSender(
-      content::BrowserContext::GetDefaultStoragePartition(context)->
-            GetURLRequestContext(),
-      language_code, country_code));
-
   pref_change_registrar_.Add(
       spellcheck::prefs::kSpellCheckDictionaries,
       base::Bind(&SpellcheckService::OnSpellCheckDictionariesChanged,
@@ -117,7 +107,6 @@
                  content::NotificationService::AllSources());
 
   LoadHunspellDictionaries();
-  UpdateFeedbackSenderState();
 }
 
 SpellcheckService::~SpellcheckService() {
@@ -244,10 +233,6 @@
   return hunspell_dictionaries_;
 }
 
-spellcheck::FeedbackSender* SpellcheckService::GetFeedbackSender() {
-  return feedback_sender_.get();
-}
-
 bool SpellcheckService::LoadExternalDictionary(std::string language,
                                                std::string locale,
                                                std::string path,
@@ -327,7 +312,6 @@
   // If there are hunspell dictionaries, then fire off notifications to the
   // renderers after the dictionaries are finished loading.
   LoadHunspellDictionaries();
-  UpdateFeedbackSenderState();
 
   // If there are no hunspell dictionaries to load, then immediately let the
   // renderers know the new state.
@@ -340,7 +324,6 @@
       spellcheck::prefs::kSpellCheckUseSpellingService);
   if (metrics_)
     metrics_->RecordSpellingServiceStats(enabled);
-  UpdateFeedbackSenderState();
 }
 
 void SpellcheckService::OnAcceptLanguagesChanged() {
@@ -366,20 +349,3 @@
 
   dictionaries_pref.SetValue(filtered_dictionaries);
 }
-
-void SpellcheckService::UpdateFeedbackSenderState() {
-  std::string feedback_language;
-  if (!hunspell_dictionaries_.empty())
-    feedback_language = hunspell_dictionaries_.front()->GetLanguage();
-  std::string language_code;
-  std::string country_code;
-  spellcheck::GetISOLanguageCountryCodeFromLocale(
-      feedback_language, &language_code, &country_code);
-  feedback_sender_->OnLanguageCountryChange(language_code, country_code);
-  if (SpellingServiceClient::IsAvailable(
-          context_, SpellingServiceClient::SPELLCHECK)) {
-    feedback_sender_->StartFeedbackCollection();
-  } else {
-    feedback_sender_->StopFeedbackCollection();
-  }
-}

diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h
index f956513..5e593fe03 100644
--- a/chrome/browser/spellchecker/spellcheck_service.h
+++ b/chrome/browser/spellchecker/spellcheck_service.h

@@ -36,10 +36,6 @@
 class NotificationSource;
 }
 
-namespace spellcheck {
-class FeedbackSender;
-}
-
 // Encapsulates the browser side spellcheck service. There is one of these per
 // profile and each is created by the SpellCheckServiceFactory.  The
 // SpellcheckService maintains any per-profile information about spellcheck.
@@ -115,9 +111,6 @@
   const std::vector<std::unique_ptr<SpellcheckHunspellDictionary>>&
   GetHunspellDictionaries();
 
-  // Returns the instance of the spelling service feedback sender.
-  spellcheck::FeedbackSender* GetFeedbackSender();
-
   // Load a dictionary from a given path. Format specifies how the dictionary
   // is stored. Return value is true if successful.
   bool LoadExternalDictionary(std::string language,
@@ -171,10 +164,6 @@
   // prefs::kAcceptLanguages.
   void OnAcceptLanguagesChanged();
 
-  // Enables the feedback sender if spelling server is available and enabled.
-  // Otherwise disables the feedback sender.
-  void UpdateFeedbackSenderState();
-
   PrefChangeRegistrar pref_change_registrar_;
   content::NotificationRegistrar registrar_;
 
@@ -188,8 +177,6 @@
   std::vector<std::unique_ptr<SpellcheckHunspellDictionary>>
       hunspell_dictionaries_;
 
-  std::unique_ptr<spellcheck::FeedbackSender> feedback_sender_;
-
   base::WeakPtrFactory<SpellcheckService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpellcheckService);

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 359329c..2f7f904 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc

@@ -53,6 +53,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "extensions/features/features.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID)
@@ -874,13 +875,44 @@
   }
 
   DCHECK(!blacklist_downloader_);
+
+  // Create traffic annotation tag.
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("supervised_users_blacklist", R"(
+        semantics {
+          sender: "Supervised Users"
+          description:
+            "Downloads a static blacklist consisting of hostname hashes of "
+            "common inappropriate websites. This is only enabled for child "
+            "accounts and only if the corresponding setting is enabled by the "
+            "parent."
+          trigger:
+            "The file is downloaded on demand if the child account profile is "
+            "created and the setting is enabled."
+          data:
+            "No additional data is sent to the server beyond the request "
+            "itself."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+            "The feature can be remotely enabled or disabled by the parent. In "
+            "addition, if sign-in is restricted to accounts from a managed "
+            "domain, those accounts are not going to be child accounts."
+          policy {
+            RestrictSigninToPattern {
+              policy_options {mode: MANDATORY}
+              value: "*@manageddomain.com"
+            }
+          }
+        })");
+
   blacklist_downloader_.reset(new FileDownloader(
-      url,
-      path,
-      false,
-      profile_->GetRequestContext(),
+      url, path, false, profile_->GetRequestContext(),
       base::Bind(&SupervisedUserService::OnBlacklistDownloadDone,
-                 base::Unretained(this), path)));
+                 base::Unretained(this), path),
+      traffic_annotation));
 }
 
 void SupervisedUserService::LoadBlacklistFromFile(const base::FilePath& path) {

diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index 961af28..9e28f92e 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc

@@ -201,14 +201,8 @@
 }
 
 // Tests that on receiving CLIENT_DATA_OBSOLETE sync engine gets restarted and
-// initialized with different cache_guld.
-// Flaky on Windows and Linux. See crbug.com/683216
-#if defined(OS_WIN) || defined(OS_LINUX)
-#define MAYBE_ClientDataObsoleteTest DISABLED_ClientDataObsoleteTest
-#else
-#define MAYBE_ClientDataObsoleteTest ClientDataObsoleteTest
-#endif
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_ClientDataObsoleteTest) {
+// initialized with different cache_guid.
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, ClientDataObsoleteTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   const BookmarkNode* node1 = AddFolder(0, 0, "title1");

diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
index c929fcad..6e7b18d 100644
--- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
+++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc

@@ -52,6 +52,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_renderer_host.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -685,6 +686,10 @@
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
+  // http://crbug.com/695624
+  if (content::IsBrowserSideNavigationEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // We should have an infobar.

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index ad88173..b50c91c 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn

@@ -3047,6 +3047,8 @@
       "views/frame/windows_10_caption_button.cc",
       "views/frame/windows_10_caption_button.h",
       "views/network_profile_bubble_view.cc",
+      "views/settings_reset_prompt_dialog.cc",
+      "views/settings_reset_prompt_dialog.h",
       "views/uninstall_view.cc",
       "views/uninstall_view.h",
       "webui/cast/cast_ui.cc",
@@ -3484,21 +3486,25 @@
     "//ui/shell_dialogs",
   ]
 
-  if (toolkit_views && (!is_mac || mac_views_browser)) {
+  if (toolkit_views) {
     sources += [
-      "views/find_bar_host_unittest_util_views.cc",
       "views/payments/test_chrome_payment_request_delegate.cc",
       "views/payments/test_chrome_payment_request_delegate.h",
-      "views/toolbar/browser_action_test_util_views.cc",
     ]
-    if (!is_mac) {
-      deps += [ "//ui/aura" ]
+    if (!is_mac || mac_views_browser) {
+      sources += [
+        "views/find_bar_host_unittest_util_views.cc",
+        "views/toolbar/browser_action_test_util_views.cc",
+      ]
+      if (!is_mac) {
+        deps += [ "//ui/aura" ]
+      }
+    } else {
+      sources += [
+        "cocoa/extensions/browser_action_test_util_mac.mm",
+        "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
+      ]
     }
-  } else {
-    sources += [
-      "cocoa/extensions/browser_action_test_util_mac.mm",
-      "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
-    ]
   }
 
   if (!is_android) {

diff --git a/chrome/browser/ui/android/tab_contents/OWNERS b/chrome/browser/ui/android/tab_contents/OWNERS
index 8f9ea72b..810ce1b 100644
--- a/chrome/browser/ui/android/tab_contents/OWNERS
+++ b/chrome/browser/ui/android/tab_contents/OWNERS

@@ -1,2 +1,4 @@
 dfalcantara@chromium.org
 dtrainor@chromium.org
+
+# COMPONENT: UI>Browser>Mobile

diff --git a/chrome/browser/ui/android/tab_model/OWNERS b/chrome/browser/ui/android/tab_model/OWNERS
index 8f9ea72b..810ce1b 100644
--- a/chrome/browser/ui/android/tab_model/OWNERS
+++ b/chrome/browser/ui/android/tab_model/OWNERS

@@ -1,2 +1,4 @@
 dfalcantara@chromium.org
 dtrainor@chromium.org
+
+# COMPONENT: UI>Browser>Mobile

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index d30eb2d..c454ba5 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc

@@ -128,24 +128,18 @@
  public:
   AnimationSetter(aura::Window* window, int animation_time_in_ms)
       : window_(window),
-        previous_animation_type_(
-            wm::GetWindowVisibilityAnimationType(window_)),
+        previous_animation_type_(wm::GetWindowVisibilityAnimationType(window_)),
         previous_animation_time_(
             wm::GetWindowVisibilityAnimationDuration(*window_)) {
     wm::SetWindowVisibilityAnimationType(
-        window_,
-        wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+        window_, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
     wm::SetWindowVisibilityAnimationDuration(
-        window_,
-        base::TimeDelta::FromMilliseconds(animation_time_in_ms));
+        window_, base::TimeDelta::FromMilliseconds(animation_time_in_ms));
   }
 
   ~AnimationSetter() {
-    wm::SetWindowVisibilityAnimationType(window_,
-                                                    previous_animation_type_);
-    wm::SetWindowVisibilityAnimationDuration(
-        window_,
-        previous_animation_time_);
+    wm::SetWindowVisibilityAnimationType(window_, previous_animation_type_);
+    wm::SetWindowVisibilityAnimationDuration(window_, previous_animation_time_);
   }
 
  private:

diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc
index cc84db9a..11f50f0 100644
--- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc
+++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc

@@ -6,18 +6,18 @@
 
 #include <stddef.h>
 
-#include <vector>
-
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/common/extensions/api/automation_api_constants.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_context.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_enums.h"
+#include "ui/accessibility/ax_tree_id_registry.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
@@ -142,7 +142,9 @@
 }
 
 AutomationManagerAura::AutomationManagerAura()
-    : enabled_(false), processing_events_(false) {}
+    : AXHostDelegate(extensions::api::automation::kDesktopTreeID),
+      enabled_(false),
+      processing_events_(false) {}
 
 AutomationManagerAura::~AutomationManagerAura() {
 }

diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h
index 811e5aa..1d1baef 100644
--- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.h
+++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.h

@@ -8,10 +8,13 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "base/macros.h"
-#include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
 #include "chrome/browser/ui/aura/accessibility/ax_tree_source_aura.h"
+#include "ui/accessibility/ax_host_delegate.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 
@@ -35,7 +38,7 @@
                          ui::AXTreeData>;
 
 // Manages a tree of automation nodes.
-class AutomationManagerAura : public extensions::AutomationActionAdapter,
+class AutomationManagerAura : public ui::AXHostDelegate,
                               views::AXAuraObjCache::Delegate {
  public:
   // Get the single instance of this class.
@@ -54,7 +57,7 @@
 
   void HandleAlert(content::BrowserContext* context, const std::string& text);
 
-  // AutomationActionAdapter implementation.
+  // AXHostDelegate implementation.
   void PerformAction(const ui::AXActionData& data) override;
 
   // views::AXAuraObjCache::Delegate implementation.
@@ -62,7 +65,7 @@
 
  protected:
   AutomationManagerAura();
-  virtual ~AutomationManagerAura();
+  ~AutomationManagerAura() override;
 
  private:
   friend struct base::DefaultSingletonTraits<AutomationManagerAura>;

diff --git a/chrome/browser/ui/chrome_select_file_policy.cc b/chrome/browser/ui/chrome_select_file_policy.cc
index 188e68c5..2181def 100644
--- a/chrome/browser/ui/chrome_select_file_policy.cc
+++ b/chrome/browser/ui/chrome_select_file_policy.cc

@@ -33,9 +33,7 @@
   if (source_contents_) {
     SimpleAlertInfoBarDelegate::Create(
         InfoBarService::FromWebContents(source_contents_),
-        infobars::InfoBarDelegate::CHROME_SELECT_FILE_POLICY,
-        infobars::InfoBarDelegate::kNoIconID,
-        gfx::VectorIconId::VECTOR_ICON_NONE,
+        infobars::InfoBarDelegate::CHROME_SELECT_FILE_POLICY, nullptr,
         l10n_util::GetStringUTF16(IDS_FILE_SELECTION_DIALOG_INFOBAR), true);
   } else {
     LOG(WARNING) << "File-selection dialogs are disabled but no WebContents "

diff --git a/chrome/browser/ui/cocoa/OWNERS b/chrome/browser/ui/cocoa/OWNERS
index 19ce7ba..2b2fecee 100644
--- a/chrome/browser/ui/cocoa/OWNERS
+++ b/chrome/browser/ui/cocoa/OWNERS

@@ -1,6 +1,7 @@
 asvitkine@chromium.org
 avi@chromium.org
 ccameron@chromium.org
+ellyjones@chromium.org
 groby@chromium.org
 mark@chromium.org
 rohitrao@chromium.org

diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index 3af1d39..8fae167 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

@@ -250,8 +250,8 @@
     SimpleAlertInfoBarDelegate::Create(
         InfoBarService::FromWebContents(
             browser->tab_strip_model()->GetActiveWebContents()),
-        infobars::InfoBarDelegate::TEST_INFOBAR,
-        0, gfx::VectorIconId::VECTOR_ICON_NONE, base::string16(), false);
+        infobars::InfoBarDelegate::TEST_INFOBAR, nullptr, base::string16(),
+        false);
   }
 
   NSView* GetViewWithID(ViewID view_id) const {

diff --git a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
index 21de9b4a..d812ab1 100644
--- a/chrome/browser/ui/cocoa/browser_window_touch_bar.mm
+++ b/chrome/browser/ui/cocoa/browser_window_touch_bar.mm

@@ -25,7 +25,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/native_theme/native_theme.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/vector_icons/vector_icons.h"
 
 namespace {
@@ -38,8 +38,8 @@
 const NSTouchBarItemIdentifier kBackForwardTouchId = @"BackForwardTouchId";
 const NSTouchBarItemIdentifier kReloadOrStopTouchId = @"ReloadOrStopTouchId";
 const NSTouchBarItemIdentifier kSearchTouchId = @"SearchTouchId";
-const NSTouchBarItemIdentifier kNewTabTouchId = @"NewTabTouchId";
 const NSTouchBarItemIdentifier kStarTouchId = @"StarTouchId";
+const NSTouchBarItemIdentifier kNewTabTouchId = @"NewTabTouchId";
 
 // The button indexes in the back and forward segment control.
 const int kBackSegmentIndex = 0;
@@ -47,6 +47,7 @@
 
 // Touch bar icon colors values.
 const SkColor kTouchBarDefaultIconColor = SK_ColorWHITE;
+const SkColor kTouchBarStarActiveColor = gfx::kGoogleBlue500;
 
 // The size of the touch bar icons.
 const int kTouchBarIconSize = 16;
@@ -114,8 +115,8 @@
   base::scoped_nsobject<NSTouchBar> touchBar(
       [[NSClassFromString(@"NSTouchBar") alloc] init]);
   NSArray* touchBarItemIdentifiers = @[
-    kBackForwardTouchId, kReloadOrStopTouchId, kSearchTouchId, kNewTabTouchId,
-    kStarTouchId
+    kBackForwardTouchId, kReloadOrStopTouchId, kSearchTouchId, kStarTouchId,
+    kNewTabTouchId
   ];
   [touchBar setCustomizationIdentifier:kBrowserWindowTouchBarId];
   [touchBar setDefaultItemIdentifiers:touchBarItemIdentifiers];
@@ -143,13 +144,10 @@
     [touchBarItem setView:CreateTouchBarButton(kNewTabMacTouchbarIcon, self,
                                                IDC_NEW_TAB)];
   } else if ([identifier isEqualTo:kStarTouchId]) {
-    const SkColor kStarredIconColor =
-        ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
-            ui::NativeTheme::kColorId_ProminentButtonColor);
     const gfx::VectorIcon& icon =
         isStarred_ ? toolbar::kStarActiveIcon : toolbar::kStarIcon;
     SkColor iconColor =
-        isStarred_ ? kStarredIconColor : kTouchBarDefaultIconColor;
+        isStarred_ ? kTouchBarStarActiveColor : kTouchBarDefaultIconColor;
     [touchBarItem
         setView:CreateTouchBarButton(icon, self, IDC_BOOKMARK_PAGE, iconColor)];
   } else if ([identifier isEqualTo:kSearchTouchId]) {
@@ -179,12 +177,32 @@
 }
 
 - (NSView*)searchTouchBarView {
-  // TODO(spqchan): Use the Google search icon if the default search engine is
-  // Google.
-  base::string16 title = l10n_util::GetStringUTF16(IDS_TOUCH_BAR_SEARCH);
+  TemplateURLService* templateUrlService =
+      TemplateURLServiceFactory::GetForProfile(browser_->profile());
+  const TemplateURL* defaultProvider =
+      templateUrlService->GetDefaultSearchProvider();
+  BOOL isGoogle =
+      defaultProvider->GetEngineType(templateUrlService->search_terms_data()) ==
+      SEARCH_ENGINE_GOOGLE;
+
+  base::string16 title =
+      isGoogle ? l10n_util::GetStringUTF16(IDS_TOUCH_BAR_GOOGLE_SEARCH)
+               : l10n_util::GetStringFUTF16(IDS_TOUCH_BAR_SEARCH,
+                                            defaultProvider->short_name());
+
+  NSImage* image;
+  if (isGoogle) {
+    image = NSImageFromImageSkiaWithColorSpace(
+        gfx::CreateVectorIcon(gfx::VectorIconId::GOOGLE_SEARCH_MAC_TOUCHBAR,
+                              kTouchBarIconSize, gfx::kPlaceholderColor),
+        base::mac::GetSRGBColorSpace());
+  } else {
+    image = CreateNSImageFromIcon(omnibox::kSearchIcon);
+  }
+
   NSButton* searchButton =
       [NSButton buttonWithTitle:base::SysUTF16ToNSString(title)
-                          image:CreateNSImageFromIcon(omnibox::kSearchIcon)
+                          image:image
                          target:self
                          action:@selector(executeCommand:)];
   searchButton.imageHugsTitle = YES;

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
index 8635cc0..99b9113 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

@@ -39,6 +39,10 @@
 class ZoomDecoration;
 class ZoomDecorationTest;
 
+namespace {
+class LocationBarViewMacTest;
+}
+
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an OmniboxViewMac instance to
 // the location bar text field, which handles most of the work.
@@ -215,6 +219,7 @@
   std::vector<NSView*> GetDecorationAccessibilityViews();
 
  private:
+  friend class LocationBarViewMacTest;
   friend ZoomDecorationTest;
 
   // Posts |notification| to the default notification center.

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index a4700106..47a358b 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -864,7 +864,6 @@
       IsLocationBarDark());
 }
 
-// TODO(spqchan): Add tests for the security state decoration.
 void LocationBarViewMac::UpdateSecurityState(bool tab_changed) {
   using SecurityLevel = security_state::SecurityLevel;
   SecurityLevel new_security_level = GetToolbarModel()->GetSecurityLevel(false);
@@ -879,18 +878,24 @@
   if ((ShouldShowSecurityState() || ShouldShowExtensionBubble() ||
        ShouldShowChromeBubble()) &&
       is_width_available_for_security_verbose_) {
-    bool is_secure_to_secure = IsSecureConnection(new_security_level) &&
-                               IsSecureConnection(security_level_);
-    bool is_new_security_level =
-        security_level_ != new_security_level && !is_secure_to_secure;
-    if (!tab_changed && security_state_bubble_decoration_->HasAnimatedOut())
-      security_state_bubble_decoration_->AnimateIn(false);
-    else if (tab_changed || !CanAnimateSecurityLevel(new_security_level))
+    if (tab_changed) {
       security_state_bubble_decoration_->ShowWithoutAnimation();
-    else if (is_new_security_level)
-      security_state_bubble_decoration_->AnimateIn();
+    } else {
+      bool is_secure_to_secure = IsSecureConnection(new_security_level) &&
+                                 IsSecureConnection(security_level_);
+      bool is_new_security_level =
+          security_level_ != new_security_level && !is_secure_to_secure;
+      if (!is_new_security_level &&
+          security_state_bubble_decoration_->HasAnimatedOut()) {
+        security_state_bubble_decoration_->AnimateIn(false);
+      } else if (!CanAnimateSecurityLevel(new_security_level)) {
+        security_state_bubble_decoration_->ShowWithoutAnimation();
+      } else if (is_new_security_level) {
+        security_state_bubble_decoration_->AnimateIn();
+      }
+    }
   } else if (!is_width_available_for_security_verbose_ ||
-             CanAnimateSecurityLevel(security_level_)) {
+             (!tab_changed && CanAnimateSecurityLevel(security_level_))) {
     security_state_bubble_decoration_->AnimateOut();
   }
 
@@ -900,8 +905,8 @@
 bool LocationBarViewMac::CanAnimateSecurityLevel(
     security_state::SecurityLevel level) const {
   return !GetOmniboxView()->IsEditingOrEmpty() &&
-         (security_level_ == security_state::SecurityLevel::DANGEROUS ||
-          security_level_ == security_state::SecurityLevel::HTTP_SHOW_WARNING);
+         (level == security_state::DANGEROUS ||
+          level == security_state::HTTP_SHOW_WARNING);
 }
 
 bool LocationBarViewMac::IsSecureConnection(

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm
new file mode 100644
index 0000000..e44792d
--- /dev/null
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm

@@ -0,0 +1,354 @@
+// Copyright 2017 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.
+
+#import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
+
+#import <Cocoa/Cocoa.h>
+
+#include "base/macros.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_command_controller.h"
+#include "chrome/browser/ui/browser_window.h"
+#import "chrome/browser/ui/cocoa/browser_window_controller.h"
+#import "chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h"
+#include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
+#include "components/toolbar/test_toolbar_model.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+// Mocks the OmniboxView so that we can set if the omnibox is empty or not.
+class MockOmniboxView : public OmniboxViewMac {
+ public:
+  MockOmniboxView(OmniboxEditController* controller,
+                  Profile* profile,
+                  CommandUpdater* command_updater,
+                  AutocompleteTextField* field)
+      : OmniboxViewMac(controller, profile, command_updater, field) {}
+
+  // Sets if the MockOmniboxView should be empty or not.
+  void set_is_empty(bool is_empty) { is_empty_ = is_empty; }
+
+  // Returns 0 if |is_empty_| is false. Otherwise, return 1.
+  int GetOmniboxTextLength() const override { return is_empty_ ? 0 : 1; }
+
+ private:
+  // True if the OmniboxView should be empty.
+  bool is_empty_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(MockOmniboxView);
+};
+
+// Testing class for LocationBarViewMac. This class is used mock the
+// ToolbarModel.
+class TestingLocationBarViewMac : public LocationBarViewMac {
+ public:
+  TestingLocationBarViewMac(AutocompleteTextField* field,
+                            CommandUpdater* command_updater,
+                            Profile* profile,
+                            Browser* browser)
+      : LocationBarViewMac(field, command_updater, profile, browser) {}
+
+  // Overridden so that LocationBarViewMac will use the test ToolbarModel
+  // instead.
+  const ToolbarModel* GetToolbarModel() const override {
+    return &toolbar_model_;
+  }
+
+  // Overridden so that LocationBarViewMac will use the test ToolbarModel
+  // instead.
+  ToolbarModel* GetToolbarModel() override { return &toolbar_model_; }
+
+  // Sets the security level of |toolbar_model_|.
+  void SetSecurityLevel(security_state::SecurityLevel level) {
+    toolbar_model_.set_security_level(level);
+  }
+
+ private:
+  // The toolbar model used for testing.
+  TestToolbarModel toolbar_model_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestingLocationBarViewMac);
+};
+
+// Testing class for TestingSecurityStateBubbleDecoration.
+class TestingSecurityStateBubbleDecoration
+    : public SecurityStateBubbleDecoration {
+ public:
+  TestingSecurityStateBubbleDecoration(LocationIconDecoration* location_icon,
+                                       LocationBarViewMac* owner)
+      : SecurityStateBubbleDecoration(location_icon, owner) {}
+
+  void AnimateIn(bool image_fade = true) override {
+    has_animated_ = true;
+    is_showing_ = true;
+    SecurityStateBubbleDecoration::AnimateIn(image_fade);
+  }
+
+  void AnimateOut() override {
+    has_animated_ = true;
+    is_showing_ = false;
+    SecurityStateBubbleDecoration::AnimateOut();
+  }
+
+  void ShowWithoutAnimation() override {
+    is_showing_ = true;
+    has_animated_ = false;
+    SecurityStateBubbleDecoration::ShowWithoutAnimation();
+  }
+
+  void ResetAnimation() override {
+    is_showing_ = false;
+    has_animated_ = false;
+    SecurityStateBubbleDecoration::ResetAnimation();
+  }
+
+  bool has_animated() const { return has_animated_; };
+
+  bool is_showing() const { return is_showing_; };
+
+  void ResetAnimationFlag() { has_animated_ = false; }
+
+ private:
+  // True if the decoration has animated.
+  bool has_animated_ = false;
+
+  // True if the decoration is showing.
+  bool is_showing_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(TestingSecurityStateBubbleDecoration);
+};
+
+class LocationBarViewMacTest : public CocoaProfileTest {
+ public:
+  void SetUp() override {
+    CocoaProfileTest::SetUp();
+    ASSERT_TRUE(browser());
+
+    // Width must be large, otherwise it'll be too narrow to fit the security
+    // state decoration.
+    NSRect frame = NSMakeRect(0, 0, 500, 30);
+    field_.reset([[AutocompleteTextField alloc] initWithFrame:frame]);
+
+    location_bar_.reset(new TestingLocationBarViewMac(
+        field_.get(), browser()->command_controller()->command_updater(),
+        browser()->profile(), browser()));
+
+    location_bar_->security_state_bubble_decoration_.reset(
+        new TestingSecurityStateBubbleDecoration(
+            location_bar_->location_icon_decoration_.get(),
+            location_bar_.get()));
+    decoration()->disable_animations_during_testing_ = true;
+
+    omnibox_view_ = new MockOmniboxView(
+        nullptr, browser()->profile(),
+        browser()->command_controller()->command_updater(), field_.get());
+
+    location_bar_->omnibox_view_.reset(omnibox_view_);
+  }
+
+  void TearDown() override {
+    location_bar_.reset();
+    CocoaProfileTest::TearDown();
+  }
+
+  TestingSecurityStateBubbleDecoration* decoration() const {
+    TestingSecurityStateBubbleDecoration* decoration =
+        static_cast<TestingSecurityStateBubbleDecoration*>(
+            location_bar_->security_state_bubble_decoration_.get());
+
+    return decoration;
+  }
+
+  TestingLocationBarViewMac* location_bar() const {
+    return location_bar_.get();
+  }
+
+  MockOmniboxView* omnibox_view() const {
+    MockOmniboxView* omnibox_view =
+        static_cast<MockOmniboxView*>(location_bar_->omnibox_view_.get());
+    return omnibox_view;
+  }
+
+  AutocompleteTextField* field() const { return field_.get(); }
+
+  void UpdateSecurityState(bool tab_changed) {
+    location_bar_->Layout();
+    location_bar_->UpdateSecurityState(tab_changed);
+  }
+
+ protected:
+  LocationBarViewMacTest() {}
+
+ private:
+  // The LocationBarView object we're testing.
+  std::unique_ptr<TestingLocationBarViewMac> location_bar_;
+
+  // The autocomplete text field.
+  base::scoped_nsobject<AutocompleteTextField> field_;
+
+  // The mocked omnibox view. Weak, owned by |location_bar_|.
+  MockOmniboxView* omnibox_view_;
+
+  DISALLOW_COPY_AND_ASSIGN(LocationBarViewMacTest);
+};
+
+// Tests the security decoration's visibility and animation without any tab or
+// width changes.
+TEST_F(LocationBarViewMacTest, ShowAndAnimateSecurityDecoration) {
+  // Set the security level to DANGEROUS. The decoration should animate in.
+  location_bar()->SetSecurityLevel(security_state::DANGEROUS);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Set the security level to NONE. The decoration should animate out.
+  location_bar()->SetSecurityLevel(security_state::NONE);
+  UpdateSecurityState(false);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Set the security level to SECURE. The decoration should show, but not
+  // animate.
+  location_bar()->SetSecurityLevel(security_state::SECURE);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Set the security level to EV_SECURE. The decoration should still show,
+  // but not animate.
+  location_bar()->SetSecurityLevel(security_state::EV_SECURE);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Set the security level to NONE. The decoration should still hide without
+  // animating out.
+  location_bar()->SetSecurityLevel(security_state::NONE);
+  UpdateSecurityState(false);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+}
+
+// Tests the security decoration's visibility and animation when the omnibox
+// is updated from a switched tab.
+TEST_F(LocationBarViewMacTest, SecurityDecorationWithTabChanges) {
+  // Show nonsecure decoration.
+  location_bar()->SetSecurityLevel(security_state::HTTP_SHOW_WARNING);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Switch to a tab with no decoration.
+  location_bar()->SetSecurityLevel(security_state::NONE);
+  UpdateSecurityState(true);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Switch back to the tab with the nonsecure decoration.
+  location_bar()->SetSecurityLevel(security_state::HTTP_SHOW_WARNING);
+  UpdateSecurityState(true);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Show the secure decoration.
+  location_bar()->SetSecurityLevel(security_state::SECURE);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Switch to a tab with no decoration.
+  location_bar()->SetSecurityLevel(security_state::NONE);
+  UpdateSecurityState(true);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+}
+
+// Tests the security decoration's visibility and animation when the omnibox
+// is empty.
+TEST_F(LocationBarViewMacTest, SecurityDecorationWithEmptyOmnibox) {
+  // Set the omnibox to empty and then set the security level to nonsecure.
+  // The decoration should not appear.
+  omnibox_view()->set_is_empty(true);
+  location_bar()->SetSecurityLevel(security_state::HTTP_SHOW_WARNING);
+  UpdateSecurityState(false);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Set the omnibox to nonempty. The decoration should now appear.
+  omnibox_view()->set_is_empty(false);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+}
+
+// Tests to see that the security decoration animates out when the omnibox's
+// width becomes narrow.
+TEST_F(LocationBarViewMacTest, SecurityDecorationWidthChanges) {
+  // Show the nonsecure decoration.
+  location_bar()->SetSecurityLevel(security_state::HTTP_SHOW_WARNING);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Make the omnibox narrow.
+  [field() setFrame:NSMakeRect(0, 0, 119, 30)];
+  UpdateSecurityState(false);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Make the omnibox wide again.
+  [field() setFrame:NSMakeRect(0, 0, 500, 30)];
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Show secure decoration.
+  location_bar()->SetSecurityLevel(security_state::SECURE);
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_FALSE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Make the omnibox narrow.
+  [field() setFrame:NSMakeRect(0, 0, 119, 30)];
+  UpdateSecurityState(false);
+  EXPECT_FALSE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+
+  decoration()->ResetAnimationFlag();
+
+  // Make the omnibox wide again.
+  [field() setFrame:NSMakeRect(0, 0, 500, 30)];
+  UpdateSecurityState(false);
+  EXPECT_TRUE(decoration()->is_showing());
+  EXPECT_TRUE(decoration()->has_animated());
+}
+
+}  // namespace

diff --git a/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h
index ebb37c54..052d039 100644
--- a/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.h

@@ -25,6 +25,10 @@
 class SecurityStateBubbleDecorationTest;
 }
 
+namespace {
+class LocationBarViewMacTest;
+}
+
 class SecurityStateBubbleDecoration : public BubbleDecoration,
                                       public gfx::AnimationDelegate {
  public:
@@ -39,12 +43,12 @@
   // Set the color of the label.
   void SetLabelColor(SkColor color);
 
-  // Methods that animate in and out the chip.
-  void AnimateIn(bool image_fade = true);
-  void AnimateOut();
+  // Methods that animate in and out the chip. Virtual for testing.
+  virtual void AnimateIn(bool image_fade = true);
+  virtual void AnimateOut();
 
-  // Shows the chip without animation.
-  void ShowWithoutAnimation();
+  // Shows the chip without animation. Virtual for testing.
+  virtual void ShowWithoutAnimation();
 
   // Returns true if the chip has fully animated in.
   bool HasAnimatedIn() const;
@@ -55,8 +59,8 @@
   // Returns true if the chip is in the process of animating out.
   bool AnimatingOut() const;
 
-  // Resets the animation.
-  void ResetAnimation();
+  // Resets the animation. Virtual for testing.
+  virtual void ResetAnimation();
 
   // LocationBarDecoration:
   CGFloat GetWidthForSpace(CGFloat width) override;
@@ -81,6 +85,7 @@
   NSColor* GetDarkModeTextColor() override;
 
  private:
+  friend class ::LocationBarViewMacTest;
   friend class ::SecurityStateBubbleDecorationTest;
 
   // Returns the animation progress. If not in MD, the animation progress

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index f4f3f71..de28b7a 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -833,12 +833,13 @@
   if (cocoa_l10n_util::ShouldDoExperimentalRTLLayout()) {
     CGFloat leftEdge = NSMinX([locationBar_ frame]);
     if ([browserActionsContainerView_ isHidden]) {
-      delta = leftEdge - NSMaxX([appMenuButton_ frame]) +
-              [ToolbarController appMenuPadding] + kButtonInset;
+      delta = leftEdge -
+              (NSMaxX([appMenuButton_ frame]) +
+               [ToolbarController appMenuPadding] + kButtonInset);
     } else {
       delta = leftEdge -
-              NSMaxX([browserActionsContainerView_ animationEndFrame]) +
-              kButtonInset;
+              (NSMaxX([browserActionsContainerView_ animationEndFrame]) +
+               kButtonInset);
     }
   } else {
     CGFloat rightEdge = NSMaxX([locationBar_ frame]);

diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.cc b/chrome/browser/ui/collected_cookies_infobar_delegate.cc
index e464bd5..b3f4524 100644
--- a/chrome/browser/ui/collected_cookies_infobar_delegate.cc
+++ b/chrome/browser/ui/collected_cookies_infobar_delegate.cc

@@ -6,12 +6,12 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void CollectedCookiesInfoBarDelegate::Create(InfoBarService* infobar_service) {
@@ -37,8 +37,8 @@
   return COLLECTED_COOKIES_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId CollectedCookiesInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::COOKIE;
+const gfx::VectorIcon& CollectedCookiesInfoBarDelegate::GetVectorIcon() const {
+  return kCookieIcon;
 }
 
 base::string16 CollectedCookiesInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.h b/chrome/browser/ui/collected_cookies_infobar_delegate.h
index e24780b9..3250378 100644
--- a/chrome/browser/ui/collected_cookies_infobar_delegate.h
+++ b/chrome/browser/ui/collected_cookies_infobar_delegate.h

@@ -28,7 +28,7 @@
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;

diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 9e8d008..24eb6ed 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc

@@ -12,6 +12,7 @@
 #include "base/process/process.h"
 #include "base/rand_util.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/channel_info.h"
@@ -31,7 +32,6 @@
 #include "content/public/common/process_type.h"
 #include "content/public/common/result_codes.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
@@ -151,7 +151,7 @@
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
@@ -196,8 +196,8 @@
   return HUNG_PLUGIN_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId HungPluginInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::EXTENSION_CRASHED;
+const gfx::VectorIcon& HungPluginInfoBarDelegate::GetVectorIcon() const {
+  return kExtensionCrashedIcon;
 }
 
 base::string16 HungPluginInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
index 70f4e105..40de689c 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc

@@ -6,6 +6,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ -16,7 +17,6 @@
 #include "components/omnibox/browser/shortcuts_backend.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 AlternateNavInfoBarDelegate::~AlternateNavInfoBarDelegate() {
 }
@@ -108,6 +108,6 @@
   return ALTERNATE_NAV_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId AlternateNavInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::GLOBE;
+const gfx::VectorIcon& AlternateNavInfoBarDelegate::GetVectorIcon() const {
+  return kGlobeIcon;
 }

diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
index 9a70b3b..64e93b3 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h

@@ -48,7 +48,7 @@
   // InfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
 
   Profile* profile_;
   const base::string16 text_;

diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
index dd1cc48a..822109c 100644
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc

@@ -21,6 +21,7 @@
 #include "content/public/browser/web_contents.h"
 #include "net/base/load_flags.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request.h"
 
@@ -64,8 +65,39 @@
       load_state_(LOAD_NOT_SEEN),
       fetch_state_(FETCH_NOT_COMPLETE) {
   if (alternate_nav_match_.destination_url.is_valid()) {
+    net::NetworkTrafficAnnotationTag traffic_annotation =
+        net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
+          semantics {
+            sender: "Omnibox"
+            description:
+              "Certain omnibox inputs, e.g. single words, may either be search "
+              "queries or attempts to navigate to intranet hostnames. When "
+              "such a hostname is not in the user's history, a background "
+              "request is made to see if it is navigable.  If so, the browser "
+              "will display a prompt on the search results page asking if the "
+              "user wished to navigate instead of searching."
+            trigger:
+              "User attempts to search for a string that is plausibly a "
+              "navigable hostname but is not in the local history."
+            data:
+              "None. However, the hostname itself is a string the user "
+              "searched for, and thus can expose data about the user's "
+              "searches."
+            destination: WEBSITE
+          }
+          policy {
+            cookies_allowed: true
+            cookies_store: "user"
+            setting: "This feature cannot be disabled in settings."
+            policy_exception_justification:
+              "By disabling DefaultSearchProviderEnabled, one can disable "
+              "default search, and once users can't search, they can't hit "
+              "this. More fine-grained policies are requested to be "
+              "implemented (crbug.com/81226)."
+          })");
     fetcher_ = net::URLFetcher::Create(alternate_nav_match_.destination_url,
-                                       net::URLFetcher::HEAD, this);
+                                       net::URLFetcher::HEAD, this,
+                                       traffic_annotation);
     fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
     fetcher_->SetStopOnRedirect(true);
   }

diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
index 2108128..d775794 100644
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc

@@ -94,9 +94,7 @@
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(*flag)) {
       SimpleAlertInfoBarDelegate::Create(
           InfoBarService::FromWebContents(web_contents),
-          infobars::InfoBarDelegate::BAD_FLAGS_PROMPT,
-          infobars::InfoBarDelegate::kNoIconID,
-          gfx::VectorIconId::VECTOR_ICON_NONE,
+          infobars::InfoBarDelegate::BAD_FLAGS_PROMPT, nullptr,
           l10n_util::GetStringFUTF16(
               IDS_BAD_FLAGS_WARNING_MESSAGE,
               base::UTF8ToUTF16(std::string("--") + *flag)),

diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
index e2b9f575..bec61e7 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc

@@ -8,13 +8,13 @@
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
@@ -78,8 +78,8 @@
   return DEFAULT_BROWSER_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId DefaultBrowserInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::PRODUCT;
+const gfx::VectorIcon& DefaultBrowserInfoBarDelegate::GetVectorIcon() const {
+  return kProductIcon;
 }
 
 bool DefaultBrowserInfoBarDelegate::ShouldExpire(

diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.h b/chrome/browser/ui/startup/default_browser_infobar_delegate.h
index 50b4c81f..53e303f 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate.h
+++ b/chrome/browser/ui/startup/default_browser_infobar_delegate.h

@@ -56,7 +56,7 @@
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
   void InfoBarDismissed() override;
   base::string16 GetMessageText() const override;

diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc
index b9e510f..1bf73f7 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h"
 
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
@@ -21,7 +22,6 @@
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void SessionCrashedInfoBarDelegate::Create(Browser* browser) {
@@ -62,8 +62,8 @@
   return SESSION_CRASHED_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId SessionCrashedInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::SAD_TAB;
+const gfx::VectorIcon& SessionCrashedInfoBarDelegate::GetVectorIcon() const {
+  return kSadTabIcon;
 }
 
 base::string16 SessionCrashedInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
index 21021e4c..63f9abf 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h

@@ -27,7 +27,7 @@
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;

diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
index 7a02466..673351f 100644
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc

@@ -61,7 +61,6 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/common/feature_switch.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/models/button_menu_item_model.h"
@@ -697,8 +696,7 @@
 // - Learn about the browser and global customisation e.g. settings, help.
 // - Browser relaunch, quit.
 void AppMenuModel::Build() {
-  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
-    CreateActionToolbarOverflowMenu();
+  CreateActionToolbarOverflowMenu();
 
   AddItem(IDC_VIEW_INCOMPATIBILITIES,
       l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
index 85d6a96..b3f00cb0 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc

@@ -20,22 +20,20 @@
   ComponentToolbarActionsBrowserTest() {}
   ~ComponentToolbarActionsBrowserTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-        extensions::FeatureSwitch::extension_action_redesign(), true));
-    mock_actions_factory_.reset(new MockComponentToolbarActionsFactory(
-        browser()));
+  void SetUpOnMainThread() override {
+    InProcessBrowserTest::SetUpOnMainThread();
+
+    // Replace the actions factory with a mock one.
+    toolbar_model_ = ToolbarActionsModel::Get(browser()->profile());
+    toolbar_model_->SetMockActionsFactoryForTest(
+        base::MakeUnique<MockComponentToolbarActionsFactory>(
+            browser()->profile()));
   }
 
-  MockComponentToolbarActionsFactory* mock_factory() {
-    return mock_actions_factory_.get();
-  }
+ protected:
+  ToolbarActionsModel* toolbar_model_ = nullptr;
 
  private:
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
-  std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsBrowserTest);
 };
 
@@ -44,6 +42,8 @@
 IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
                        ComponentToolbarActionsShowUpAndRespondToClicks) {
   BrowserActionTestUtil browser_actions_bar(browser());
+  toolbar_model_->AddComponentAction(
+      MockComponentToolbarActionsFactory::kActionIdForTesting);
 
   // There should be only one component action view.
   ASSERT_EQ(1, browser_actions_bar.NumberOfBrowserActions());
@@ -53,11 +53,6 @@
   EXPECT_EQ(MockComponentToolbarActionsFactory::kActionIdForTesting,
             browser_actions_bar.GetExtensionId(0));
 
-  // There should only have been one created component action.
-  EXPECT_EQ(1u, ComponentToolbarActionsFactory::GetInstance()
-                    ->GetInitialComponentIds(browser()->profile())
-                    .size());
-
   const std::vector<ToolbarActionViewController*>& actions =
       browser_actions_bar.GetToolbarActionsBar()->GetActions();
   TestToolbarActionViewController* mock_component_action =

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
index 55bfb3f..9b20a7a 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/feature_switch.h"
 
@@ -19,15 +20,6 @@
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #endif
 
-namespace {
-
-ComponentToolbarActionsFactory* testing_factory_ = nullptr;
-
-base::LazyInstance<ComponentToolbarActionsFactory> lazy_factory =
-    LAZY_INSTANCE_INITIALIZER;
-
-}  // namespace
-
 // static
 const char ComponentToolbarActionsFactory::kCastBetaExtensionId[] =
     "dliochdbjfkdbacpmhlcpmleaejidimm";
@@ -36,30 +28,35 @@
 const char ComponentToolbarActionsFactory::kMediaRouterActionId[] =
     "media_router_action";
 
-ComponentToolbarActionsFactory::ComponentToolbarActionsFactory() {}
-ComponentToolbarActionsFactory::~ComponentToolbarActionsFactory() {}
-
-// static
-ComponentToolbarActionsFactory* ComponentToolbarActionsFactory::GetInstance() {
-  return testing_factory_ ? testing_factory_ : &lazy_factory.Get();
-}
-
-std::set<std::string> ComponentToolbarActionsFactory::GetInitialComponentIds(
-    Profile* profile) {
-  std::set<std::string> component_ids;
+ComponentToolbarActionsFactory::ComponentToolbarActionsFactory(Profile* profile)
+    : profile_(profile) {
 #if defined(ENABLE_MEDIA_ROUTER)
-  if (media_router::MediaRouterEnabled(profile) &&
-      MediaRouterActionController::IsActionShownByPolicy(profile)) {
-    component_ids.insert(kMediaRouterActionId);
+  if (media_router::MediaRouterEnabled(profile_) &&
+      MediaRouterActionController::IsActionShownByPolicy(profile_)) {
+    initial_ids_.insert(kMediaRouterActionId);
   }
 #endif
+}
 
-  return component_ids;
+ComponentToolbarActionsFactory::~ComponentToolbarActionsFactory() {}
+
+std::set<std::string> ComponentToolbarActionsFactory::GetInitialComponentIds() {
+  return initial_ids_;
+}
+
+void ComponentToolbarActionsFactory::OnAddComponentActionBeforeInit(
+    const std::string& action_id) {
+  initial_ids_.insert(action_id);
+}
+
+void ComponentToolbarActionsFactory::OnRemoveComponentActionBeforeInit(
+    const std::string& action_id) {
+  initial_ids_.erase(action_id);
 }
 
 std::unique_ptr<ToolbarActionViewController>
 ComponentToolbarActionsFactory::GetComponentToolbarActionForId(
-    const std::string& id,
+    const std::string& action_id,
     Browser* browser,
     ToolbarActionsBar* bar) {
   // This is currently behind the extension-action-redesign flag, as it is
@@ -73,7 +70,7 @@
   // should be okay. If this changes, we should rethink this design to have,
   // e.g., RegisterChromeAction().
 #if defined(ENABLE_MEDIA_ROUTER)
-  if (id == kMediaRouterActionId)
+  if (action_id == kMediaRouterActionId)
     return std::unique_ptr<ToolbarActionViewController>(
         new MediaRouterAction(browser, bar));
 #endif  // defined(ENABLE_MEDIA_ROUTER)
@@ -91,12 +88,6 @@
   UnloadExtension(service, registry, kCastBetaExtensionId);
 }
 
-// static
-void ComponentToolbarActionsFactory::SetTestingFactory(
-    ComponentToolbarActionsFactory* factory) {
-  testing_factory_ = factory;
-}
-
 void ComponentToolbarActionsFactory::UnloadExtension(
     ExtensionService* service,
     extensions::ExtensionRegistry* registry,

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h
index 6b2d58b..b902481 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.h

@@ -10,11 +10,11 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 
 class Browser;
 class ExtensionService;
 class Profile;
+class ToolbarActionsBar;
 class ToolbarActionViewController;
 
 namespace extensions {
@@ -22,8 +22,8 @@
 }
 
 // The registry for all component toolbar actions. Component toolbar actions
-// are actions that live in the toolbar (like extension actions), but are
-// components of chrome, such as ChromeCast.
+// are actions that live in the toolbar (like extension actions), but are for
+// components of Chrome, such as Media Router.
 class ComponentToolbarActionsFactory {
  public:
   // Extension and component action IDs.
@@ -31,18 +31,23 @@
   static const char kCastExtensionId[];
   static const char kMediaRouterActionId[];
 
-  ComponentToolbarActionsFactory();
+  explicit ComponentToolbarActionsFactory(Profile* profile);
   virtual ~ComponentToolbarActionsFactory();
 
-  static ComponentToolbarActionsFactory* GetInstance();
+  // Returns a set of IDs of the component actions that should be present when
+  // the toolbar model is initialized.
+  virtual std::set<std::string> GetInitialComponentIds();
 
-  // Returns a vector of IDs of the component actions.
-  virtual std::set<std::string> GetInitialComponentIds(Profile* profile);
+  // Called when component actions are added or removed before the toolbar model
+  // is initialized. Adds or removes |action_id| to/from |initial_ids_| as
+  // necessary.
+  void OnAddComponentActionBeforeInit(const std::string& action_id);
+  void OnRemoveComponentActionBeforeInit(const std::string& action_id);
 
-  // Returns a collection of controllers for component actions. Declared
-  // virtual for testing.
+  // Returns the controller responsible for the component action associated with
+  // |action_id| in |bar|. Declared virtual for testing.
   virtual std::unique_ptr<ToolbarActionViewController>
-  GetComponentToolbarActionForId(const std::string& id,
+  GetComponentToolbarActionForId(const std::string& action_id,
                                  Browser* browser,
                                  ToolbarActionsBar* bar);
 
@@ -51,16 +56,18 @@
   void UnloadMigratedExtensions(ExtensionService* service,
                                 extensions::ExtensionRegistry* registry);
 
-  // Sets the factory to use for testing purposes.
-  // Ownership remains with the caller.
-  static void SetTestingFactory(ComponentToolbarActionsFactory* factory);
-
  private:
   // Unloads an extension if it is active.
   void UnloadExtension(ExtensionService* service,
                        extensions::ExtensionRegistry* registry,
                        const std::string& extension_id);
 
+  Profile* profile_;
+
+  // IDs of component actions that should be added to the toolbar model when it
+  // gets initialized.
+  std::set<std::string> initial_ids_;
+
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsFactory);
 };
 

diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
index 856a38f..35ffdb4 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory_unittest.cc

@@ -3,10 +3,13 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
+
 #include "base/macros.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
+#include "chrome/test/base/browser_with_test_window_test.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
@@ -22,8 +25,13 @@
   void SetUp() override {
     extensions::ExtensionServiceTestBase::SetUp();
     InitializeEmptyExtensionService();
+    actions_factory_ =
+        extensions::extension_action_test_util::
+            CreateToolbarModelForProfileWithoutWaitingForReady(profile())
+                ->component_actions_factory();
   }
 
+ protected:
   scoped_refptr<const extensions::Extension> CreateExtensionWithId(
       const std::string& extension_id) {
     extensions::DictionaryBuilder manifest;
@@ -47,11 +55,12 @@
       scoped_refptr<const extensions::Extension> extension) {
     service()->AddExtension(extension.get());
     CHECK(registry()->enabled_extensions().Contains(extension->id()));
-    ComponentToolbarActionsFactory::GetInstance()->UnloadMigratedExtensions(
-        service(), registry());
+    actions_factory_->UnloadMigratedExtensions(service(), registry());
     return !registry()->enabled_extensions().Contains(extension->id());
   }
 
+  ComponentToolbarActionsFactory* actions_factory_ = nullptr;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsFactoryTest);
 };
@@ -66,3 +75,20 @@
           "not_migrated_extension",
           extensions::extension_action_test_util::BROWSER_ACTION)));
 }
+
+TEST_F(ComponentToolbarActionsFactoryTest, GetInitialIds) {
+  std::string id1("id1");
+  std::string id2("id2");
+  std::string id3("id3");
+
+  actions_factory_->OnAddComponentActionBeforeInit(id1);
+  actions_factory_->OnAddComponentActionBeforeInit(id2);
+  actions_factory_->OnAddComponentActionBeforeInit(id3);
+  actions_factory_->OnRemoveComponentActionBeforeInit(id2);
+
+  std::set<std::string> initial_ids =
+      actions_factory_->GetInitialComponentIds();
+  EXPECT_TRUE(base::ContainsKey(initial_ids, id1));
+  EXPECT_FALSE(base::ContainsKey(initial_ids, id2));
+  EXPECT_TRUE(base::ContainsKey(initial_ids, id3));
+}

diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
index b986fec..6637489 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc

@@ -27,6 +27,7 @@
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 
 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
     : MediaRouterContextualMenu(

diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
index 9d8bee3b..68015349 100644
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h"
 
-#include "chrome/browser/ui/browser.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "extensions/common/feature_switch.h"
@@ -14,16 +14,13 @@
     "mock_action";
 
 MockComponentToolbarActionsFactory::MockComponentToolbarActionsFactory(
-    Browser* browser) {
-  ComponentToolbarActionsFactory::SetTestingFactory(this);
-}
+    Profile* profile)
+    : ComponentToolbarActionsFactory(profile) {}
 
-MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
-  ComponentToolbarActionsFactory::SetTestingFactory(nullptr);
-}
+MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {}
 
 std::set<std::string>
-MockComponentToolbarActionsFactory::GetInitialComponentIds(Profile* profile) {
+MockComponentToolbarActionsFactory::GetInitialComponentIds() {
   std::set<std::string> ids;
   if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
     ids.insert(kActionIdForTesting);

diff --git a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
index a366018..1a606ee 100644
--- a/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h
+++ b/chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h

@@ -17,11 +17,11 @@
  public:
   static const char kActionIdForTesting[];
 
-  explicit MockComponentToolbarActionsFactory(Browser* browser);
+  explicit MockComponentToolbarActionsFactory(Profile* profile);
   ~MockComponentToolbarActionsFactory() override;
 
   // ComponentToolbarActionsFactory:
-  std::set<std::string> GetInitialComponentIds(Profile* profile) override;
+  std::set<std::string> GetInitialComponentIds() override;
   std::unique_ptr<ToolbarActionViewController> GetComponentToolbarActionForId(
       const std::string& id,
       Browser* browser,

diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
index c508e3d..6d85465 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc

@@ -50,6 +50,8 @@
       extension_registry_(extensions::ExtensionRegistry::Get(profile_)),
       extension_action_manager_(
           extensions::ExtensionActionManager::Get(profile_)),
+      component_actions_factory_(
+          base::MakeUnique<ComponentToolbarActionsFactory>(profile_)),
       actions_initialized_(false),
       use_redesign_(
           extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()),
@@ -183,15 +185,15 @@
       DCHECK(extension);
 
       // Create and add an ExtensionActionViewController for the extension.
-      result.reset(new ExtensionActionViewController(
+      result = base::MakeUnique<ExtensionActionViewController>(
           extension, browser,
-          extension_action_manager_->GetExtensionAction(*extension), bar));
+          extension_action_manager_->GetExtensionAction(*extension), bar);
       break;
     }
     case COMPONENT_ACTION: {
       DCHECK(use_redesign_);
-      result = ComponentToolbarActionsFactory::GetInstance()
-                   ->GetComponentToolbarActionForId(item.id, browser, bar);
+      result = component_actions_factory_->GetComponentToolbarActionForId(
+          item.id, browser, bar);
       break;
     }
     case UNKNOWN_ACTION:
@@ -270,7 +272,7 @@
     observer.OnToolbarModelInitialized();
 
   if (use_redesign_) {
-    ComponentToolbarActionsFactory::GetInstance()->UnloadMigratedExtensions(
+    component_actions_factory_->UnloadMigratedExtensions(
         extensions::ExtensionSystem::Get(profile_)->extension_service(),
         extension_registry_);
   }
@@ -440,6 +442,11 @@
   return controller;
 }
 
+void ToolbarActionsModel::SetMockActionsFactoryForTest(
+    std::unique_ptr<ComponentToolbarActionsFactory> mock_factory) {
+  component_actions_factory_ = std::move(mock_factory);
+}
+
 void ToolbarActionsModel::RemoveExtension(
     const extensions::Extension* extension) {
   RemoveItem(ToolbarItem(extension->id(), EXTENSION_ACTION));
@@ -493,8 +500,7 @@
 
   // Next, add the component action ids.
   std::set<std::string> component_ids =
-      ComponentToolbarActionsFactory::GetInstance()->GetInitialComponentIds(
-          profile_);
+      component_actions_factory_->GetInitialComponentIds();
   for (const std::string& id : component_ids)
     all_actions.push_back(ToolbarItem(id, COMPONENT_ACTION));
 
@@ -624,12 +630,12 @@
 }
 
 void ToolbarActionsModel::AddComponentAction(const std::string& action_id) {
+  DCHECK(use_redesign_);
   if (!actions_initialized_) {
-    // TODO(crbug.com/660972): Add these component actions at initialization.
+    component_actions_factory_->OnAddComponentActionBeforeInit(action_id);
     return;
   }
 
-  DCHECK(use_redesign_);
   ToolbarItem component_item(action_id, COMPONENT_ACTION);
   DCHECK(!HasItem(component_item));
   AddItem(component_item);
@@ -637,6 +643,10 @@
 
 void ToolbarActionsModel::RemoveComponentAction(const std::string& action_id) {
   DCHECK(use_redesign_);
+  if (!actions_initialized_) {
+    component_actions_factory_->OnRemoveComponentActionBeforeInit(action_id);
+    return;
+  }
   // If the action was visible and there are overflowed actions, we reduce the
   // visible count so that we don't pop out a previously-hidden action.
   if (IsActionVisible(action_id) && !all_icons_visible())
@@ -662,8 +672,7 @@
   visible_icon_count_ = 0;
 
   std::set<std::string> component_ids =
-      ComponentToolbarActionsFactory::GetInstance()->GetInitialComponentIds(
-          profile_);
+      component_actions_factory_->GetInitialComponentIds();
   for (std::vector<ToolbarItem>::const_iterator iter =
            original_model->toolbar_items_.begin();
        iter != original_model->toolbar_items_.end(); ++iter) {

diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
index 7a4ac3f..47847ab 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h

@@ -21,6 +21,7 @@
 #include "extensions/common/extension.h"
 
 class Browser;
+class ComponentToolbarActionsFactory;
 class PrefService;
 class Profile;
 class ToolbarActionsBar;
@@ -170,6 +171,10 @@
     has_active_bubble_ = has_active_bubble;
   }
 
+  ComponentToolbarActionsFactory* component_actions_factory() {
+    return component_actions_factory_.get();
+  }
+
   void SetActionVisibility(const std::string& action_id, bool visible);
 
   // ComponentActionDelegate:
@@ -197,6 +202,10 @@
   std::unique_ptr<extensions::ExtensionMessageBubbleController>
   GetExtensionMessageBubbleController(Browser* browser);
 
+  // Sets the component action factory for this object. Used in tests.
+  void SetMockActionsFactoryForTest(
+      std::unique_ptr<ComponentToolbarActionsFactory> mock_factory);
+
  private:
   // Callback when actions are ready.
   void OnReady();
@@ -286,6 +295,8 @@
   // The ExtensionActionManager, cached for convenience.
   extensions::ExtensionActionManager* extension_action_manager_;
 
+  std::unique_ptr<ComponentToolbarActionsFactory> component_actions_factory_;
+
   // True if we've handled the initial EXTENSIONS_READY notification.
   bool actions_initialized_;
 

diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index 0dcac11d..3127f70 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc

@@ -123,10 +123,13 @@
   ~ToolbarActionsModelUnitTest() override {}
 
  protected:
-  // Initialize the ExtensionService, ToolbarActionsModel, and
-  // ExtensionSystem.
+  // Initialize the ExtensionService, ToolbarActionsModel, and ExtensionSystem.
   void Init();
 
+  // Initializes the ExtensionService, ToolbarActionsModel, and ExtensionSystem,
+  // making ToolbarActionsModel use a MockComponentToolbarActionsFactory.
+  void InitWithMockActionsFactory();
+
   void TearDown() override;
 
   // Adds or removes the given |extension| and verify success.
@@ -155,8 +158,6 @@
   // Returns true if the |toobar_model_| has an action with the given |id|.
   bool ModelHasActionForId(const std::string& id) const;
 
-  void SetMockActionsFactory(MockComponentToolbarActionsFactory* factory);
-
   ToolbarActionsModel* toolbar_model() { return toolbar_model_; }
 
   const ToolbarActionsModelTestObserver* observer() const {
@@ -211,8 +212,6 @@
   scoped_refptr<const extensions::Extension> page_action_extension_;
   scoped_refptr<const extensions::Extension> no_action_extension_;
 
-  std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsModelUnitTest);
 };
 
@@ -221,7 +220,26 @@
   toolbar_model_ =
       extensions::extension_action_test_util::CreateToolbarModelForProfile(
           profile());
-  model_observer_.reset(new ToolbarActionsModelTestObserver(toolbar_model_));
+  model_observer_ =
+      base::MakeUnique<ToolbarActionsModelTestObserver>(toolbar_model_);
+}
+
+void ToolbarActionsModelUnitTest::InitWithMockActionsFactory() {
+  InitializeEmptyExtensionService();
+  toolbar_model_ = extensions::extension_action_test_util::
+      CreateToolbarModelForProfileWithoutWaitingForReady(profile());
+  toolbar_model_->SetMockActionsFactoryForTest(
+      base::MakeUnique<MockComponentToolbarActionsFactory>(profile()));
+
+  // Trigger ToolbarActionsModel::OnReady() after the actions factory has been
+  // swapped out for a mock one.
+  static_cast<extensions::TestExtensionSystem*>(
+      extensions::ExtensionSystem::Get(profile()))
+      ->SetReady();
+  base::RunLoop().RunUntilIdle();
+
+  model_observer_ =
+      base::MakeUnique<ToolbarActionsModelTestObserver>(toolbar_model_);
 }
 
 void ToolbarActionsModelUnitTest::TearDown() {
@@ -335,11 +353,6 @@
   return testing::AssertionSuccess();
 }
 
-void ToolbarActionsModelUnitTest::SetMockActionsFactory(
-    MockComponentToolbarActionsFactory* factory) {
-  mock_actions_factory_.reset(factory);
-}
-
 // A basic test for component actions and extensions with browser actions
 // showing up in the toolbar.
 TEST_F(ToolbarActionsModelUnitTest, BasicToolbarActionsModelTest) {
@@ -1238,8 +1251,7 @@
        ActionsToolbarReorderAndReinsertWithSwitchAndComponentActions) {
   extensions::FeatureSwitch::ScopedOverride enable_redesign(
       extensions::FeatureSwitch::extension_action_redesign(), true);
-  SetMockActionsFactory(new MockComponentToolbarActionsFactory(nullptr));
-  Init();
+  InitWithMockActionsFactory();
 
   // One component action was added when the model was initialized.
   EXPECT_EQ(1u, num_toolbar_items());

diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index c09617c..9e4bffe 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

@@ -45,12 +45,15 @@
     views::MusClient* mus_client = views::MusClient::Get();
     aura::WindowTreeClientDelegate* delegate = mus_client;
     aura::PropertyConverter* converter = delegate->GetPropertyConverter();
+
     converter->RegisterProperty(
         ash::kPanelAttachedKey,
-        ui::mojom::WindowManager::kPanelAttached_Property);
+        ui::mojom::WindowManager::kPanelAttached_Property,
+        aura::PropertyConverter::CreateAcceptAnyValueCallback());
     converter->RegisterProperty(
         ash::kShelfItemTypeKey,
-        ui::mojom::WindowManager::kShelfItemType_Property);
+        ui::mojom::WindowManager::kShelfItemType_Property,
+        base::Bind(&ash::IsValidShelfItemType));
 
     mus_client->SetMusPropertyMirror(
         base::MakeUnique<ash::MusPropertyMirrorAsh>());

diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 889ec1b..3116c947 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc

@@ -588,6 +588,11 @@
       LayoutDelegate::Metric::PANEL_CONTENT_MARGIN));
 }
 
+int ChromeViewsDelegate::GetButtonMinimumWidth() const {
+  return LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::BUTTON_MINIMUM_WIDTH);
+}
+
 int ChromeViewsDelegate::GetDialogButtonMinimumWidth() const {
   return LayoutDelegate::Get()->GetMetric(
       LayoutDelegate::Metric::DIALOG_BUTTON_MINIMUM_WIDTH);

diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index c45f974..c86cf03e 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h

@@ -68,6 +68,7 @@
   int GetDialogRelatedControlVerticalSpacing() const override;
   gfx::Insets GetDialogFrameViewInsets() const override;
   gfx::Insets GetBubbleDialogMargins() const override;
+  int GetButtonMinimumWidth() const override;
   int GetDialogButtonMinimumWidth() const override;
   int GetButtonHorizontalPadding() const override;
 

diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index a94c2b7..5472d4b 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc

@@ -64,9 +64,6 @@
 const int kTreeViewWidth = 400;
 const int kTreeViewHeight = 125;
 
-// The color of the border around the cookies tree view.
-const SkColor kCookiesBorderColor = SkColorSetRGB(0xC8, 0xC8, 0xC8);
-
 // Spacing constants used with non-Harmony dialogs.
 const int kTabbedPaneTopPadding = 14;
 const int kCookieInfoBottomPadding = 4;
@@ -489,9 +486,9 @@
 }
 
 views::View* CollectedCookiesViews::CreateScrollView(views::TreeView* pane) {
-  views::ScrollView* scroll_view = new views::ScrollView();
+  views::ScrollView* scroll_view =
+      views::ScrollView::CreateScrollViewWithBorder();
   scroll_view->SetContents(pane);
-  scroll_view->SetBorder(views::CreateSolidBorder(1, kCookiesBorderColor));
   return scroll_view;
 }
 

diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc
index 25fb881f..88d6bbff 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_source_view.cc

@@ -51,8 +51,8 @@
   AddChildView(icon_view_);
   AddChildView(image_view_);
   AddChildView(label_);
-  icon_view_->set_interactive(false);
-  image_view_->set_interactive(false);
+  icon_view_->set_can_process_events_within_subtree(false);
+  image_view_->set_can_process_events_within_subtree(false);
   SetFocusBehavior(FocusBehavior::ALWAYS);
   SetStyle(style_);
 }

diff --git a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
index 45cb24b..fa98a1c 100644
--- a/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/harmony_layout_delegate.cc

@@ -21,6 +21,7 @@
       return kHarmonyLayoutUnit;
     case Metric::DIALOG_BUTTON_MARGIN:
       return kHarmonyLayoutUnit;
+    case Metric::BUTTON_MINIMUM_WIDTH:
     case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
       // Minimum label size plus padding.
       return 2 * kHarmonyLayoutUnit +

diff --git a/chrome/browser/ui/views/harmony/layout_delegate.cc b/chrome/browser/ui/views/harmony/layout_delegate.cc
index d366297d..1f80b87 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/layout_delegate.cc

@@ -23,7 +23,9 @@
 int LayoutDelegate::GetMetric(Metric metric) const {
   switch (metric) {
     case Metric::BUTTON_HORIZONTAL_PADDING:
-      return 0;
+      return views::kButtonHorizontalPadding;
+    case Metric::BUTTON_MINIMUM_WIDTH:
+      return views::kMinimumButtonWidth;
     case Metric::DIALOG_BUTTON_MARGIN:
       return views::kButtonHEdgeMarginNew;
     case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:

diff --git a/chrome/browser/ui/views/harmony/layout_delegate.h b/chrome/browser/ui/views/harmony/layout_delegate.h
index 4f39146e..9841b67c 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate.h
+++ b/chrome/browser/ui/views/harmony/layout_delegate.h

@@ -12,6 +12,8 @@
   enum class Metric {
     // Padding on the left and right side of a button's label.
     BUTTON_HORIZONTAL_PADDING,
+    // Default minimum width of a button.
+    BUTTON_MINIMUM_WIDTH,
     // Margin between the edge of a dialog and the left, right, or bottom of a
     // contained button.
     DIALOG_BUTTON_MARGIN,

diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
index 8b459490..2c95325f 100644
--- a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc

@@ -19,7 +19,7 @@
 
 void BubbleIconView::Init() {
   AddChildView(image_);
-  image_->set_interactive(false);
+  image_->set_can_process_events_within_subtree(false);
   image_->EnableCanvasFlippingForRTLUI(true);
   SetInkDropMode(InkDropMode::ON);
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);

diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index 38e36e7..4a1ee58 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -30,7 +30,7 @@
       label_(new views::Label(base::string16(), font_list)) {
   // Disable separate hit testing for |image_|.  This prevents views treating
   // |image_| as a separate mouse hover region from |this|.
-  image_->set_interactive(false);
+  image_->set_can_process_events_within_subtree(false);
   image_->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(LocationBarView::kIconInteriorPadding)));
   AddChildView(image_);

diff --git a/chrome/browser/ui/views/passwords/credentials_item_view.cc b/chrome/browser/ui/views/passwords/credentials_item_view.cc
index 090b24f..8f0e4fa 100644
--- a/chrome/browser/ui/views/passwords/credentials_item_view.cc
+++ b/chrome/browser/ui/views/passwords/credentials_item_view.cc

@@ -76,7 +76,7 @@
   // Create an image-view for the avatar. Make sure it ignores events so that
   // the parent can receive the events instead.
   image_view_ = new CircularImageView;
-  image_view_->set_interactive(false);
+  image_view_->set_can_process_events_within_subtree(false);
   gfx::Image image = ResourceBundle::GetSharedInstance().GetImageNamed(
       IDR_PROFILE_AVATAR_PLACEHOLDER_LARGE);
   DCHECK(image.Width() >= kAvatarImageSize &&

diff --git a/chrome/browser/ui/views/payments/OWNERS b/chrome/browser/ui/views/payments/OWNERS
index 2c67acd..40501f2 100644
--- a/chrome/browser/ui/views/payments/OWNERS
+++ b/chrome/browser/ui/views/payments/OWNERS

@@ -1,2 +1,4 @@
 anthonyvd@chromium.org
 rouslan@chromium.org
+
+# COMPONENT: UI>Browser>Autofill>Payments

diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
index 438237e..1983e899 100644
--- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc

@@ -101,7 +101,7 @@
 
     std::unique_ptr<views::ImageView> checkmark =
         base::MakeUnique<views::ImageView>();
-    checkmark->set_interactive(false);
+    checkmark->set_can_process_events_within_subtree(false);
     checkmark->SetImage(
         gfx::CreateVectorIcon(views::kMenuCheckIcon, 0xFF609265));
     layout->AddView(checkmark.release());

diff --git a/chrome/browser/ui/views/payments/payment_request_views_util.cc b/chrome/browser/ui/views/payments/payment_request_views_util.cc
index 017a3ae..46505589 100644
--- a/chrome/browser/ui/views/payments/payment_request_views_util.cc
+++ b/chrome/browser/ui/views/payments/payment_request_views_util.cc

@@ -135,7 +135,7 @@
     const std::string& card_type) {
   std::unique_ptr<views::ImageView> card_icon_view =
       base::MakeUnique<views::ImageView>();
-  card_icon_view->set_interactive(false);
+  card_icon_view->set_can_process_events_within_subtree(false);
   card_icon_view->SetImage(
       ResourceBundle::GetSharedInstance()
           .GetImageNamed(autofill::data_util::GetPaymentRequestData(card_type)

diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
index 32ecb4b8..01289de 100644
--- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
+++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

@@ -152,7 +152,7 @@
   }
 
   views::ImageView* chevron = new views::ImageView();
-  chevron->set_interactive(false);
+  chevron->set_can_process_events_within_subtree(false);
   chevron->SetImage(gfx::CreateVectorIcon(
       views::kSubmenuArrowIcon,
       color_utils::DeriveDefaultIconColor(name_label->enabled_color())));

diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog.cc b/chrome/browser/ui/views/settings_reset_prompt_dialog.cc
new file mode 100644
index 0000000..9407cab
--- /dev/null
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog.cc

@@ -0,0 +1,325 @@
+// Copyright 2017 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 "chrome/browser/ui/views/settings_reset_prompt_dialog.h"
+
+#include <vector>
+
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar/app_menu_button.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "components/constrained_window/constrained_window_views.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/text_constants.h"
+#include "ui/gfx/vector_icons_public.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/controls/link.h"
+#include "ui/views/controls/scroll_view.h"
+#include "ui/views/controls/separator.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_constants.h"
+#include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
+
+namespace safe_browsing {
+
+// static
+void SettingsResetPromptController::ShowSettingsResetPrompt(
+    Browser* browser,
+    SettingsResetPromptController* controller) {
+  SettingsResetPromptDialog* dialog = new SettingsResetPromptDialog(controller);
+  // The dialog will delete itself, as implemented in
+  // |DialogDelegateView::DeleteDelegate()|, when its widget is closed.
+  dialog->Show(browser);
+}
+
+}  // namespace safe_browsing
+
+namespace {
+
+using LabelInfo = safe_browsing::SettingsResetPromptController::LabelInfo;
+
+constexpr int kDialogWidth = 512;
+constexpr int kDetailsSectionMaxHeight = 150;
+constexpr int kBulletColumnWidth = 5;
+// Constants used for the layout of the label views.
+static constexpr int kMainColumSetId = 0;
+static constexpr int kBulletColumnSetId = 1;
+
+// Helper function used by |CreateLabelView()| below that adds the labels as
+// specified by |labels| to |label_view|.
+void AddLabelsToLabelView(views::View* label_view,
+                          views::GridLayout* layout,
+                          const std::vector<LabelInfo>& labels) {
+  static const base::char16 kBulletPoint[] = {0x2022, 0};
+
+  bool first_label = true;
+  bool last_label_was_bullet = false;
+  for (const LabelInfo& label_info : labels) {
+    const bool is_bullet = label_info.type == LabelInfo::BULLET_ITEM;
+    views::Label* label = new views::Label(label_info.text);
+    label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    if (is_bullet) {
+      label->SetElideBehavior(gfx::ELIDE_TAIL);
+    } else {
+      label->SetMultiLine(true);
+    }
+
+    // Do not add a padding row if
+    // - this is the first label being added, or
+    // - a bullet item is being added and the last label was also a bullet item.
+    if (!(first_label || (is_bullet && last_label_was_bullet)))
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
+    layout->StartRow(0, is_bullet ? kBulletColumnSetId : kMainColumSetId);
+    if (is_bullet) {
+      views::Label* bullet = new views::Label(base::string16(kBulletPoint));
+      layout->AddView(bullet);
+    }
+    layout->AddView(label);
+
+    last_label_was_bullet = is_bullet;
+    first_label = false;
+  }
+}
+
+// Creates a view that displays two types of labels: multiline labels or
+// indented single-line labels that are indented and start with a bullet
+// point. The indented text is intended to be used to display setting values
+// (URLs) and is elided if the text is too wide to fit in its entirety.
+views::View* CreateLabelView(int top_vertical_spacing,
+                             const std::vector<LabelInfo>& labels) {
+  views::View* label_view = new views::View();
+  views::GridLayout* layout = new views::GridLayout(label_view);
+  label_view->SetLayoutManager(layout);
+
+  views::ColumnSet* main_column_set = layout->AddColumnSet(kMainColumSetId);
+  main_column_set->AddColumn(views::GridLayout::FILL,
+                             views::GridLayout::LEADING,
+                             /*resize_percent=*/1, views::GridLayout::USE_PREF,
+                             /*fixed_width=*/0,
+                             /*min_width=*/0);
+
+  views::ColumnSet* bullet_column_set_ =
+      layout->AddColumnSet(kBulletColumnSetId);
+  bullet_column_set_->AddPaddingColumn(
+      /*resize_percent=*/0, views::kUnrelatedControlLargeHorizontalSpacing);
+  bullet_column_set_->AddColumn(
+      views::GridLayout::FILL, views::GridLayout::LEADING,
+      /*resize_percent=*/0, views::GridLayout::USE_PREF,
+      /*fixed_width=*/0,
+      /*min_width=*/0);
+  bullet_column_set_->AddPaddingColumn(/*resize_percent=*/0,
+                                       kBulletColumnWidth);
+  bullet_column_set_->AddColumn(
+      views::GridLayout::FILL, views::GridLayout::LEADING,
+      /*resize_percent=*/1, views::GridLayout::USE_PREF,
+      /*fixed_width=*/0,
+      /*min_width=*/0);
+
+  if (top_vertical_spacing > 0)
+    layout->AddPaddingRow(/*vertical_resize=*/0, top_vertical_spacing);
+
+  AddLabelsToLabelView(label_view, layout, labels);
+  return label_view;
+}
+
+}  // namespace
+
+////////////////////////////////////////////////////////////////////////////////
+// SettingsResetPromptDialog::ExpandableMessageView
+//
+// A view, whose visibilty can be toggled, and will be used for the details
+// section the main dialog.
+class SettingsResetPromptDialog::ExpandableMessageView : public views::View {
+ public:
+  explicit ExpandableMessageView(const std::vector<LabelInfo>& labels);
+  ~ExpandableMessageView() override;
+
+  void ToggleShowView();
+
+  // views::View overrides.
+  gfx::Size GetPreferredSize() const override;
+  int GetHeightForWidth(int width) const override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ExpandableMessageView);
+};
+
+SettingsResetPromptDialog::ExpandableMessageView::ExpandableMessageView(
+    const std::vector<LabelInfo>& labels) {
+  views::GridLayout* layout = new views::GridLayout(this);
+  SetLayoutManager(layout);
+
+  SetVisible(false);
+
+  constexpr int kColumnId = 0;
+  views::ColumnSet* column_set = layout->AddColumnSet(kColumnId);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING,
+                        /*resize_percent=*/1, views::GridLayout::USE_PREF,
+                        /*fixed_width=*/0,
+                        /*min_width=*/0);
+
+  // Add a horizontal line separator.
+  layout->StartRowWithPadding(
+      /*vertical_resize=*/0, kColumnId,
+      /*padding_resize=*/0, views::kUnrelatedControlVerticalSpacing);
+  layout->AddView(new views::Separator());
+
+  // Add the main message view inside a scroll view.
+  views::View* label_view =
+      CreateLabelView(views::kUnrelatedControlVerticalSpacing, labels);
+  views::ScrollView* scroll_view = new views::ScrollView();
+  scroll_view->ClipHeightTo(/*min_height=*/0, kDetailsSectionMaxHeight);
+  scroll_view->SetContents(label_view);
+  layout->StartRow(0, kColumnId);
+  layout->AddView(scroll_view);
+}
+
+SettingsResetPromptDialog::ExpandableMessageView::~ExpandableMessageView() {}
+
+void SettingsResetPromptDialog::ExpandableMessageView::ToggleShowView() {
+  SetVisible(!visible());
+  PreferredSizeChanged();
+}
+
+gfx::Size SettingsResetPromptDialog::ExpandableMessageView::GetPreferredSize()
+    const {
+  gfx::Size size = views::View::GetPreferredSize();
+  return gfx::Size(size.width(), visible() ? size.height() : 0);
+}
+
+int SettingsResetPromptDialog::ExpandableMessageView::GetHeightForWidth(
+    int width) const {
+  return GetPreferredSize().height();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// SettingsResetPromptDialog
+
+SettingsResetPromptDialog::SettingsResetPromptDialog(
+    safe_browsing::SettingsResetPromptController* controller)
+    : browser_(nullptr),
+      controller_(controller),
+      interaction_done_(false),
+      details_link_(nullptr) {
+  DCHECK(controller_);
+
+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
+                                        views::kButtonHEdgeMarginNew,
+                                        views::kPanelVertMargin, 0));
+
+  // Add the dialog's main label view.
+  AddChildView(CreateLabelView(0, controller_->GetMainText()));
+
+  // Add the main details view that starts off not being visible.
+  details_view_ = new ExpandableMessageView(controller_->GetDetailsText());
+  AddChildView(details_view_);
+}
+
+SettingsResetPromptDialog::~SettingsResetPromptDialog() {
+  // Make sure the controller is correctly notified in case the dialog widget is
+  // closed by some other means than the dialog buttons.
+  Close();
+}
+
+void SettingsResetPromptDialog::Show(Browser* browser) {
+  DCHECK(browser);
+  browser_ = browser;
+  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
+  constrained_window::CreateBrowserModalDialogViews(
+      this, browser_view->GetNativeWindow())
+      ->Show();
+}
+
+// WidgetDelegate overrides.
+
+ui::ModalType SettingsResetPromptDialog::GetModalType() const {
+  return ui::MODAL_TYPE_WINDOW;
+}
+
+bool SettingsResetPromptDialog::ShouldShowWindowIcon() const {
+  return true;
+}
+
+gfx::ImageSkia SettingsResetPromptDialog::GetWindowIcon() {
+  return gfx::CreateVectorIcon(gfx::VectorIconId::WARNING, 32 /* Icon size. */,
+                               gfx::kGoogleRed700);
+}
+
+base::string16 SettingsResetPromptDialog::GetWindowTitle() const {
+  return controller_->GetWindowTitle();
+}
+
+// DialogModel overrides.
+
+bool SettingsResetPromptDialog::ShouldDefaultButtonBeBlue() const {
+  return true;
+}
+
+// DialogDelegate overrides.
+
+base::string16 SettingsResetPromptDialog::GetDialogButtonLabel(
+    ui::DialogButton button) const {
+  DCHECK(button == ui::DIALOG_BUTTON_OK || button == ui::DIALOG_BUTTON_CANCEL);
+
+  if (button == ui::DIALOG_BUTTON_OK)
+    return controller_->GetButtonLabel();
+  return DialogDelegate::GetDialogButtonLabel(button);
+}
+
+views::View* SettingsResetPromptDialog::CreateExtraView() {
+  // Add a "show details" link that toggles visibility of the details view.
+  details_link_ = new views::Link(controller_->GetShowDetailsLabel());
+  details_link_->SetUnderline(false);
+  details_link_->set_listener(this);
+  return details_link_;
+}
+
+bool SettingsResetPromptDialog::Accept() {
+  if (!interaction_done_) {
+    interaction_done_ = true;
+    controller_->Accept();
+  }
+  return true;
+}
+
+bool SettingsResetPromptDialog::Cancel() {
+  if (!interaction_done_) {
+    interaction_done_ = true;
+    controller_->Cancel();
+  }
+  return true;
+}
+
+// View overrides.
+
+gfx::Size SettingsResetPromptDialog::GetPreferredSize() const {
+  return gfx::Size(kDialogWidth, GetHeightForWidth(kDialogWidth));
+}
+
+// LinkListener overrides.
+
+void SettingsResetPromptDialog::LinkClicked(views::Link* source,
+                                            int event_flags) {
+  DCHECK_EQ(source, details_link_);
+  DCHECK(browser_);
+
+  details_view_->ToggleShowView();
+  details_link_->SetText(details_view_->visible()
+                             ? controller_->GetHideDetailsLabel()
+                             : controller_->GetShowDetailsLabel());
+
+  ChromeWebModalDialogManagerDelegate* manager = browser_;
+  constrained_window::UpdateWidgetModalDialogPosition(
+      GetWidget(), manager->GetWebContentsModalDialogHost());
+}

diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog.h b/chrome/browser/ui/views/settings_reset_prompt_dialog.h
new file mode 100644
index 0000000..2eac458
--- /dev/null
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog.h

@@ -0,0 +1,78 @@
+// Copyright 2017 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 CHROME_BROWSER_UI_VIEWS_SETTINGS_RESET_PROMPT_DIALOG_H_
+#define CHROME_BROWSER_UI_VIEWS_SETTINGS_RESET_PROMPT_DIALOG_H_
+
+#include "base/macros.h"
+#include "base/strings/string16.h"
+#include "ui/base/ui_base_types.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/views/controls/link_listener.h"
+#include "ui/views/window/dialog_delegate.h"
+
+class Browser;
+
+namespace safe_browsing {
+class SettingsResetPromptController;
+}
+
+namespace views {
+class Link;
+class View;
+}
+
+// A dialog intended for prompting users to reset some of their settings to
+// their original default values. The dialog has two sections:
+// 1. Main section with an explanation text
+// 2. An expandable details section containing the details of the reset
+//    operation.
+class SettingsResetPromptDialog : public views::DialogDelegateView,
+                                  public views::LinkListener {
+ public:
+  explicit SettingsResetPromptDialog(
+      safe_browsing::SettingsResetPromptController* controller);
+  ~SettingsResetPromptDialog() override;
+
+  void Show(Browser* browser);
+
+  // views::WidgetDelegate overrides.
+  ui::ModalType GetModalType() const override;
+  bool ShouldShowWindowIcon() const override;
+  gfx::ImageSkia GetWindowIcon() override;
+  base::string16 GetWindowTitle() const override;
+
+  // ui::DialogModel overrides.
+  bool ShouldDefaultButtonBeBlue() const override;
+
+  // views::DialogDelegate overrides.
+  base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
+  views::View* CreateExtraView() override;
+  bool Accept() override;
+  bool Cancel() override;
+
+  // views::View overrides.
+  gfx::Size GetPreferredSize() const override;
+
+  // views::LinkListener overrides.
+  void LinkClicked(views::Link* source, int event_flags) override;
+
+ private:
+  class ExpandableMessageView;
+
+  int ContentWidth() const;
+
+  Browser* browser_;
+  safe_browsing::SettingsResetPromptController* controller_;
+  bool interaction_done_;
+
+  ExpandableMessageView* details_view_;
+  // The link that expands or hides the details section.
+  views::Link* details_link_;
+
+  DISALLOW_COPY_AND_ASSIGN(SettingsResetPromptDialog);
+};
+
+#endif  // CHROME_BROWSER_UI_VIEWS_SETTINGS_RESET_PROMPT_DIALOG_H_

diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc
new file mode 100644
index 0000000..c94b753
--- /dev/null
+++ b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc

@@ -0,0 +1,222 @@
+// Copyright 2017 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 <initializer_list>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/memory/ptr_util.h"
+#include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
+#include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.h"
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h"
+#include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/test/test_browser_dialog.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+
+namespace {
+
+using safe_browsing::MockProfileResetter;
+using safe_browsing::MockSettingsResetPromptConfig;
+using testing::_;
+using testing::ElementsAre;
+using testing::NiceMock;
+using testing::Not;
+using testing::Return;
+using testing::ReturnRef;
+
+constexpr char kHomepageUrl[] = "http://www.a-homepage.com/some/path";
+constexpr char kSearchUrl[] = "http://www.a-search.com/some/path/?q={%s}";
+constexpr char kStartupUrl1[] = "http://www.a-startup-1.com/some/path";
+constexpr char kStartupUrl2[] = "http://www.a-startup-2.com/some/other/path";
+constexpr char kExtensionId1[] = "abcdefghijklmnopabcdefghijklmnop";
+constexpr char kExtensionId2[] = "bbcdefghijklmnopabcdefghijklmnop";
+constexpr char kExtensionName1[] = "Extensions1";
+constexpr char kExtensionName2[] = "Extensions2";
+
+enum class SettingType {
+  DEFAULT_SEARCH_ENGINE,
+  STARTUP_PAGE,
+  HOMEPAGE,
+  EXTENSIONS,  // Also disable some extensions.
+};
+
+class MockSettingsResetPromptModel
+    : public safe_browsing::SettingsResetPromptModel {
+ public:
+  // Create a mock model that pretends that the settings passed in via
+  // |settings_to_reset| require resetting. |settings_to_reset| must not be
+  // empty or have |EXTENSIONS| as the only member.
+  explicit MockSettingsResetPromptModel(Profile* profile,
+                                        std::set<SettingType> settings_to_reset)
+      : SettingsResetPromptModel(
+            profile,
+            base::MakeUnique<NiceMock<MockSettingsResetPromptConfig>>(),
+            base::MakeUnique<ResettableSettingsSnapshot>(profile),
+            base::MakeUnique<BrandcodedDefaultSettings>(),
+            base::MakeUnique<NiceMock<MockProfileResetter>>(profile)) {
+    EXPECT_FALSE(settings_to_reset.empty());
+    EXPECT_THAT(settings_to_reset, Not(ElementsAre(SettingType::EXTENSIONS)));
+
+    // Set up startup URLs and extensions to be returned by member functions
+    // based on which settings should require reset.
+    startup_urls_.push_back(GURL(kStartupUrl1));
+    startup_urls_.push_back(GURL(kStartupUrl2));
+    if (settings_to_reset.find(SettingType::STARTUP_PAGE) !=
+        settings_to_reset.end())
+      startup_urls_to_reset_ = startup_urls_;
+
+    if (settings_to_reset.find(SettingType::EXTENSIONS) !=
+        settings_to_reset.end()) {
+      extensions_ = {{kExtensionId1, safe_browsing::ExtensionInfo(
+                                         kExtensionId1, kExtensionName1)},
+                     {kExtensionId2, safe_browsing::ExtensionInfo(
+                                         kExtensionId2, kExtensionName2)}};
+    }
+
+    ON_CALL(*this, PerformReset(_)).WillByDefault(Return());
+
+    ON_CALL(*this, ShouldPromptForReset())
+        .WillByDefault(Return(!settings_to_reset.empty()));
+
+    ON_CALL(*this, homepage()).WillByDefault(Return(GURL(kHomepageUrl)));
+    ON_CALL(*this, homepage_reset_state())
+        .WillByDefault(
+            Return(ChooseResetState(settings_to_reset, SettingType::HOMEPAGE)));
+
+    ON_CALL(*this, default_search()).WillByDefault(Return(GURL(kSearchUrl)));
+    ON_CALL(*this, default_search_reset_state())
+        .WillByDefault(Return(ChooseResetState(
+            settings_to_reset, SettingType::DEFAULT_SEARCH_ENGINE)));
+
+    ON_CALL(*this, startup_urls()).WillByDefault(ReturnRef(startup_urls_));
+    ON_CALL(*this, startup_urls_to_reset())
+        .WillByDefault(ReturnRef(startup_urls_to_reset_));
+    ON_CALL(*this, startup_urls_reset_state())
+        .WillByDefault(Return(
+            ChooseResetState(settings_to_reset, SettingType::STARTUP_PAGE)));
+
+    ON_CALL(*this, extensions_to_disable())
+        .WillByDefault(ReturnRef(extensions_));
+  }
+  ~MockSettingsResetPromptModel() override {}
+
+  MOCK_METHOD1(PerformReset, void(const base::Closure&));
+  MOCK_CONST_METHOD0(ShouldPromptForReset, bool());
+  MOCK_CONST_METHOD0(homepage, GURL());
+  MOCK_CONST_METHOD0(homepage_reset_state, ResetState());
+  MOCK_CONST_METHOD0(default_search, GURL());
+  MOCK_CONST_METHOD0(default_search_reset_state, ResetState());
+  MOCK_CONST_METHOD0(startup_urls, const std::vector<GURL>&());
+  MOCK_CONST_METHOD0(startup_urls_to_reset, const std::vector<GURL>&());
+  MOCK_CONST_METHOD0(startup_urls_reset_state, ResetState());
+  MOCK_CONST_METHOD0(extensions_to_disable, const ExtensionMap&());
+
+ private:
+  static ResetState ChooseResetState(const std::set<SettingType>& settings,
+                                     SettingType setting) {
+    if (settings.find(setting) != settings.end())
+      return RESET_REQUIRED;
+    return NO_RESET_REQUIRED_DUE_TO_DOMAIN_NOT_MATCHED;
+  }
+
+  std::vector<GURL> startup_urls_;
+  std::vector<GURL> startup_urls_to_reset_;
+  ExtensionMap extensions_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockSettingsResetPromptModel);
+};
+
+class SettingsResetPromptDialogTest : public DialogBrowserTest {
+ public:
+  void ShowDialog(const std::string& name) override {
+    const std::map<std::string, std::set<SettingType>> name_to_settings = {
+        {"dse", {SettingType::DEFAULT_SEARCH_ENGINE}},
+        {"sp", {SettingType::STARTUP_PAGE}},
+        {"hp", {SettingType::HOMEPAGE}},
+        {"dse_sp",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::STARTUP_PAGE}},
+        {"dse_hp", {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::HOMEPAGE}},
+        {"sp_hp", {SettingType::STARTUP_PAGE, SettingType::HOMEPAGE}},
+        {"dse_sp_hp",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::STARTUP_PAGE,
+          SettingType::HOMEPAGE}},
+        {"dse_ext",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::EXTENSIONS}},
+        {"sp_ext", {SettingType::STARTUP_PAGE, SettingType::EXTENSIONS}},
+        {"hp_ext", {SettingType::HOMEPAGE, SettingType::EXTENSIONS}},
+        {"dse_sp_ext",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::STARTUP_PAGE,
+          SettingType::EXTENSIONS}},
+        {"dse_hp_ext",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::HOMEPAGE,
+          SettingType::EXTENSIONS}},
+        {"sp_hp_ext",
+         {SettingType::STARTUP_PAGE, SettingType::HOMEPAGE,
+          SettingType::EXTENSIONS}},
+        {"dse_sp_hp_ext",
+         {SettingType::DEFAULT_SEARCH_ENGINE, SettingType::STARTUP_PAGE,
+          SettingType::HOMEPAGE, SettingType::EXTENSIONS}}};
+
+    auto model = base::MakeUnique<NiceMock<MockSettingsResetPromptModel>>(
+        browser()->profile(), name_to_settings.find(name)->second);
+
+    safe_browsing::SettingsResetPromptController::ShowSettingsResetPrompt(
+        browser(),
+        new safe_browsing::SettingsResetPromptController(std::move(model)));
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_sp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_hp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_sp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_hp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_sp_hp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_sp_hp) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_sp_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_hp_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_sp_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_dse_hp_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest, InvokeDialog_sp_hp_ext) {
+  RunDialog();
+}
+IN_PROC_BROWSER_TEST_F(SettingsResetPromptDialogTest,
+                       InvokeDialog_dse_sp_hp_ext) {
+  RunDialog();
+}
+
+}  // namespace

diff --git a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
index 227e59567..3602b7d 100644
--- a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc
+++ b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.cc

@@ -7,13 +7,13 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void WebsiteSettingsInfoBarDelegate::Create(InfoBarService* infobar_service) {
@@ -39,8 +39,8 @@
   return WEBSITE_SETTINGS_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId WebsiteSettingsInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::GLOBE;
+const gfx::VectorIcon& WebsiteSettingsInfoBarDelegate::GetVectorIcon() const {
+  return kGlobeIcon;
 }
 
 base::string16 WebsiteSettingsInfoBarDelegate::GetMessageText() const {

diff --git a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
index d94e2fc..65c6a4c 100644
--- a/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h
+++ b/chrome/browser/ui/website_settings/website_settings_infobar_delegate.h

@@ -28,7 +28,7 @@
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;

diff --git a/chrome/browser/ui/webui/OWNERS b/chrome/browser/ui/webui/OWNERS
index df3d93f..016c0a8 100644
--- a/chrome/browser/ui/webui/OWNERS
+++ b/chrome/browser/ui/webui/OWNERS

@@ -29,6 +29,7 @@
 per-file snippets_internals*=file://components/ntp_snippets/OWNERS
 per-file ntp_tiles_internals_ui.*=file://components/ntp_tiles/OWNERS
 per-file popular_sites_internals_ui.*=file://components/ntp_tiles/OWNERS
+per-file net_export_ui.*=file://net/OWNERS
 
 # Maintaining ownership from this file's original Chrome OS location.
 per-file device_log_ui*=stevenjb@chromium.org

diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
index 8cabf78..6419629 100644
--- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
@@ -19,7 +19,7 @@
 // A class that handles the WebUI hooks for the app launch splash screen.
 class AppLaunchSplashScreenHandler
     : public BaseScreenHandler,
-      public AppLaunchSplashScreenActor,
+      public AppLaunchSplashScreenView,
       public NetworkStateInformer::NetworkStateInformerObserver {
  public:
   AppLaunchSplashScreenHandler(

diff --git a/chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.h
index 7d02e4218..b3a759b7 100644
--- a/chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_kiosk_splash_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace base {
@@ -19,7 +19,7 @@
 
 // A class that handles the WebUI hooks for the ARC kiosk splash screen.
 class ArcKioskSplashScreenHandler : public BaseScreenHandler,
-                                    public ArcKioskSplashScreenActor {
+                                    public ArcKioskSplashScreenView {
  public:
   ArcKioskSplashScreenHandler();
   ~ArcKioskSplashScreenHandler() override;
@@ -33,7 +33,7 @@
   // WebUIMessageHandler implementation:
   void RegisterMessages() override;
 
-  // ArcKioskSplashScreenActor implementation:
+  // ArcKioskSplashScreenView implementation:
   void Show() override;
   void UpdateArcKioskState(ArcKioskState state) override;
   void SetDelegate(ArcKioskSplashScreenHandler::Delegate* delegate) override;

diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
index 0c149ae..9622daf 100644
--- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.cc

@@ -6,7 +6,7 @@
 
 #include "base/i18n/timezone.h"
 #include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -33,7 +33,7 @@
 ArcTermsOfServiceScreenHandler::~ArcTermsOfServiceScreenHandler() {
   system::TimezoneSettings::GetInstance()->RemoveObserver(this);
   for (auto& observer : observer_list_)
-    observer.OnActorDestroyed(this);
+    observer.OnViewDestroyed(this);
 }
 
 void ArcTermsOfServiceScreenHandler::RegisterMessages() {
@@ -116,12 +116,12 @@
 }
 
 void ArcTermsOfServiceScreenHandler::AddObserver(
-    ArcTermsOfServiceScreenActorObserver* observer) {
+    ArcTermsOfServiceScreenViewObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void ArcTermsOfServiceScreenHandler::RemoveObserver(
-    ArcTermsOfServiceScreenActorObserver* observer) {
+    ArcTermsOfServiceScreenViewObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
index bd0a1f33..f37747ee 100644
--- a/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/arc_terms_of_service_screen_handler.h

@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/arc/optin/arc_optin_preference_handler_observer.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chromeos/settings/timezone_settings.h"
 
@@ -21,12 +21,12 @@
 
 namespace chromeos {
 
-// The sole implementation of the ArcTermsOfServiceScreenActor, using WebUI.
-class ArcTermsOfServiceScreenHandler :
-    public BaseScreenHandler,
-    public ArcTermsOfServiceScreenActor,
-    public arc::ArcOptInPreferenceHandlerObserver,
-    public system::TimezoneSettings::Observer {
+// The sole implementation of the ArcTermsOfServiceScreenView, using WebUI.
+class ArcTermsOfServiceScreenHandler
+    : public BaseScreenHandler,
+      public ArcTermsOfServiceScreenView,
+      public arc::ArcOptInPreferenceHandlerObserver,
+      public system::TimezoneSettings::Observer {
  public:
   ArcTermsOfServiceScreenHandler();
   ~ArcTermsOfServiceScreenHandler() override;
@@ -38,9 +38,9 @@
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
 
-  // ArcTermsOfServiceScreenActor:
-  void AddObserver(ArcTermsOfServiceScreenActorObserver* observer) override;
-  void RemoveObserver(ArcTermsOfServiceScreenActorObserver* observer) override;
+  // ArcTermsOfServiceScreenView:
+  void AddObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
+  void RemoveObserver(ArcTermsOfServiceScreenViewObserver* observer) override;
   void Show() override;
   void Hide() override;
 
@@ -62,8 +62,7 @@
   void OnBackupAndRestoreModeChanged(bool enabled, bool managed) override;
   void OnLocationServicesModeChanged(bool enabled, bool managed) override;
 
-  base::ObserverList<ArcTermsOfServiceScreenActorObserver, true>
-  observer_list_;
+  base::ObserverList<ArcTermsOfServiceScreenViewObserver, true> observer_list_;
 
   // Whether the screen should be shown right after initialization.
   bool show_on_init_ = false;

diff --git a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.cc
index 9bcf4f2..4c03bd98fd 100644
--- a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.cc

@@ -22,7 +22,7 @@
 
 AutoEnrollmentCheckScreenHandler::~AutoEnrollmentCheckScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void AutoEnrollmentCheckScreenHandler::Show() {

diff --git a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
index db480ba..285fb75 100644
--- a/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_handler.h

@@ -7,14 +7,14 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "content/public/browser/web_ui.h"
 
 namespace chromeos {
 
 // WebUI implementation of AutoEnrollmentCheckScreenActor.
-class AutoEnrollmentCheckScreenHandler : public AutoEnrollmentCheckScreenActor,
+class AutoEnrollmentCheckScreenHandler : public AutoEnrollmentCheckScreenView,
                                          public BaseScreenHandler {
  public:
   AutoEnrollmentCheckScreenHandler();

diff --git a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc
index 4446044..e77bfc9 100644
--- a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc

@@ -36,7 +36,7 @@
 
 ControllerPairingScreenHandler::~ControllerPairingScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void ControllerPairingScreenHandler::HandleUserActed(

diff --git a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h
index a2c3e8f..fd0c90dd 100644
--- a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h

@@ -6,12 +6,12 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_CONTROLLER_PAIRING_SCREEN_HANDLER_H_
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/controller_pairing_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
-class ControllerPairingScreenHandler : public ControllerPairingScreenActor,
+class ControllerPairingScreenHandler : public ControllerPairingScreenView,
                                        public BaseScreenHandler {
  public:
   ControllerPairingScreenHandler();
@@ -36,7 +36,7 @@
   void OnContextChanged(const base::DictionaryValue& diff) override;
   content::BrowserContext* GetBrowserContext() override;
 
-  ControllerPairingScreenActor::Delegate* delegate_ = nullptr;
+  ControllerPairingScreenView::Delegate* delegate_ = nullptr;
   bool show_on_init_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(ControllerPairingScreenHandler);

diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
index 1f20df68..9ec98915 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h

@@ -14,7 +14,7 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_mode_detector.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/version_info_updater.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "ui/events/event_source.h"
@@ -36,7 +36,7 @@
 // The core handler for Javascript messages related to the "oobe" view.
 class CoreOobeHandler : public BaseScreenHandler,
                         public VersionInfoUpdater::Delegate,
-                        public CoreOobeActor,
+                        public CoreOobeView,
                         public ui::EventSource {
  public:
   class Delegate {

diff --git a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc
index 2062b454..cc8bc9e 100644
--- a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc

@@ -23,7 +23,7 @@
 
 DeviceDisabledScreenHandler::~DeviceDisabledScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void DeviceDisabledScreenHandler::Show() {

diff --git a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h
index 5aebbed..35a466c 100644
--- a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h

@@ -6,13 +6,13 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DEVICE_DISABLED_SCREEN_HANDLER_H_
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/device_disabled_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/device_disabled_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
 // WebUI implementation of DeviceDisabledScreenActor.
-class DeviceDisabledScreenHandler : public DeviceDisabledScreenActor,
+class DeviceDisabledScreenHandler : public DeviceDisabledScreenView,
                                     public BaseScreenHandler {
  public:
   DeviceDisabledScreenHandler();

diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
index da2f76f..ca4fcd70 100644
--- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.cc

@@ -41,7 +41,7 @@
 
 EnableDebuggingScreenHandler::~EnableDebuggingScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void EnableDebuggingScreenHandler::ShowWithParams() {

diff --git a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
index 51a87da..30332fa 100644
--- a/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enable_debugging_screen_handler.h

@@ -10,21 +10,21 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
-#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/enable_debugging_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 class PrefRegistrySimple;
 
 namespace chromeos {
 
-// WebUI implementation of EnableDebuggingScreenActor.
-class EnableDebuggingScreenHandler : public EnableDebuggingScreenActor,
+// WebUI implementation of EnableDebuggingScreenView.
+class EnableDebuggingScreenHandler : public EnableDebuggingScreenView,
                                      public BaseScreenHandler {
  public:
   EnableDebuggingScreenHandler();
   ~EnableDebuggingScreenHandler() override;
 
-  // EnableDebuggingScreenActor implementation:
+  // EnableDebuggingScreenView implementation:
   void Show() override;
   void Hide() override;
   void SetDelegate(Delegate* delegate) override;

diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
index a329407..e2da9b4c 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/policy/enrollment_config.h"
@@ -27,7 +27,7 @@
 // page, such as the user pressing the signin button.
 class EnrollmentScreenHandler
     : public BaseScreenHandler,
-      public EnrollmentScreenActor,
+      public EnrollmentScreenView,
       public NetworkStateInformer::NetworkStateInformerObserver {
  public:
   EnrollmentScreenHandler(
@@ -38,7 +38,7 @@
   // Implements WebUIMessageHandler:
   void RegisterMessages() override;
 
-  // Implements EnrollmentScreenActor:
+  // Implements EnrollmentScreenView:
   void SetParameters(Controller* controller,
                      const policy::EnrollmentConfig& config) override;
   void Show() override;
@@ -119,7 +119,7 @@
                           const std::string& user_name,
                           authpolicy::ErrorType code);
 
-  // Keeps the controller for this actor.
+  // Keeps the controller for this view.
   Controller* controller_ = nullptr;
 
   bool show_on_init_ = false;

diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
index d8bcff6b..134245c 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
@@ -82,8 +82,8 @@
 
 namespace chromeos {
 
-EulaScreenHandler::EulaScreenHandler(CoreOobeActor* core_oobe_actor)
-    : core_oobe_actor_(core_oobe_actor) {
+EulaScreenHandler::EulaScreenHandler(CoreOobeView* core_oobe_view)
+    : core_oobe_view_(core_oobe_view) {
   set_call_js_prefix(kJsScreenPath);
 }
 
@@ -173,12 +173,12 @@
   if (!page_is_ready() || !screen_)
     return;
 
-  core_oobe_actor_->SetUsageStats(screen_->IsUsageStatsEnabled());
+  core_oobe_view_->SetUsageStats(screen_->IsUsageStatsEnabled());
 
   // This OEM EULA is a file:// URL which we're unable to load in iframe.
   // Instead if it's defined we use chrome://terms/oem that will load same file.
   if (!screen_->GetOemEulaUrl().is_empty())
-    core_oobe_actor_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
+    core_oobe_view_->SetOemEulaUrl(chrome::kChromeUITermsOemURL);
 
   if (show_on_init_) {
     Show();
@@ -187,7 +187,7 @@
 }
 
 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
-  core_oobe_actor_->SetTpmPassword(tpm_password);
+  core_oobe_view_->SetTpmPassword(tpm_password);
 }
 
 void EulaScreenHandler::HandleOnLearnMore() {

diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
index a2031ea..14b07c1 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h

@@ -19,16 +19,16 @@
 
 namespace chromeos {
 
-class CoreOobeActor;
+class CoreOobeView;
 class HelpAppLauncher;
 
-// WebUI implementation of EulaScreenActor. It is used to interact
+// WebUI implementation of EulaScreenView. It is used to interact
 // with the eula part of the JS page.
 class EulaScreenHandler : public EulaView,
                           public BaseScreenHandler,
                           public TpmPasswordFetcherDelegate {
  public:
-  explicit EulaScreenHandler(CoreOobeActor* core_oobe_actor);
+  explicit EulaScreenHandler(CoreOobeView* core_oobe_view);
   ~EulaScreenHandler() override;
 
   // EulaView implementation:
@@ -53,7 +53,7 @@
   void HandleOnInstallationSettingsPopupOpened();
 
   EulaScreen* screen_ = nullptr;
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
 
   // Help application used for help dialogs.
   scoped_refptr<HelpAppLauncher> help_app_;

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index 4fadb2b..1c5bf8e 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

@@ -226,10 +226,10 @@
 GaiaScreenHandler::GaiaContext::GaiaContext() {}
 
 GaiaScreenHandler::GaiaScreenHandler(
-    CoreOobeActor* core_oobe_actor,
+    CoreOobeView* core_oobe_view,
     const scoped_refptr<NetworkStateInformer>& network_state_informer)
     : network_state_informer_(network_state_informer),
-      core_oobe_actor_(core_oobe_actor),
+      core_oobe_view_(core_oobe_view),
       weak_factory_(this) {
   DCHECK(network_state_informer_.get());
   set_call_js_prefix(kJsScreenPath);
@@ -240,6 +240,33 @@
     network_portal_detector_->RemoveObserver(this);
 }
 
+void GaiaScreenHandler::MaybePreloadAuthExtension() {
+  VLOG(1) << "MaybePreloadAuthExtension";
+
+  if (!network_portal_detector_) {
+    NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl(
+        g_browser_process->system_request_context(), false);
+    detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
+    network_portal_detector_.reset(detector);
+    network_portal_detector_->AddObserver(this);
+    network_portal_detector_->Enable(true);
+  }
+
+  // If cookies clearing was initiated or |dns_clear_task_running_| then auth
+  // extension showing has already been initiated and preloading is pointless.
+  if (signin_screen_handler_->ShouldLoadGaia() && !gaia_silent_load_ &&
+      !cookies_cleared_ && !dns_clear_task_running_ &&
+      network_state_informer_->state() == NetworkStateInformer::ONLINE) {
+    gaia_silent_load_ = true;
+    gaia_silent_load_network_ = network_state_informer_->network_path();
+    LoadAuthExtension(true /* force */, false /* offline */);
+  }
+}
+
+void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
+  disable_restrictive_proxy_check_for_test_ = true;
+}
+
 void GaiaScreenHandler::LoadGaia(const GaiaContext& context) {
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
@@ -526,7 +553,7 @@
       break;
     }
     case authpolicy::ERROR_PASSWORD_EXPIRED:
-      core_oobe_actor_->ShowActiveDirectoryPasswordChangeScreen(username);
+      core_oobe_view_->ShowActiveDirectoryPasswordChangeScreen(username);
       break;
     case authpolicy::ERROR_PARSE_UPN_FAILED:
     case authpolicy::ERROR_BAD_USER_NAME:
@@ -874,7 +901,7 @@
   LoadAuthExtension(!gaia_silent_load_ /* force */, false /* offline */);
   signin_screen_handler_->UpdateUIState(
       SigninScreenHandler::UI_STATE_GAIA_SIGNIN, nullptr);
-  core_oobe_actor_->UpdateKeyboardState();
+  core_oobe_view_->UpdateKeyboardState();
 
   if (gaia_silent_load_) {
     // The variable is assigned to false because silently loaded Gaia page was
@@ -883,41 +910,16 @@
   }
   UpdateState(NetworkError::ERROR_REASON_UPDATE);
 
-  if (core_oobe_actor_) {
+  if (core_oobe_view_) {
     PrefService* prefs = g_browser_process->local_state();
     if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
-      core_oobe_actor_->ShowDeviceResetScreen();
+      core_oobe_view_->ShowDeviceResetScreen();
     } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
-      core_oobe_actor_->ShowEnableDebuggingScreen();
+      core_oobe_view_->ShowEnableDebuggingScreen();
     }
   }
 }
 
-void GaiaScreenHandler::MaybePreloadAuthExtension() {
-  VLOG(1) << "MaybePreloadAuthExtension";
-
-  if (!network_portal_detector_) {
-    NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl(
-        g_browser_process->system_request_context(), false);
-    detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
-    network_portal_detector_.reset(detector);
-    network_portal_detector_->AddObserver(this);
-    network_portal_detector_->Enable(true);
-  }
-
-  // If cookies clearing was initiated or |dns_clear_task_running_| then auth
-  // extension showing has already been initiated and preloading is pointless.
-  if (signin_screen_handler_->ShouldLoadGaia() &&
-      !gaia_silent_load_ &&
-      !cookies_cleared_ &&
-      !dns_clear_task_running_ &&
-      network_state_informer_->state() == NetworkStateInformer::ONLINE) {
-    gaia_silent_load_ = true;
-    gaia_silent_load_network_ = network_state_informer_->network_path();
-    LoadAuthExtension(true /* force */, false /* offline */);
-  }
-}
-
 void GaiaScreenHandler::ShowWhitelistCheckFailedError() {
   base::DictionaryValue params;
   params.SetBoolean("enterpriseManaged",
@@ -974,8 +976,4 @@
          !IsOnline(captive_portal_status_);
 }
 
-void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
-  disable_restrictive_proxy_check_for_test_ = true;
-}
-
 }  // namespace chromeos

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
index 5e3afa2d..3fa5c55 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

@@ -10,7 +10,8 @@
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
+#include "chrome/browser/chromeos/login/screens/gaia_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
@@ -31,6 +32,7 @@
 
 // A class that handles WebUI hooks in Gaia screen.
 class GaiaScreenHandler : public BaseScreenHandler,
+                          public GaiaView,
                           public NetworkPortalDetector::Observer {
  public:
   enum FrameState {
@@ -41,15 +43,13 @@
   };
 
   GaiaScreenHandler(
-      CoreOobeActor* core_oobe_actor,
+      CoreOobeView* core_oobe_view,
       const scoped_refptr<NetworkStateInformer>& network_state_informer);
   ~GaiaScreenHandler() override;
 
-  // Decides whether an auth extension should be pre-loaded. If it should,
-  // pre-loads it.
-  void MaybePreloadAuthExtension();
-
-  void DisableRestrictiveProxyCheckForTest();
+  // GaiaView:
+  void MaybePreloadAuthExtension() override;
+  void DisableRestrictiveProxyCheckForTest() override;
 
  private:
   // TODO (antrim@): remove this dependency.
@@ -220,7 +220,7 @@
   // Network state informer used to keep signin screen up.
   scoped_refptr<NetworkStateInformer> network_state_informer_;
 
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
 
   // Email to pre-populate with.
   std::string populated_email_;

diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
index b6d5803..1aaa7ec 100644
--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

@@ -11,7 +11,7 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/oobe_screen.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
@@ -29,8 +29,8 @@
 namespace chromeos {
 
 HIDDetectionScreenHandler::HIDDetectionScreenHandler(
-    CoreOobeActor* core_oobe_actor)
-    : core_oobe_actor_(core_oobe_actor) {
+    CoreOobeView* core_oobe_view)
+    : core_oobe_view_(core_oobe_view) {
   set_call_js_prefix(kJsScreenPath);
 }
 
@@ -44,7 +44,7 @@
     show_on_init_ = true;
     return;
   }
-  core_oobe_actor_->InitDemoModeDetection();
+  core_oobe_view_->InitDemoModeDetection();
 
   PrefService* local_state = g_browser_process->local_state();
   int num_of_times_dialog_was_shown = local_state->GetInteger(
@@ -109,7 +109,7 @@
 
 void HIDDetectionScreenHandler::HandleOnContinue() {
   // Continue button pressed.
-  core_oobe_actor_->StopDemoModeDetection();
+  core_oobe_view_->StopDemoModeDetection();
   if (screen_)
     screen_->OnContinueButtonClicked();
 }

diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
index 4fb4b3837..154fc4b 100644
--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h

@@ -17,15 +17,14 @@
 
 namespace chromeos {
 
-class CoreOobeActor;
+class CoreOobeView;
 
 // WebUI implementation of HIDDetectionScreenView.
 class HIDDetectionScreenHandler
     : public HIDDetectionView,
       public BaseScreenHandler {
  public:
-
-  explicit HIDDetectionScreenHandler(CoreOobeActor* core_oobe_actor);
+  explicit HIDDetectionScreenHandler(CoreOobeView* core_oobe_view);
   ~HIDDetectionScreenHandler() override;
 
   // HIDDetectionView implementation:
@@ -51,7 +50,7 @@
 
   HIDDetectionScreen* screen_ = nullptr;
 
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
 
   // If true, Initialize() will call Show().
   bool show_on_init_ = false;

diff --git a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
index 420d76a..0dc1b55 100644
--- a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc

@@ -32,7 +32,7 @@
 
 HostPairingScreenHandler::~HostPairingScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void HostPairingScreenHandler::HandleContextReady() {

diff --git a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h
index 26df3e4..7bb74f4 100644
--- a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h

@@ -6,13 +6,13 @@
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_HOST_PAIRING_SCREEN_HANDLER_H_
 
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/host_pairing_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/host_pairing_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "components/login/screens/screen_context.h"
 
 namespace chromeos {
 
-class HostPairingScreenHandler : public HostPairingScreenActor,
+class HostPairingScreenHandler : public HostPairingScreenView,
                                  public BaseScreenHandler {
  public:
   HostPairingScreenHandler();
@@ -35,7 +35,7 @@
   void SetDelegate(Delegate* delegate) override;
   void OnContextChanged(const base::DictionaryValue& diff) override;
 
-  HostPairingScreenActor::Delegate* delegate_ = nullptr;
+  HostPairingScreenView::Delegate* delegate_ = nullptr;
   bool show_on_init_ = false;
   bool js_context_ready_ = false;
 

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc
index d71d260..50d8b97c 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.cc

@@ -39,7 +39,7 @@
 
 KioskAutolaunchScreenHandler::~KioskAutolaunchScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 
   KioskAppManager::Get()->RemoveObserver(this);
 }

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
index 3f1d51fd..2b5a9f7 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_autolaunch_screen_handler.h

@@ -8,14 +8,14 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
-#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "content/public/browser/web_ui.h"
 
 namespace chromeos {
 
 // WebUI implementation of KioskAutolaunchScreenActor.
-class KioskAutolaunchScreenHandler : public KioskAutolaunchScreenActor,
+class KioskAutolaunchScreenHandler : public KioskAutolaunchScreenView,
                                      public KioskAppManagerObserver,
                                      public BaseScreenHandler {
  public:

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
index 2046082..f2c86d7 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.cc

@@ -30,7 +30,7 @@
 
 KioskEnableScreenHandler::~KioskEnableScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void KioskEnableScreenHandler::Show() {

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
index 9d1b9bb..3abc661 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_enable_screen_handler.h

@@ -9,13 +9,13 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
-#include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/kiosk_enable_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
 // WebUI implementation of KioskEnableScreenActor.
-class KioskEnableScreenHandler : public KioskEnableScreenActor,
+class KioskEnableScreenHandler : public KioskEnableScreenView,
                                  public BaseScreenHandler {
  public:
   KioskEnableScreenHandler();

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index a4811d1c..9b6bd696 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

@@ -118,13 +118,9 @@
 
 // NetworkDropdown -------------------------------------------------------------
 
-NetworkDropdown::NetworkDropdown(Actor* actor,
-                                 content::WebUI* web_ui,
-                                 bool oobe)
-    : actor_(actor),
-      web_ui_(web_ui),
-      oobe_(oobe) {
-  DCHECK(actor_);
+NetworkDropdown::NetworkDropdown(View* view, content::WebUI* web_ui, bool oobe)
+    : view_(view), web_ui_(web_ui), oobe_(oobe) {
+  DCHECK(view_);
   network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
   DCHECK(NetworkHandler::IsInitialized());
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
@@ -162,7 +158,7 @@
 }
 
 void NetworkDropdown::OnConnectToNetworkRequested() {
-  actor_->OnConnectToNetworkRequested();
+  view_->OnConnectToNetworkRequested();
 }
 
 void NetworkDropdown::DefaultNetworkChanged(const NetworkState* network) {

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h
index 1de3756d8..1ab6009 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h

@@ -28,13 +28,13 @@
                         public NetworkStateHandlerObserver,
                         public ash::network_icon::AnimationObserver {
  public:
-  class Actor {
+  class View {
    public:
-    virtual ~Actor() {}
+    virtual ~View() {}
     virtual void OnConnectToNetworkRequested() = 0;
   };
 
-  NetworkDropdown(Actor* actor, content::WebUI* web_ui, bool oobe);
+  NetworkDropdown(View* view, content::WebUI* web_ui, bool oobe);
   ~NetworkDropdown() override;
 
   // This method should be called, when item with the given id is chosen.
@@ -69,7 +69,7 @@
   // The Network menu.
   std::unique_ptr<NetworkMenuWebUI> network_menu_;
 
-  Actor* actor_;
+  View* view_;
 
   content::WebUI* web_ui_;
 

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
index 6c70b655..4c0c64a 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h

@@ -16,7 +16,7 @@
 namespace chromeos {
 
 class NetworkDropdownHandler : public BaseScreenHandler,
-                               public NetworkDropdown::Actor {
+                               public NetworkDropdown::View {
  public:
   class Observer {
    public:

diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 79f1ad63..14819d7 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/idle_detector.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/ui/input_events_blocker.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -54,10 +54,10 @@
 
 // NetworkScreenHandler, public: -----------------------------------------------
 
-NetworkScreenHandler::NetworkScreenHandler(CoreOobeActor* core_oobe_actor)
-    : core_oobe_actor_(core_oobe_actor) {
+NetworkScreenHandler::NetworkScreenHandler(CoreOobeView* core_oobe_view)
+    : core_oobe_view_(core_oobe_view) {
   set_call_js_prefix(kJsScreenPath);
-  DCHECK(core_oobe_actor_);
+  DCHECK(core_oobe_view_);
 }
 
 NetworkScreenHandler::~NetworkScreenHandler() {
@@ -65,7 +65,7 @@
     screen_->OnViewDestroyed(this);
 }
 
-// NetworkScreenHandler, NetworkScreenActor implementation: --------------------
+// NetworkScreenHandler, NetworkScreenView implementation: ---------------------
 
 void NetworkScreenHandler::Show() {
   if (!page_is_ready()) {
@@ -75,13 +75,13 @@
 
   PrefService* prefs = g_browser_process->local_state();
   if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowDeviceResetScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowDeviceResetScreen();
 
     return;
   } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowEnableDebuggingScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowEnableDebuggingScreen();
 
     return;
   }
@@ -98,7 +98,7 @@
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kSystemDevMode));
   ShowScreenWithData(OobeScreen::SCREEN_OOBE_NETWORK, &network_screen_params);
-  core_oobe_actor_->InitDemoModeDetection();
+  core_oobe_view_->InitDemoModeDetection();
 }
 
 void NetworkScreenHandler::Hide() {
@@ -120,11 +120,11 @@
 
 void NetworkScreenHandler::ClearErrors() {
   if (page_is_ready())
-    core_oobe_actor_->ClearErrors();
+    core_oobe_view_->ClearErrors();
 }
 
 void NetworkScreenHandler::StopDemoModeDetection() {
-  core_oobe_actor_->StopDemoModeDetection();
+  core_oobe_view_->StopDemoModeDetection();
 }
 
 void NetworkScreenHandler::ShowConnectingStatus(
@@ -135,7 +135,7 @@
 void NetworkScreenHandler::ReloadLocalizedContent() {
   base::DictionaryValue localized_strings;
   GetOobeUI()->GetLocalizedStrings(&localized_strings);
-  core_oobe_actor_->ReloadContent(localized_strings);
+  core_oobe_view_->ReloadContent(localized_strings);
 }
 
 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------

diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
index 2c735ad..a181032 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.h

@@ -19,13 +19,13 @@
 
 namespace chromeos {
 
-class CoreOobeActor;
+class CoreOobeView;
 
-// WebUI implementation of NetworkScreenActor. It is used to interact with
+// WebUI implementation of NetworkScreenView. It is used to interact with
 // the welcome screen (part of the page) of the OOBE.
 class NetworkScreenHandler : public NetworkView, public BaseScreenHandler {
  public:
-  explicit NetworkScreenHandler(CoreOobeActor* core_oobe_actor);
+  explicit NetworkScreenHandler(CoreOobeView* core_oobe_view);
   ~NetworkScreenHandler() override;
 
  private:
@@ -50,7 +50,7 @@
   // Returns available timezones. Caller gets the ownership.
   static base::ListValue* GetTimezoneList();
 
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
   NetworkScreen* screen_ = nullptr;
 
   // Keeps whether screen should be shown right after initialization.

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index c90b6a3..4abf56c 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -17,8 +17,8 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_actor.h"
-#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
+#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_view.h"
+#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_view.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -235,7 +235,7 @@
 
   auto debugging_screen_handler =
       base::MakeUnique<EnableDebuggingScreenHandler>();
-  debugging_screen_actor_ = debugging_screen_handler.get();
+  debugging_screen_view_ = debugging_screen_handler.get();
   AddScreenHandler(std::move(debugging_screen_handler));
 
   auto eula_screen_handler = base::MakeUnique<EulaScreenHandler>(core_handler_);
@@ -248,27 +248,27 @@
 
   auto autolaunch_screen_handler =
       base::MakeUnique<KioskAutolaunchScreenHandler>();
-  autolaunch_screen_actor_ = autolaunch_screen_handler.get();
+  autolaunch_screen_view_ = autolaunch_screen_handler.get();
   AddScreenHandler(std::move(autolaunch_screen_handler));
 
   auto kiosk_enable_screen_handler =
       base::MakeUnique<KioskEnableScreenHandler>();
-  kiosk_enable_screen_actor_ = kiosk_enable_screen_handler.get();
+  kiosk_enable_screen_view_ = kiosk_enable_screen_handler.get();
   AddScreenHandler(std::move(kiosk_enable_screen_handler));
 
   auto supervised_user_creation_screen_handler =
       base::MakeUnique<SupervisedUserCreationScreenHandler>();
-  supervised_user_creation_screen_actor_ =
+  supervised_user_creation_screen_view_ =
       supervised_user_creation_screen_handler.get();
   AddScreenHandler(std::move(supervised_user_creation_screen_handler));
 
   auto wrong_hwid_screen_handler = base::MakeUnique<WrongHWIDScreenHandler>();
-  wrong_hwid_screen_actor_ = wrong_hwid_screen_handler.get();
+  wrong_hwid_screen_view_ = wrong_hwid_screen_handler.get();
   AddScreenHandler(std::move(wrong_hwid_screen_handler));
 
   auto auto_enrollment_check_screen_handler =
       base::MakeUnique<AutoEnrollmentCheckScreenHandler>();
-  auto_enrollment_check_screen_actor_ =
+  auto_enrollment_check_screen_view_ =
       auto_enrollment_check_screen_handler.get();
   AddScreenHandler(std::move(auto_enrollment_check_screen_handler));
 
@@ -287,18 +287,17 @@
 
   auto enrollment_screen_handler = base::MakeUnique<EnrollmentScreenHandler>(
       network_state_informer_, error_screen);
-  enrollment_screen_actor_ = enrollment_screen_handler.get();
+  enrollment_screen_view_ = enrollment_screen_handler.get();
   AddScreenHandler(std::move(enrollment_screen_handler));
 
   auto terms_of_service_screen_handler =
       base::MakeUnique<TermsOfServiceScreenHandler>(core_handler_);
-  terms_of_service_screen_actor_ = terms_of_service_screen_handler.get();
+  terms_of_service_screen_view_ = terms_of_service_screen_handler.get();
   AddScreenHandler(std::move(terms_of_service_screen_handler));
 
   auto arc_terms_of_service_screen_handler =
       base::MakeUnique<ArcTermsOfServiceScreenHandler>();
-  arc_terms_of_service_screen_actor_ =
-      arc_terms_of_service_screen_handler.get();
+  arc_terms_of_service_screen_view_ = arc_terms_of_service_screen_handler.get();
   AddScreenHandler(std::move(arc_terms_of_service_screen_handler));
 
   auto user_image_screen_handler = base::MakeUnique<UserImageScreenHandler>();
@@ -323,28 +322,28 @@
   auto app_launch_splash_screen_handler =
       base::MakeUnique<AppLaunchSplashScreenHandler>(network_state_informer_,
                                                      error_screen);
-  app_launch_splash_screen_actor_ = app_launch_splash_screen_handler.get();
+  app_launch_splash_screen_view_ = app_launch_splash_screen_handler.get();
   AddScreenHandler(std::move(app_launch_splash_screen_handler));
 
   auto arc_kiosk_splash_screen_handler =
       base::MakeUnique<ArcKioskSplashScreenHandler>();
-  arc_kiosk_splash_screen_actor_ = arc_kiosk_splash_screen_handler.get();
+  arc_kiosk_splash_screen_view_ = arc_kiosk_splash_screen_handler.get();
   AddScreenHandler(std::move(arc_kiosk_splash_screen_handler));
 
   if (display_type_ == kOobeDisplay) {
     auto controller_pairing_handler =
         base::MakeUnique<ControllerPairingScreenHandler>();
-    controller_pairing_screen_actor_ = controller_pairing_handler.get();
+    controller_pairing_screen_view_ = controller_pairing_handler.get();
     AddScreenHandler(std::move(controller_pairing_handler));
 
     auto host_pairing_handler = base::MakeUnique<HostPairingScreenHandler>();
-    host_pairing_screen_actor_ = host_pairing_handler.get();
+    host_pairing_screen_view_ = host_pairing_handler.get();
     AddScreenHandler(std::move(host_pairing_handler));
   }
 
   auto device_disabled_screen_handler =
       base::MakeUnique<DeviceDisabledScreenHandler>();
-  device_disabled_screen_actor_ = device_disabled_screen_handler.get();
+  device_disabled_screen_view_ = device_disabled_screen_handler.get();
   AddScreenHandler(std::move(device_disabled_screen_handler));
 
   // Initialize KioskAppMenuHandler. Note that it is NOT a screen handler.
@@ -392,7 +391,7 @@
   }
 }
 
-CoreOobeActor* OobeUI::GetCoreOobeActor() {
+CoreOobeView* OobeUI::GetCoreOobeView() {
   return core_handler_;
 }
 
@@ -408,56 +407,56 @@
   return update_view_;
 }
 
-EnableDebuggingScreenActor* OobeUI::GetEnableDebuggingScreenActor() {
-  return debugging_screen_actor_;
+EnableDebuggingScreenView* OobeUI::GetEnableDebuggingScreenView() {
+  return debugging_screen_view_;
 }
 
-EnrollmentScreenActor* OobeUI::GetEnrollmentScreenActor() {
-  return enrollment_screen_actor_;
+EnrollmentScreenView* OobeUI::GetEnrollmentScreenView() {
+  return enrollment_screen_view_;
 }
 
 ResetView* OobeUI::GetResetView() {
   return reset_view_;
 }
 
-KioskAutolaunchScreenActor* OobeUI::GetKioskAutolaunchScreenActor() {
-  return autolaunch_screen_actor_;
+KioskAutolaunchScreenView* OobeUI::GetKioskAutolaunchScreenView() {
+  return autolaunch_screen_view_;
 }
 
-KioskEnableScreenActor* OobeUI::GetKioskEnableScreenActor() {
-  return kiosk_enable_screen_actor_;
+KioskEnableScreenView* OobeUI::GetKioskEnableScreenView() {
+  return kiosk_enable_screen_view_;
 }
 
-TermsOfServiceScreenActor* OobeUI::GetTermsOfServiceScreenActor() {
-  return terms_of_service_screen_actor_;
+TermsOfServiceScreenView* OobeUI::GetTermsOfServiceScreenView() {
+  return terms_of_service_screen_view_;
 }
 
-ArcTermsOfServiceScreenActor* OobeUI::GetArcTermsOfServiceScreenActor() {
-  return arc_terms_of_service_screen_actor_;
+ArcTermsOfServiceScreenView* OobeUI::GetArcTermsOfServiceScreenView() {
+  return arc_terms_of_service_screen_view_;
 }
 
-WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
-  return wrong_hwid_screen_actor_;
+WrongHWIDScreenView* OobeUI::GetWrongHWIDScreenView() {
+  return wrong_hwid_screen_view_;
 }
 
-AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() {
-  return auto_enrollment_check_screen_actor_;
+AutoEnrollmentCheckScreenView* OobeUI::GetAutoEnrollmentCheckScreenView() {
+  return auto_enrollment_check_screen_view_;
 }
 
 HIDDetectionView* OobeUI::GetHIDDetectionView() {
   return hid_detection_view_;
 }
 
-ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() {
-  return controller_pairing_screen_actor_;
+ControllerPairingScreenView* OobeUI::GetControllerPairingScreenView() {
+  return controller_pairing_screen_view_;
 }
 
-HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() {
-  return host_pairing_screen_actor_;
+HostPairingScreenView* OobeUI::GetHostPairingScreenView() {
+  return host_pairing_screen_view_;
 }
 
-DeviceDisabledScreenActor* OobeUI::GetDeviceDisabledScreenActor() {
-  return device_disabled_screen_actor_;
+DeviceDisabledScreenView* OobeUI::GetDeviceDisabledScreenView() {
+  return device_disabled_screen_view_;
 }
 
 UserImageView* OobeUI::GetUserImageView() {
@@ -469,15 +468,15 @@
 }
 
 SupervisedUserCreationScreenHandler*
-    OobeUI::GetSupervisedUserCreationScreenActor() {
-  return supervised_user_creation_screen_actor_;
+OobeUI::GetSupervisedUserCreationScreenView() {
+  return supervised_user_creation_screen_view_;
 }
 
-GaiaScreenHandler* OobeUI::GetGaiaScreenActor() {
+GaiaView* OobeUI::GetGaiaScreenView() {
   return gaia_screen_handler_;
 }
 
-UserBoardView* OobeUI::GetUserBoardScreenActor() {
+UserBoardView* OobeUI::GetUserBoardView() {
   return user_board_screen_handler_;
 }
 
@@ -485,13 +484,12 @@
   core_handler_->UpdateShutdownAndRebootVisibility(reboot_on_shutdown);
 }
 
-AppLaunchSplashScreenActor*
-      OobeUI::GetAppLaunchSplashScreenActor() {
-  return app_launch_splash_screen_actor_;
+AppLaunchSplashScreenView* OobeUI::GetAppLaunchSplashScreenView() {
+  return app_launch_splash_screen_view_;
 }
 
-ArcKioskSplashScreenActor* OobeUI::GetArcKioskSplashScreenActor() {
-  return arc_kiosk_splash_screen_actor_;
+ArcKioskSplashScreenView* OobeUI::GetArcKioskSplashScreenView() {
+  return arc_kiosk_splash_screen_view_;
 }
 
 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
@@ -642,7 +640,7 @@
 
   base::DictionaryValue localized_strings;
   GetLocalizedStrings(&localized_strings);
-  static_cast<CoreOobeActor*>(core_handler_)->ReloadContent(localized_strings);
+  static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
 }
 
 }  // namespace chromeos

diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
index 80e08072..e7c75be 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.h
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.h

@@ -28,25 +28,26 @@
 }  // namespace base
 
 namespace chromeos {
-class AppLaunchSplashScreenActor;
-class ArcKioskSplashScreenActor;
-class ArcTermsOfServiceScreenActor;
-class AutoEnrollmentCheckScreenActor;
+class AppLaunchSplashScreenView;
+class ArcKioskSplashScreenView;
+class ArcTermsOfServiceScreenView;
+class AutoEnrollmentCheckScreenView;
 class BaseScreenHandler;
-class ControllerPairingScreenActor;
-class CoreOobeActor;
-class DeviceDisabledScreenActor;
-class EnableDebuggingScreenActor;
-class EnrollmentScreenActor;
+class ControllerPairingScreenView;
+class CoreOobeView;
+class DeviceDisabledScreenView;
+class EnableDebuggingScreenView;
+class EnrollmentScreenView;
 class EulaView;
 class ErrorScreen;
 class ErrorScreenHandler;
+class GaiaView;
 class GaiaScreenHandler;
 class HIDDetectionView;
-class HostPairingScreenActor;
+class HostPairingScreenView;
 class KioskAppMenuHandler;
-class KioskAutolaunchScreenActor;
-class KioskEnableScreenActor;
+class KioskAutolaunchScreenView;
+class KioskEnableScreenView;
 class LoginScreenContext;
 class NativeWindowDelegate;
 class NetworkDropdownHandler;
@@ -56,12 +57,12 @@
 class SigninScreenHandlerDelegate;
 class SupervisedUserCreationScreenHandler;
 class ResetView;
-class TermsOfServiceScreenActor;
+class TermsOfServiceScreenView;
 class UserBoardScreenHandler;
 class UserBoardView;
 class UserImageView;
 class UpdateView;
-class WrongHWIDScreenActor;
+class WrongHWIDScreenView;
 
 // A custom WebUI that defines datasource for out-of-box-experience (OOBE) UI:
 // - welcome screen (setup language/keyboard/network).
@@ -94,31 +95,30 @@
   OobeUI(content::WebUI* web_ui, const GURL& url);
   ~OobeUI() override;
 
-  CoreOobeActor* GetCoreOobeActor();
+  CoreOobeView* GetCoreOobeView();
   NetworkView* GetNetworkView();
   EulaView* GetEulaView();
   UpdateView* GetUpdateView();
-  EnableDebuggingScreenActor* GetEnableDebuggingScreenActor();
-  EnrollmentScreenActor* GetEnrollmentScreenActor();
+  EnableDebuggingScreenView* GetEnableDebuggingScreenView();
+  EnrollmentScreenView* GetEnrollmentScreenView();
   ResetView* GetResetView();
-  KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor();
-  KioskEnableScreenActor* GetKioskEnableScreenActor();
-  TermsOfServiceScreenActor* GetTermsOfServiceScreenActor();
-  ArcTermsOfServiceScreenActor* GetArcTermsOfServiceScreenActor();
+  KioskAutolaunchScreenView* GetKioskAutolaunchScreenView();
+  KioskEnableScreenView* GetKioskEnableScreenView();
+  TermsOfServiceScreenView* GetTermsOfServiceScreenView();
+  ArcTermsOfServiceScreenView* GetArcTermsOfServiceScreenView();
   UserImageView* GetUserImageView();
   ErrorScreen* GetErrorScreen();
-  WrongHWIDScreenActor* GetWrongHWIDScreenActor();
-  AutoEnrollmentCheckScreenActor* GetAutoEnrollmentCheckScreenActor();
-  SupervisedUserCreationScreenHandler* GetSupervisedUserCreationScreenActor();
-  AppLaunchSplashScreenActor* GetAppLaunchSplashScreenActor();
-  ArcKioskSplashScreenActor* GetArcKioskSplashScreenActor();
-  bool IsJSReady(const base::Closure& display_is_ready_callback);
+  WrongHWIDScreenView* GetWrongHWIDScreenView();
+  AutoEnrollmentCheckScreenView* GetAutoEnrollmentCheckScreenView();
+  SupervisedUserCreationScreenHandler* GetSupervisedUserCreationScreenView();
+  AppLaunchSplashScreenView* GetAppLaunchSplashScreenView();
+  ArcKioskSplashScreenView* GetArcKioskSplashScreenView();
   HIDDetectionView* GetHIDDetectionView();
-  ControllerPairingScreenActor* GetControllerPairingScreenActor();
-  HostPairingScreenActor* GetHostPairingScreenActor();
-  DeviceDisabledScreenActor* GetDeviceDisabledScreenActor();
-  GaiaScreenHandler* GetGaiaScreenActor();
-  UserBoardView* GetUserBoardScreenActor();
+  ControllerPairingScreenView* GetControllerPairingScreenView();
+  HostPairingScreenView* GetHostPairingScreenView();
+  DeviceDisabledScreenView* GetDeviceDisabledScreenView();
+  GaiaView* GetGaiaScreenView();
+  UserBoardView* GetUserBoardView();
 
   // ShutdownPolicyHandler::Delegate
   void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
@@ -133,6 +133,8 @@
   // async assets load id will be initialized.
   void OnScreenAssetsLoaded(const std::string& async_assets_load_id);
 
+  bool IsJSReady(const base::Closure& display_is_ready_callback);
+
   // Shows or hides OOBE UI elements.
   void ShowOobeUI(bool show);
 
@@ -154,7 +156,7 @@
 
   const std::string& display_type() const { return display_type_; }
 
-  SigninScreenHandler* signin_screen_handler_for_test() {
+  SigninScreenHandler* signin_screen_handler() {
     return signin_screen_handler_;
   }
 
@@ -186,25 +188,25 @@
   // network dropdown.
   NetworkDropdownHandler* network_dropdown_handler_ = nullptr;
 
-  // Screens actors. Note, OobeUI owns them via |handlers_|, not directly here.
+  // Screens views. Note, OobeUI owns them via |handlers_|, not directly here.
   UpdateView* update_view_ = nullptr;
   NetworkView* network_view_ = nullptr;
-  EnableDebuggingScreenActor* debugging_screen_actor_ = nullptr;
+  EnableDebuggingScreenView* debugging_screen_view_ = nullptr;
   EulaView* eula_view_ = nullptr;
-  EnrollmentScreenActor* enrollment_screen_actor_ = nullptr;
+  EnrollmentScreenView* enrollment_screen_view_ = nullptr;
   ResetView* reset_view_ = nullptr;
   HIDDetectionView* hid_detection_view_ = nullptr;
-  KioskAutolaunchScreenActor* autolaunch_screen_actor_ = nullptr;
-  KioskEnableScreenActor* kiosk_enable_screen_actor_ = nullptr;
-  WrongHWIDScreenActor* wrong_hwid_screen_actor_ = nullptr;
-  AutoEnrollmentCheckScreenActor* auto_enrollment_check_screen_actor_ = nullptr;
-  SupervisedUserCreationScreenHandler* supervised_user_creation_screen_actor_ =
+  KioskAutolaunchScreenView* autolaunch_screen_view_ = nullptr;
+  KioskEnableScreenView* kiosk_enable_screen_view_ = nullptr;
+  WrongHWIDScreenView* wrong_hwid_screen_view_ = nullptr;
+  AutoEnrollmentCheckScreenView* auto_enrollment_check_screen_view_ = nullptr;
+  SupervisedUserCreationScreenHandler* supervised_user_creation_screen_view_ =
       nullptr;
-  AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr;
-  ArcKioskSplashScreenActor* arc_kiosk_splash_screen_actor_ = nullptr;
-  ControllerPairingScreenActor* controller_pairing_screen_actor_ = nullptr;
-  HostPairingScreenActor* host_pairing_screen_actor_ = nullptr;
-  DeviceDisabledScreenActor* device_disabled_screen_actor_ = nullptr;
+  AppLaunchSplashScreenView* app_launch_splash_screen_view_ = nullptr;
+  ArcKioskSplashScreenView* arc_kiosk_splash_screen_view_ = nullptr;
+  ControllerPairingScreenView* controller_pairing_screen_view_ = nullptr;
+  HostPairingScreenView* host_pairing_screen_view_ = nullptr;
+  DeviceDisabledScreenView* device_disabled_screen_view_ = nullptr;
 
   // Reference to ErrorScreenHandler that handles error screen
   // requests and forward calls from native code to JS side.
@@ -222,8 +224,8 @@
   // forwards calls from native code to JS side.
   SigninScreenHandler* signin_screen_handler_ = nullptr;
 
-  TermsOfServiceScreenActor* terms_of_service_screen_actor_ = nullptr;
-  ArcTermsOfServiceScreenActor* arc_terms_of_service_screen_actor_ = nullptr;
+  TermsOfServiceScreenView* terms_of_service_screen_view_ = nullptr;
+  ArcTermsOfServiceScreenView* arc_terms_of_service_screen_view_ = nullptr;
   UserImageView* user_image_view_ = nullptr;
 
   std::vector<BaseScreenHandler*> handlers_;  // Non-owning pointers.

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index cf02376..4427b04 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -43,7 +43,7 @@
 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h"
 #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h"
 #include "chrome/browser/chromeos/login/reauth_stats.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/login/screens/network_error.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -291,11 +291,11 @@
 SigninScreenHandler::SigninScreenHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer,
     ErrorScreen* error_screen,
-    CoreOobeActor* core_oobe_actor,
+    CoreOobeView* core_oobe_view,
     GaiaScreenHandler* gaia_screen_handler)
     : network_state_informer_(network_state_informer),
       error_screen_(error_screen),
-      core_oobe_actor_(core_oobe_actor),
+      core_oobe_view_(core_oobe_view),
       caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get()
                              ->GetImeKeyboard()
                              ->CapsLockIsEnabled()),
@@ -306,7 +306,7 @@
       weak_factory_(this) {
   DCHECK(network_state_informer_.get());
   DCHECK(error_screen_);
-  DCHECK(core_oobe_actor_);
+  DCHECK(core_oobe_view_);
   gaia_screen_handler_->set_signin_screen_handler(this);
   network_state_informer_->AddObserver(this);
 
@@ -676,6 +676,14 @@
   zero_offline_timeout_for_test_ = true;
 }
 
+bool SigninScreenHandler::GetKeyboardRemappedPrefValue(
+    const std::string& pref_name,
+    int* value) {
+  return focused_pod_account_id_ && focused_pod_account_id_->is_valid() &&
+         user_manager::known_user::GetIntegerPref(*focused_pod_account_id_,
+                                                  pref_name, value);
+}
+
 // SigninScreenHandler, private: -----------------------------------------------
 
 void SigninScreenHandler::ShowImpl() {
@@ -984,15 +992,15 @@
 }
 
 void SigninScreenHandler::ClearAndEnablePassword() {
-  core_oobe_actor_->ResetSignInUI(false);
+  core_oobe_view_->ResetSignInUI(false);
 }
 
 void SigninScreenHandler::ClearUserPodPassword() {
-  core_oobe_actor_->ClearUserPodPassword();
+  core_oobe_view_->ClearUserPodPassword();
 }
 
 void SigninScreenHandler::RefocusCurrentPod() {
-  core_oobe_actor_->RefocusCurrentPod();
+  core_oobe_view_->RefocusCurrentPod();
 }
 
 void SigninScreenHandler::HidePinKeyboardIfNeeded(const AccountId& account_id) {
@@ -1055,14 +1063,14 @@
                                     const std::string& error_text,
                                     const std::string& help_link_text,
                                     HelpAppLauncher::HelpTopic help_topic_id) {
-  core_oobe_actor_->ShowSignInError(login_attempts, error_text, help_link_text,
-                                    help_topic_id);
+  core_oobe_view_->ShowSignInError(login_attempts, error_text, help_link_text,
+                                   help_topic_id);
 }
 
 void SigninScreenHandler::ShowErrorScreen(LoginDisplay::SigninError error_id) {
   switch (error_id) {
     case LoginDisplay::TPM_ERROR:
-      core_oobe_actor_->ShowTpmError();
+      core_oobe_view_->ShowTpmError();
       break;
     default:
       NOTREACHED() << "Unknown sign in error";
@@ -1071,12 +1079,12 @@
 }
 
 void SigninScreenHandler::ShowSigninUI(const std::string& email) {
-  core_oobe_actor_->ShowSignInUI(email);
+  core_oobe_view_->ShowSignInUI(email);
 }
 
 void SigninScreenHandler::ShowPasswordChangedDialog(bool show_password_error,
                                                     const std::string& email) {
-  core_oobe_actor_->ShowPasswordChangedScreen(show_password_error, email);
+  core_oobe_view_->ShowPasswordChangedScreen(show_password_error, email);
 }
 
 void SigninScreenHandler::ShowSigninScreenForCreds(
@@ -1308,13 +1316,13 @@
 
   PrefService* prefs = g_browser_process->local_state();
   if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowDeviceResetScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowDeviceResetScreen();
 
     return;
   } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
-    if (core_oobe_actor_)
-      core_oobe_actor_->ShowEnableDebuggingScreen();
+    if (core_oobe_view_)
+      core_oobe_view_->ShowEnableDebuggingScreen();
 
     return;
   }

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index b978a55..b174e1d 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

@@ -46,7 +46,7 @@
 
 namespace chromeos {
 
-class CoreOobeActor;
+class CoreOobeView;
 class ErrorScreensHistogramHelper;
 class GaiaScreenHandler;
 class LoginFeedback;
@@ -230,7 +230,7 @@
   SigninScreenHandler(
       const scoped_refptr<NetworkStateInformer>& network_state_informer,
       ErrorScreen* error_screen,
-      CoreOobeActor* core_oobe_actor,
+      CoreOobeView* core_oobe_view,
       GaiaScreenHandler* gaia_screen_handler);
   ~SigninScreenHandler() override;
 
@@ -270,6 +270,10 @@
   // show instantaneously in tests.
   void ZeroOfflineTimeoutForTesting();
 
+  // Gets the keyboard remapped pref value for |pref_name| key. Returns true if
+  // successful, otherwise returns false.
+  bool GetKeyboardRemappedPrefValue(const std::string& pref_name, int* value);
+
  private:
   enum UIState {
     UI_STATE_UNKNOWN = 0,
@@ -470,7 +474,7 @@
   bool preferences_changed_delayed_ = false;
 
   ErrorScreen* error_screen_ = nullptr;
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
 
   NetworkStateInformer::State last_network_state_ =
       NetworkStateInformer::UNKNOWN;

diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
index fb5dfbd4..8f6221dd 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc

@@ -48,7 +48,7 @@
 
 SupervisedUserCreationScreenHandler::~SupervisedUserCreationScreenHandler() {
   if (delegate_) {
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
   }
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
index 345541c..55e11d32 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.h

@@ -26,10 +26,9 @@
    public:
     virtual ~Delegate() {}
 
-    // This method is called, when actor is being destroyed. Note, if Delegate
-    // is destroyed earlier then it has to call SetDelegate(NULL).
-    virtual void OnActorDestroyed(
-        SupervisedUserCreationScreenHandler* actor) = 0;
+    // This method is called, when view is being destroyed. Note, if Delegate
+    // is destroyed earlier then it has to call SetDelegate(nullptr).
+    virtual void OnViewDestroyed(SupervisedUserCreationScreenHandler* view) = 0;
 
     // Starts supervised user creation flow, with manager identified by
     // |manager_id| and |manager_password|.

diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
index ef316de01..351a685a 100644
--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

@@ -13,7 +13,7 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
-#include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
+#include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -37,14 +37,14 @@
 namespace chromeos {
 
 TermsOfServiceScreenHandler::TermsOfServiceScreenHandler(
-    CoreOobeActor* core_oobe_actor)
-    : core_oobe_actor_(core_oobe_actor) {
+    CoreOobeView* core_oobe_view)
+    : core_oobe_view_(core_oobe_view) {
   set_call_js_prefix(kJsScreenPath);
 }
 
 TermsOfServiceScreenHandler::~TermsOfServiceScreenHandler() {
   if (screen_)
-    screen_->OnActorDestroyed(this);
+    screen_->OnViewDestroyed(this);
 }
 
 void TermsOfServiceScreenHandler::RegisterMessages() {
@@ -138,7 +138,7 @@
   // Update the screen contents to the new locale.
   base::DictionaryValue localized_strings;
   GetOobeUI()->GetLocalizedStrings(&localized_strings);
-  core_oobe_actor_->ReloadContent(localized_strings);
+  core_oobe_view_->ReloadContent(localized_strings);
 
   DoShow();
 }

diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
index 88d1b47..e1ab445 100644
--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

@@ -10,18 +10,18 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
-#include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/terms_of_service_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 
 namespace chromeos {
 
-class CoreOobeActor;
+class CoreOobeView;
 
-// The sole implementation of the TermsOfServiceScreenActor, using WebUI.
+// The sole implementation of the TermsOfServiceScreenView, using WebUI.
 class TermsOfServiceScreenHandler : public BaseScreenHandler,
-                                    public TermsOfServiceScreenActor {
+                                    public TermsOfServiceScreenView {
  public:
-  explicit TermsOfServiceScreenHandler(CoreOobeActor* core_oobe_actor);
+  explicit TermsOfServiceScreenHandler(CoreOobeView* core_oobe_view);
   ~TermsOfServiceScreenHandler() override;
 
   // content::WebUIMessageHandler:
@@ -31,7 +31,7 @@
   void DeclareLocalizedValues(
       ::login::LocalizedValuesBuilder* builder) override;
 
-  // TermsOfServiceScreenActor:
+  // TermsOfServiceScreenView:
   void SetDelegate(Delegate* screen) override;
   void Show() override;
   void Hide() override;
@@ -70,7 +70,7 @@
 
   TermsOfServiceScreenHandler::Delegate* screen_ = nullptr;
 
-  CoreOobeActor* core_oobe_actor_ = nullptr;
+  CoreOobeView* core_oobe_view_ = nullptr;
 
   // Whether the screen should be shown right after initialization.
   bool show_on_init_ = false;

diff --git a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc
index 7767ab9c..e38c74c4 100644
--- a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc

@@ -22,7 +22,7 @@
 
 WrongHWIDScreenHandler::~WrongHWIDScreenHandler() {
   if (delegate_)
-    delegate_->OnActorDestroyed(this);
+    delegate_->OnViewDestroyed(this);
 }
 
 void WrongHWIDScreenHandler::Show() {

diff --git a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
index 6dfdae54..54e5ee4b 100644
--- a/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h

@@ -7,14 +7,14 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/wrong_hwid_screen_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "content/public/browser/web_ui.h"
 
 namespace chromeos {
 
 // WebUI implementation of WrongHWIDScreenActor.
-class WrongHWIDScreenHandler : public WrongHWIDScreenActor,
+class WrongHWIDScreenHandler : public WrongHWIDScreenView,
                                public BaseScreenHandler {
  public:
   WrongHWIDScreenHandler();

diff --git a/chrome/browser/ui/webui/local_discovery/OWNERS b/chrome/browser/ui/webui/local_discovery/OWNERS
index 58265a3..4633094 100644
--- a/chrome/browser/ui/webui/local_discovery/OWNERS
+++ b/chrome/browser/ui/webui/local_discovery/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc
index 0236882..393626a 100644
--- a/chrome/browser/ui/webui/net_export_ui.cc
+++ b/chrome/browser/ui/webui/net_export_ui.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ -17,6 +18,7 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/net_export_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
@@ -26,11 +28,13 @@
 #include "components/net_log/net_export_ui_constants.h"
 #include "components/net_log/net_log_file_writer.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
+#include "extensions/features/features.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
@@ -45,6 +49,29 @@
 
 namespace {
 
+class ProxyScriptFetcherContextGetter : public net::URLRequestContextGetter {
+ public:
+  explicit ProxyScriptFetcherContextGetter(IOThread* io_thread)
+      : io_thread_(io_thread) {}
+
+  net::URLRequestContext* GetURLRequestContext() override {
+    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+    DCHECK(io_thread_->globals()->proxy_script_fetcher_context.get());
+    return io_thread_->globals()->proxy_script_fetcher_context.get();
+  }
+
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override {
+    return BrowserThread::GetTaskRunnerForThread(BrowserThread::IO);
+  }
+
+ protected:
+  ~ProxyScriptFetcherContextGetter() override {}
+
+ private:
+  IOThread* const io_thread_;  // Owned by BrowserProcess.
+};
+
 // May only be accessed on the UI thread
 base::LazyInstance<base::FilePath>::Leaky
     last_save_dir = LAZY_INSTANCE_INITIALIZER;
@@ -98,6 +125,9 @@
   void OnNewState(const base::DictionaryValue& state) override;
 
  private:
+  using URLRequestContextGetterList =
+      std::vector<scoped_refptr<net::URLRequestContextGetter>>;
+
   // Send NetLog data via email.
   static void SendEmail(const base::FilePath& file_to_send);
 
@@ -121,6 +151,10 @@
   // NetLog file.
   void ShowSelectFileDialog(const base::FilePath& default_path);
 
+  // Returns a list of context getters used to retrieve ongoing events when
+  // logging starts so that net log entries can be added for those events.
+  URLRequestContextGetterList GetURLRequestContexts() const;
+
   // Cache of g_browser_process->net_log()->net_log_file_writer(). This
   // is owned by ChromeNetLog which is owned by BrowserProcessImpl.
   net_log::NetLogFileWriter* file_writer_;
@@ -202,7 +236,8 @@
       net_log::NetLogFileWriter::CaptureModeFromString(capture_mode_string);
 
   if (UsingMobileUI()) {
-    file_writer_->StartNetLog(base::FilePath(), capture_mode_);
+    file_writer_->StartNetLog(base::FilePath(), capture_mode_,
+                              GetURLRequestContexts());
   } else {
     base::FilePath initial_dir = last_save_dir.Pointer()->empty() ?
         DownloadPrefs::FromBrowserContext(
@@ -254,7 +289,7 @@
   select_file_dialog_ = nullptr;
   *last_save_dir.Pointer() = path.DirName();
 
-  file_writer_->StartNetLog(path, capture_mode_);
+  file_writer_->StartNetLog(path, capture_mode_, GetURLRequestContexts());
 }
 
 void NetExportMessageHandler::FileSelectionCanceled(void* params) {
@@ -322,6 +357,29 @@
       &file_type_info, 0, base::FilePath::StringType(), owning_window, nullptr);
 }
 
+NetExportMessageHandler::URLRequestContextGetterList
+NetExportMessageHandler::GetURLRequestContexts() const {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  URLRequestContextGetterList context_getters;
+
+  Profile* profile = Profile::FromWebUI(web_ui());
+
+  context_getters.push_back(profile->GetRequestContext());
+  context_getters.push_back(
+      content::BrowserContext::GetDefaultStoragePartition(profile)
+          ->GetMediaURLRequestContext());
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  context_getters.push_back(profile->GetRequestContextForExtensions());
+#endif
+  context_getters.push_back(
+      g_browser_process->io_thread()->system_url_request_context_getter());
+  context_getters.push_back(
+      new ProxyScriptFetcherContextGetter(g_browser_process->io_thread()));
+
+  return context_getters;
+}
+
 }  // namespace
 
 NetExportUI::NetExportUI(content::WebUI* web_ui) : WebUIController(web_ui) {

diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui_win.cc b/chrome/browser/ui/webui/set_as_default_browser_ui_win.cc
index 79de58f1..d0cecfb 100644
--- a/chrome/browser/ui/webui/set_as_default_browser_ui_win.cc
+++ b/chrome/browser/ui/webui/set_as_default_browser_ui_win.cc

@@ -74,7 +74,7 @@
                                   IDS_METRO_FLOW_DESCRIPTION);
   data_source->AddLocalizedString("flowNext", IDS_METRO_FLOW_SET_DEFAULT);
   data_source->AddLocalizedString("chromeLogoString",
-                                  IDS_METRO_FLOW_LOGO_STRING_ALT);
+                                  IDS_SHORT_PRODUCT_LOGO_ALT_TEXT);
   data_source->SetJsonPath("strings.js");
   data_source->AddResourcePath("set_as_default_browser.js",
                                IDR_SET_AS_DEFAULT_BROWSER_JS);

diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc
index cc421414..93e74d8 100644
--- a/chrome/browser/ui/webui/settings/downloads_handler.cc
+++ b/chrome/browser/ui/webui/settings/downloads_handler.cc

@@ -12,6 +12,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
+#include "content/public/browser/download_manager.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ -21,8 +22,7 @@
 
 namespace settings {
 
-DownloadsHandler::DownloadsHandler() {
-}
+DownloadsHandler::DownloadsHandler(Profile* profile) : profile_(profile) {}
 
 DownloadsHandler::~DownloadsHandler() {
   // There may be pending file dialogs, we need to tell them that we've gone
@@ -33,14 +33,44 @@
 
 void DownloadsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
+      "initializeDownloads",
+      base::Bind(&DownloadsHandler::HandleInitialize, base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
       "selectDownloadLocation",
       base::Bind(&DownloadsHandler::HandleSelectDownloadLocation,
                  base::Unretained(this)));
 }
 
+void DownloadsHandler::OnJavascriptAllowed() {
+  pref_registrar_.Init(profile_->GetPrefs());
+  pref_registrar_.Add(
+      prefs::kDownloadExtensionsToOpen,
+      base::Bind(&DownloadsHandler::SendAutoOpenDownloadsToJavascript,
+                 base::Unretained(this)));
+}
+
+void DownloadsHandler::OnJavascriptDisallowed() {
+  pref_registrar_.RemoveAll();
+}
+
+void DownloadsHandler::HandleInitialize(const base::ListValue* args) {
+  AllowJavascript();
+  SendAutoOpenDownloadsToJavascript();
+}
+
+void DownloadsHandler::SendAutoOpenDownloadsToJavascript() {
+  content::DownloadManager* manager =
+      content::BrowserContext::GetDownloadManager(profile_);
+  bool auto_open_downloads =
+      manager && DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed();
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("auto-open-downloads-changed"),
+                         base::FundamentalValue(auto_open_downloads));
+}
+
 void DownloadsHandler::HandleSelectDownloadLocation(
     const base::ListValue* args) {
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
+  PrefService* pref_service = profile_->GetPrefs();
   select_folder_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
   ui::SelectFileDialog::FileTypeInfo info;
@@ -57,7 +87,7 @@
                                     int index,
                                     void* params) {
   content::RecordAction(UserMetricsAction("Options_SetDownloadDirectory"));
-  PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
+  PrefService* pref_service = profile_->GetPrefs();
   pref_service->SetFilePath(prefs::kDownloadDefaultDirectory, path);
   pref_service->SetFilePath(prefs::kSaveFileDefaultDirectory, path);
 }

diff --git a/chrome/browser/ui/webui/settings/downloads_handler.h b/chrome/browser/ui/webui/settings/downloads_handler.h
index a5251d3..b8c1561 100644
--- a/chrome/browser/ui/webui/settings/downloads_handler.h
+++ b/chrome/browser/ui/webui/settings/downloads_handler.h

@@ -10,31 +10,47 @@
 
 #include "base/macros.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
+#include "components/prefs/pref_change_registrar.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
+class Profile;
+
 namespace settings {
 
 // Chrome "Downloads" settings page UI handler.
 class DownloadsHandler : public SettingsPageUIHandler,
                          public ui::SelectFileDialog::Listener {
  public:
-  DownloadsHandler();
+  explicit DownloadsHandler(Profile* profile);
   ~DownloadsHandler() override;
 
   // SettingsPageUIHandler implementation.
   void RegisterMessages() override;
-  void OnJavascriptAllowed() override {}
-  void OnJavascriptDisallowed() override {}
+  void OnJavascriptAllowed() override;
+  void OnJavascriptDisallowed() override;
 
  private:
+  friend class DownloadsHandlerTest;
+  FRIEND_TEST_ALL_PREFIXES(DownloadsHandlerTest, AutoOpenDownloads);
+
+  // Callback for the "initializeDownloads" message. This starts observers and
+  // retrieves the current browser state.
+  void HandleInitialize(const base::ListValue* args);
+
+  void SendAutoOpenDownloadsToJavascript();
+
+  // Callback for the "selectDownloadLocation" message. This will prompt the
+  // user for a destination folder using platform-specific APIs.
+  void HandleSelectDownloadLocation(const base::ListValue* args);
+
   // SelectFileDialog::Listener implementation.
   void FileSelected(const base::FilePath& path,
                     int index,
                     void* params) override;
 
-  // Callback for the "selectDownloadLocation" message. This will prompt the
-  // user for a destination folder using platform-specific APIs.
-  void HandleSelectDownloadLocation(const base::ListValue* args);
+  Profile* profile_;
+
+  PrefChangeRegistrar pref_registrar_;
 
   scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
 

diff --git a/chrome/browser/ui/webui/settings/downloads_handler_unittest.cc b/chrome/browser/ui/webui/settings/downloads_handler_unittest.cc
new file mode 100644
index 0000000..eb4b16d0
--- /dev/null
+++ b/chrome/browser/ui/webui/settings/downloads_handler_unittest.cc

@@ -0,0 +1,89 @@
+// Copyright 2017 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 "chrome/browser/ui/webui/settings/downloads_handler.h"
+
+#include "chrome/browser/download/chrome_download_manager_delegate.h"
+#include "chrome/browser/download/download_prefs.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/testing_profile.h"
+#include "components/prefs/pref_service.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/test/mock_download_manager.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_web_ui.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace settings {
+
+class DownloadsHandlerTest : public testing::Test {
+ public:
+  DownloadsHandlerTest()
+      : download_manager_(new content::MockDownloadManager()),
+        chrome_download_manager_delegate_(&profile_),
+        handler_(&profile_) {
+    content::BrowserContext::SetDownloadManagerForTesting(&profile_,
+                                                          download_manager_);
+    EXPECT_EQ(download_manager_,
+              content::BrowserContext::GetDownloadManager(&profile_));
+
+    EXPECT_CALL(*download_manager_, GetDelegate())
+        .WillRepeatedly(testing::Return(&chrome_download_manager_delegate_));
+    EXPECT_CALL(*download_manager_, Shutdown());
+
+    handler_.set_web_ui(&test_web_ui_);
+  }
+
+  void SetUp() override {
+    EXPECT_TRUE(test_web_ui_.call_data().empty());
+
+    base::ListValue args;
+    handler()->HandleInitialize(&args);
+
+    EXPECT_TRUE(handler()->IsJavascriptAllowed());
+    VerifyAutoOpenDownloadsChangedCallback();
+
+    test_web_ui_.ClearTrackedCalls();
+  }
+
+  void TearDown() override {
+    chrome_download_manager_delegate_.Shutdown();
+    testing::Test::TearDown();
+  }
+
+  void VerifyAutoOpenDownloadsChangedCallback() {
+    EXPECT_EQ(1u, test_web_ui_.call_data().size());
+
+    auto& data = *(test_web_ui_.call_data().back());
+    EXPECT_EQ("cr.webUIListenerCallback", data.function_name());
+    std::string event;
+    ASSERT_TRUE(data.arg1()->GetAsString(&event));
+    EXPECT_EQ("auto-open-downloads-changed", event);
+    bool auto_open_downloads = false;
+    ASSERT_TRUE(data.arg2()->GetAsBoolean(&auto_open_downloads));
+    EXPECT_FALSE(auto_open_downloads);
+  }
+
+  Profile* profile() { return &profile_; }
+  DownloadsHandler* handler() { return &handler_; }
+
+ private:
+  content::TestBrowserThreadBundle thread_bundle_;
+  content::TestWebUI test_web_ui_;
+  TestingProfile profile_;
+
+  // This is heap allocated because its ownership is transferred to |profile_|.
+  content::MockDownloadManager* download_manager_;
+  ChromeDownloadManagerDelegate chrome_download_manager_delegate_;
+
+  DownloadsHandler handler_;
+};
+
+TEST_F(DownloadsHandlerTest, AutoOpenDownloads) {
+  // Touch the pref.
+  profile()->GetPrefs()->SetString(prefs::kDownloadExtensionsToOpen, "");
+  VerifyAutoOpenDownloadsChangedCallback();
+}
+
+}  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 5c3eab32..88caad3 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -191,6 +191,7 @@
 
 void AddAboutStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
+    {"aboutProductLogoAlt", IDS_SHORT_PRODUCT_LOGO_ALT_TEXT},
     {"aboutPageTitle", IDS_SETTINGS_ABOUT_PROGRAM},
 #if defined(OS_CHROMEOS)
     {"aboutProductTitle", IDS_PRODUCT_OS_NAME},

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
index 1d05b1e..34cc36c 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -93,7 +93,7 @@
   AddSettingsPageUIHandler(base::MakeUnique<BrowserLifetimeHandler>());
   AddSettingsPageUIHandler(base::MakeUnique<ClearBrowsingDataHandler>(web_ui));
   AddSettingsPageUIHandler(base::MakeUnique<CookiesViewHandler>());
-  AddSettingsPageUIHandler(base::MakeUnique<DownloadsHandler>());
+  AddSettingsPageUIHandler(base::MakeUnique<DownloadsHandler>(profile));
   AddSettingsPageUIHandler(base::MakeUnique<ExtensionControlHandler>());
   AddSettingsPageUIHandler(base::MakeUnique<FontHandler>(web_ui));
   AddSettingsPageUIHandler(base::MakeUnique<ImportDataHandler>());

diff --git a/chrome/browser/ui/webui/signin/OWNERS b/chrome/browser/ui/webui/signin/OWNERS
index 4344a30..af356eca 100644
--- a/chrome/browser/ui/webui/signin/OWNERS
+++ b/chrome/browser/ui/webui/signin/OWNERS

@@ -3,3 +3,5 @@
 msarda@chromium.org
 rogerta@chromium.org
 xiyuan@chromium.org
+
+# COMPONENT: Services>SignIn

diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 1d85b7d..2f628dd 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc

@@ -13,9 +13,7 @@
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/files/file_path.h"
 #include "base/memory/singleton.h"
-#include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -117,21 +115,7 @@
   *is_unstable_channel = IsUnstableChannel();
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_task);
 }
-#else
-// Return true if the currently running Chrome is a system install.
-bool IsSystemInstall() {
-  // Get the version of the currently *installed* instance of Chrome,
-  // which might be newer than the *running* instance if we have been
-  // upgraded in the background.
-  base::FilePath exe_path;
-  if (!PathService::Get(base::DIR_EXE, &exe_path)) {
-    NOTREACHED() << "Failed to find executable path";
-    return false;
-  }
-
-  return !InstallUtil::IsPerUserInstall(exe_path);
-}
-
+#else  // !defined(OS_WIN)
 #if defined(GOOGLE_CHROME_BUILD)
 // Sets |is_unstable_channel| to true if the current chrome is on the dev or
 // canary channels. Sets |is_auto_update_enabled| to true if Google Update will
@@ -163,7 +147,7 @@
   // Get the version of the currently *installed* instance of Chrome,
   // which might be newer than the *running* instance if we have been
   // upgraded in the background.
-  bool system_install = IsSystemInstall();
+  bool system_install = !InstallUtil::IsPerUserInstall();
 
   // TODO(tommi): Check if using the default distribution is always the right
   // thing to do.

diff --git a/chrome/browser/win/OWNERS b/chrome/browser/win/OWNERS
index b9252b85..2621204 100644
--- a/chrome/browser/win/OWNERS
+++ b/chrome/browser/win/OWNERS

@@ -7,4 +7,6 @@
 per-file chrome_elf_init*=csharp@chromium.org
 per-file chrome_elf_init*=robertshield@chromium.org
 
-per-file enumerate_modules_model*=finnur@chromium.org
\ No newline at end of file
+per-file enumerate_modules_model*=finnur@chromium.org
+
+# COMPONENT: Internals>Core

diff --git a/chrome/browser/win/app_icon.cc b/chrome/browser/win/app_icon.cc
index 3da44d4..ab3d600 100644
--- a/chrome/browser/win/app_icon.cc
+++ b/chrome/browser/win/app_icon.cc

@@ -4,27 +4,18 @@
 
 #include "chrome/browser/win/app_icon.h"
 
-#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/install_static/install_details.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/image/image_family.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/installer/util/install_util.h"
-#endif
-
 namespace {
 
 // Returns the resource id of the application icon.
 int GetAppIconResourceId() {
-  int icon_id = IDR_MAINFRAME;
-#if defined(GOOGLE_CHROME_BUILD)
-  if (InstallUtil::IsChromeSxSProcess())
-    icon_id = IDR_SXS;
-#endif
-  return icon_id;
+  return install_static::InstallDetails::Get().app_icon_resource_id();
 }
 
 }  // namespace

diff --git a/chrome/browser/win/enumerate_modules_model.cc b/chrome/browser/win/enumerate_modules_model.cc
index 47eae22..58c45b6 100644
--- a/chrome/browser/win/enumerate_modules_model.cc
+++ b/chrome/browser/win/enumerate_modules_model.cc

@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <set>
+#include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -457,10 +458,10 @@
   size_t third_party_loaded = 0;
   size_t third_party_not_loaded = 0;
   for (const auto& module : *enumerated_modules_) {
-    if (module.cert_info.type != ModuleDatabase::NO_CERTIFICATE) {
+    if (module.cert_info.type != CertificateType::NO_CERTIFICATE) {
       ++signed_modules;
 
-      if (module.cert_info.type == ModuleDatabase::CERTIFICATE_IN_CATALOG)
+      if (module.cert_info.type == CertificateType::CERTIFICATE_IN_CATALOG)
         ++catalog_modules;
 
       // The first time this certificate is encountered it will be inserted

diff --git a/chrome/browser/win/enumerate_modules_model.h b/chrome/browser/win/enumerate_modules_model.h
index 7eb192f..ef81189f 100644
--- a/chrome/browser/win/enumerate_modules_model.h
+++ b/chrome/browser/win/enumerate_modules_model.h

@@ -68,12 +68,6 @@
     NOTIFY_USER   = 1 << 5,
   };
 
-  // Which Windows OS is affected.
-  enum OperatingSystem {
-    ALL          = -1,
-    XP           = 1 << 0,
-  };
-
   // The structure we populate when enumerating modules.
   struct Module {
     Module();
@@ -108,7 +102,7 @@
     // The duplicate count within each category of modules.
     int duplicate_count;
     // The certificate info for the module.
-    ModuleDatabase::CertificateInfo cert_info;
+    CertificateInfo cert_info;
   };
 
   // A vector typedef of all modules enumerated.
@@ -258,7 +252,7 @@
     ACTION_BUBBLE_SHOWN = 0,
     ACTION_BUBBLE_LEARN_MORE,
     ACTION_MENU_LEARN_MORE,
-    ACTION_BOUNDARY, // Must be the last value.
+    ACTION_BOUNDARY,  // Must be the last value.
   };
 
   // Observer class used to determine when a scan has completed and when any

diff --git a/chrome/common/cloud_print/OWNERS b/chrome/common/cloud_print/OWNERS
index adb99ff8..3a21c291 100644
--- a/chrome/common/cloud_print/OWNERS
+++ b/chrome/common/cloud_print/OWNERS

@@ -1,3 +1,5 @@
 gene@chromium.org
 scottbyer@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/common/conflicts/OWNERS b/chrome/common/conflicts/OWNERS
index 22edb2c..ba30206 100644
--- a/chrome/common/conflicts/OWNERS
+++ b/chrome/common/conflicts/OWNERS

@@ -3,3 +3,5 @@
 
 chrisha@chromium.org
 pmonette@chromium.org
+
+# COMPONENT: Internals>Core

diff --git a/chrome/install_static/BUILD.gn b/chrome/install_static/BUILD.gn
index 4f57be6..adac948 100644
--- a/chrome/install_static/BUILD.gn
+++ b/chrome/install_static/BUILD.gn

@@ -19,6 +19,7 @@
   ]
 
   sources = [
+    "../app/chrome_dll_resource.h",
     "install_constants.h",
     "install_details.cc",
     "install_details.h",

diff --git a/chrome/install_static/DEPS b/chrome/install_static/DEPS
index 5d5beb27..2f4082e 100644
--- a/chrome/install_static/DEPS
+++ b/chrome/install_static/DEPS

@@ -3,6 +3,8 @@
   "-base",
   # Nothing from chrome.
   "-chrome",
+  # For the app icon resource indices.
+  "+chrome/app/chrome_dll_resource.h",
   # Anything from this dir.
   "+chrome/install_static",
   # All registry access should go through nt_registry.

diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_static/chromium_install_modes.cc
index bb7b6757..87700b3f 100644
--- a/chrome/install_static/chromium_install_modes.cc
+++ b/chrome/install_static/chromium_install_modes.cc

@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 
+#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/install_static/install_modes.h"
 
 namespace install_static {
@@ -35,6 +36,7 @@
         ChannelStrategy::UNSUPPORTED,
         true,  // Supports system-level installs.
         true,  // Supported multi-install.
+        IDR_MAINFRAME,
     },
     // clang-format on
 };

diff --git a/chrome/install_static/google_chrome_install_modes.cc b/chrome/install_static/google_chrome_install_modes.cc
index 150fd2a8..833a670 100644
--- a/chrome/install_static/google_chrome_install_modes.cc
+++ b/chrome/install_static/google_chrome_install_modes.cc

@@ -6,6 +6,7 @@
 
 #include <stdlib.h>
 
+#include "chrome/app/chrome_dll_resource.h"
 #include "chrome/install_static/install_modes.h"
 
 namespace install_static {
@@ -35,6 +36,7 @@
         ChannelStrategy::ADDITIONAL_PARAMETERS,
         true,  // Supports system-level installs.
         true,  // Supported multi-install.
+        IDR_MAINFRAME,
     },
     // A secondary install mode for Google Chrome SxS (canary).
     {
@@ -48,6 +50,7 @@
         ChannelStrategy::FIXED,
         false,  // Does not support system-level installs.
         false,  // Did not support multi-install.
+        IDR_SXS,
     },
     // clang-format on
 };

diff --git a/chrome/install_static/install_constants.h b/chrome/install_static/install_constants.h
index 4d9564d..802bf0c5 100644
--- a/chrome/install_static/install_constants.h
+++ b/chrome/install_static/install_constants.h

@@ -9,6 +9,8 @@
 #ifndef CHROME_INSTALL_STATIC_INSTALL_CONSTANTS_H_
 #define CHROME_INSTALL_STATIC_INSTALL_CONSTANTS_H_
 
+#include <stdint.h>
+
 namespace install_static {
 
 // Identifies different strategies for determining an update channel.
@@ -69,6 +71,9 @@
 
   // True if this mode supported the now-deprecated multi-install.
   bool supported_multi_install;
+
+  // The resource id of this mode's main application icon.
+  int16_t app_icon_resource_id;
 };
 
 }  // namespace install_static

diff --git a/chrome/install_static/install_details.h b/chrome/install_static/install_details.h
index c712bf0..c434804d 100644
--- a/chrome/install_static/install_details.h
+++ b/chrome/install_static/install_details.h

@@ -69,6 +69,9 @@
   // than one of its secondary modes (e.g., canary Chrome).
   bool is_primary_mode() const { return install_mode_index() == 0; }
 
+  // Returns the installer command-line switch that selects the current mode.
+  const char* install_switch() const { return payload_->mode->install_switch; }
+
   // The mode's install suffix (e.g., " SxS" for canary Chrome), or an empty
   // string for a brand's primary install mode.
   const wchar_t* install_suffix() const {
@@ -104,6 +107,11 @@
     return payload_->mode->supported_multi_install;
   }
 
+  // Returns the resource id of this mode's main application icon.
+  int32_t app_icon_resource_id() const {
+    return payload_->mode->app_icon_resource_id;
+  }
+
   // The install's update channel, or an empty string if the brand does not
   // integrate with Google Update.
   std::wstring channel() const {

diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 96fa9f9..a8666514 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include

@@ -166,11 +166,13 @@
       echo Widevine signing "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}"
       ${BUILDDIR}/installer/widevine/signature_generator.py \
         --input_file "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}" \
-        --output_file "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}.sig"
+        --output_file "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}.sig" \
+        --flags 1
       echo Widevine signing "${STAGEDIR}/${INSTALLDIR}/libwidevinecdmadapter.so"
       ${BUILDDIR}/installer/widevine/signature_generator.py \
         --input_file "${STAGEDIR}/${INSTALLDIR}/libwidevinecdmadapter.so" \
-        --output_file "${STAGEDIR}/${INSTALLDIR}/libwidevinecdmadapter.so.sig"
+        --output_file "${STAGEDIR}/${INSTALLDIR}/libwidevinecdmadapter.so.sig" \
+        --flags 0
       # Widevine signature file already exists for libwidevinecdm.so.
       cp "${BUILDDIR}/libwidevinecdm.so.sig" "${STAGEDIR}/${INSTALLDIR}/"
     fi

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index a4068bb..e1e121a 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc

@@ -579,7 +579,7 @@
 void LaunchDeleteOldVersionsProcess(const base::FilePath& setup_path,
                                     const InstallerState& installer_state) {
   base::CommandLine command_line(setup_path);
-  installer_state.product().AppendProductFlags(&command_line);
+  InstallUtil::AppendModeSwitch(&command_line);
   command_line.AppendSwitch(switches::kDeleteOldVersions);
 
   if (installer_state.system_install())

diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 6db12ca2..0b1432c1 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc

@@ -600,14 +600,6 @@
         installer_state.GetInstallerDirectory(new_version).Append(
             setup_path.BaseName()));
 
-    base::CommandLine rename(installer_path);
-    rename.AppendSwitch(switches::kRenameChromeExe);
-    if (installer_state.system_install())
-      rename.AppendSwitch(switches::kSystemLevel);
-
-    if (installer_state.verbose_logging())
-      rename.AppendSwitch(switches::kVerboseLogging);
-
     BrowserDistribution* dist = installer_state.product().distribution();
     const base::string16 version_key(dist->GetVersionKey());
 
@@ -628,10 +620,14 @@
           google_update::kRegCriticalVersionField);
     }
 
-    // Append the distribution-specific flags to the command line (e.g.,
-    // "--chrome-sxs" for SxS/canary).
-    base::CommandLine product_rename_cmd(rename);
-    installer_state.product().AppendRenameFlags(&product_rename_cmd);
+    // Form the mode-specific rename command.
+    base::CommandLine product_rename_cmd(installer_path);
+    product_rename_cmd.AppendSwitch(switches::kRenameChromeExe);
+    if (installer_state.system_install())
+      product_rename_cmd.AppendSwitch(switches::kSystemLevel);
+    if (installer_state.verbose_logging())
+      product_rename_cmd.AppendSwitch(switches::kVerboseLogging);
+    InstallUtil::AppendModeSwitch(&product_rename_cmd);
     in_use_update_work_items->AddSetRegValueWorkItem(
         root, version_key, KEY_WOW64_32KEY, google_update::kRegRenameCmdField,
         product_rename_cmd.GetCommandLineString(), true);
@@ -826,7 +822,7 @@
   cmd.AppendSwitch(installer::switches::kConfigureUserSettings);
   cmd.AppendSwitch(installer::switches::kVerboseLogging);
   cmd.AppendSwitch(installer::switches::kSystemLevel);
-  product.AppendProductFlags(&cmd);
+  InstallUtil::AppendModeSwitch(&cmd);
   list->AddSetRegValueWorkItem(root,
                                active_setup_path,
                                WorkItem::kWow64Default,
@@ -861,8 +857,7 @@
 
   uninstall_cmd->AppendSwitch(installer::switches::kUninstall);
 
-  // Append the product-specific uninstall flags.
-  product.AppendProductFlags(uninstall_cmd);
+  InstallUtil::AppendModeSwitch(uninstall_cmd);
   if (installer_state.is_msi())
     uninstall_cmd->AppendSwitch(installer::switches::kMsi);
   if (installer_state.system_install())
@@ -891,8 +886,7 @@
             .Append(setup_path.BaseName()));
     // Add the main option to indicate OS upgrade flow.
     cmd_line.AppendSwitch(installer::switches::kOnOsUpgrade);
-    // Add product-specific options.
-    product.AppendProductFlags(&cmd_line);
+    InstallUtil::AppendModeSwitch(&cmd_line);
     if (installer_state.system_install())
       cmd_line.AppendSwitch(installer::switches::kSystemLevel);
     // Log everything for now.

diff --git a/chrome/installer/setup/installer_crash_reporter_client.cc b/chrome/installer/setup/installer_crash_reporter_client.cc
index 4d97e50..cb1a758 100644
--- a/chrome/installer/setup/installer_crash_reporter_client.cc
+++ b/chrome/installer/setup/installer_crash_reporter_client.cc

@@ -77,14 +77,11 @@
   return false;
 }
 
-bool InstallerCrashReporterClient::GetIsPerUserInstall(
-    const base::string16& exe_path) {
+bool InstallerCrashReporterClient::GetIsPerUserInstall() {
   return is_per_user_install_;
 }
 
-bool InstallerCrashReporterClient::GetShouldDumpLargerDumps(
-    bool is_per_user_install) {
-  DCHECK_EQ(is_per_user_install_, is_per_user_install);
+bool InstallerCrashReporterClient::GetShouldDumpLargerDumps() {
   // Use large dumps for all but the stable channel.
   return !install_static::GetChromeChannelName().empty();
 }

diff --git a/chrome/installer/setup/installer_crash_reporter_client.h b/chrome/installer/setup/installer_crash_reporter_client.h
index 74f8048..320b5e3 100644
--- a/chrome/installer/setup/installer_crash_reporter_client.h
+++ b/chrome/installer/setup/installer_crash_reporter_client.h

@@ -29,8 +29,8 @@
                                bool* is_rtl_locale) override;
   bool AboutToRestart() override;
   bool GetDeferredUploadsSupported(bool is_per_user_install) override;
-  bool GetIsPerUserInstall(const base::string16& exe_path) override;
-  bool GetShouldDumpLargerDumps(bool is_per_user_install) override;
+  bool GetIsPerUserInstall() override;
+  bool GetShouldDumpLargerDumps() override;
   int GetResultCodeRespawnFailed() override;
   bool GetCrashDumpLocation(base::string16* crash_dir) override;
   size_t RegisterCrashKeys() override;

diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn
index c09fc936..005ea051 100644
--- a/chrome/installer/util/BUILD.gn
+++ b/chrome/installer/util/BUILD.gn

@@ -55,8 +55,6 @@
     sources = [
       "chrome_browser_operations.cc",
       "chrome_browser_operations.h",
-      "chrome_browser_sxs_operations.cc",
-      "chrome_browser_sxs_operations.h",
       "compat_checks.cc",
       "compat_checks.h",
       "delete_after_reboot_helper.cc",

diff --git a/chrome/installer/util/beacons.cc b/chrome/installer/util/beacons.cc
index 752736cb..7e0925d 100644
--- a/chrome/installer/util/beacons.cc
+++ b/chrome/installer/util/beacons.cc

@@ -21,10 +21,9 @@
 }
 
 void UpdateDefaultBrowserBeaconWithState(
-    const base::FilePath& chrome_exe,
     BrowserDistribution* distribution,
     ShellUtil::DefaultState default_state) {
-  const bool system_install = !InstallUtil::IsPerUserInstall(chrome_exe);
+  const bool system_install = !InstallUtil::IsPerUserInstall();
   const AppRegistrationData& registration_data =
       distribution->GetAppRegistrationData();
   switch (default_state) {

diff --git a/chrome/installer/util/beacons.h b/chrome/installer/util/beacons.h
index e1bdaa68..2a49ec1 100644
--- a/chrome/installer/util/beacons.h
+++ b/chrome/installer/util/beacons.h

@@ -28,8 +28,7 @@
 
 // Updates the last was default or first not default beacon for the current user
 // based on |default_state|.
-void UpdateDefaultBrowserBeaconWithState(const base::FilePath& chrome_exe,
-                                         BrowserDistribution* distribution,
+void UpdateDefaultBrowserBeaconWithState(BrowserDistribution* distribution,
                                          ShellUtil::DefaultState default_state);
 
 // Updates the last OS upgrade beacon for the install.

diff --git a/chrome/installer/util/beacons_unittest.cc b/chrome/installer/util/beacons_unittest.cc
index 185b3e15..77d76cc 100644
--- a/chrome/installer/util/beacons_unittest.cc
+++ b/chrome/installer/util/beacons_unittest.cc

@@ -8,8 +8,6 @@
 #include <tuple>
 
 #include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
-#include "base/path_service.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
@@ -164,8 +162,6 @@
     scoped_install_details_ =
         base::MakeUnique<install_static::ScopedInstallDetails>(system_install_,
                                                                mode_index);
-    chrome_exe_ = GetChromePath();
-
     // Override the registry so that tests can freely push state to it.
     ASSERT_NO_FATAL_FAILURE(
         registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER));
@@ -173,38 +169,15 @@
         registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE));
 
     // Ensure that IsPerUserInstall returns the proper value.
-    ASSERT_EQ(!system_install_, InstallUtil::IsPerUserInstall(chrome_exe_));
+    ASSERT_EQ(!system_install_, InstallUtil::IsPerUserInstall());
 
     distribution_ = BrowserDistribution::GetDistribution();
   }
 
   bool system_install_ = false;
-  base::FilePath chrome_exe_;
   BrowserDistribution* distribution_ = nullptr;
 
  private:
-  base::FilePath GetChromePath() const {
-    base::FilePath chrome_exe;
-    int dir_key = base::DIR_LOCAL_APP_DATA;
-
-    if (system_install_) {
-#if defined(_WIN64)
-      static const int kSystemKey = base::DIR_PROGRAM_FILESX86;
-#else
-      static const int kSystemKey = base::DIR_PROGRAM_FILES;
-#endif
-      dir_key = kSystemKey;
-    }
-    PathService::Get(dir_key, &chrome_exe);
-    if (*install_static::kCompanyPathName)
-      chrome_exe = chrome_exe.Append(install_static::kCompanyPathName);
-    chrome_exe = chrome_exe.Append(
-        base::string16(install_static::kProductPathName)
-            .append(install_static::InstallDetails::Get().install_suffix()));
-    chrome_exe = chrome_exe.Append(installer::kInstallBinaryDir);
-    return chrome_exe.Append(installer::kChromeExe);
-  }
-
   std::unique_ptr<install_static::ScopedInstallDetails> scoped_install_details_;
   registry_util::RegistryOverrideManager registry_override_manager_;
 };
@@ -220,32 +193,27 @@
   ASSERT_TRUE(first_not_default->Get().is_null());
 
   // Chrome is not default.
-  UpdateDefaultBrowserBeaconWithState(chrome_exe_, distribution_,
-                                      ShellUtil::NOT_DEFAULT);
+  UpdateDefaultBrowserBeaconWithState(distribution_, ShellUtil::NOT_DEFAULT);
   ASSERT_TRUE(last_was_default->Get().is_null());
   ASSERT_FALSE(first_not_default->Get().is_null());
 
   // Then it is.
-  UpdateDefaultBrowserBeaconWithState(chrome_exe_, distribution_,
-                                      ShellUtil::IS_DEFAULT);
+  UpdateDefaultBrowserBeaconWithState(distribution_, ShellUtil::IS_DEFAULT);
   ASSERT_FALSE(last_was_default->Get().is_null());
   ASSERT_TRUE(first_not_default->Get().is_null());
 
   // It still is.
-  UpdateDefaultBrowserBeaconWithState(chrome_exe_, distribution_,
-                                      ShellUtil::IS_DEFAULT);
+  UpdateDefaultBrowserBeaconWithState(distribution_, ShellUtil::IS_DEFAULT);
   ASSERT_FALSE(last_was_default->Get().is_null());
   ASSERT_TRUE(first_not_default->Get().is_null());
 
   // Now it's not again.
-  UpdateDefaultBrowserBeaconWithState(chrome_exe_, distribution_,
-                                      ShellUtil::NOT_DEFAULT);
+  UpdateDefaultBrowserBeaconWithState(distribution_, ShellUtil::NOT_DEFAULT);
   ASSERT_FALSE(last_was_default->Get().is_null());
   ASSERT_FALSE(first_not_default->Get().is_null());
 
   // And it still isn't.
-  UpdateDefaultBrowserBeaconWithState(chrome_exe_, distribution_,
-                                      ShellUtil::NOT_DEFAULT);
+  UpdateDefaultBrowserBeaconWithState(distribution_, ShellUtil::NOT_DEFAULT);
   ASSERT_FALSE(last_was_default->Get().is_null());
   ASSERT_FALSE(first_not_default->Get().is_null());
 }

diff --git a/chrome/installer/util/chrome_browser_operations.cc b/chrome/installer/util/chrome_browser_operations.cc
index a9ed6cb..44bd2ec 100644
--- a/chrome/installer/util/chrome_browser_operations.cc
+++ b/chrome/installer/util/chrome_browser_operations.cc

@@ -5,7 +5,6 @@
 #include "chrome/installer/util/chrome_browser_operations.h"
 
 #include "base/command_line.h"
-#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/install_util.h"
@@ -18,15 +17,7 @@
 void ChromeBrowserOperations::AddKeyFiles(
     std::vector<base::FilePath>* key_files) const {
   DCHECK(key_files);
-  key_files->push_back(base::FilePath(installer::kChromeDll));
-}
-
-void ChromeBrowserOperations::AppendProductFlags(
-    base::CommandLine* cmd_line) const {
-}
-
-void ChromeBrowserOperations::AppendRenameFlags(
-    base::CommandLine* cmd_line) const {
+  key_files->push_back(base::FilePath(kChromeDll));
 }
 
 // Modifies a ShortcutProperties object by adding default values to
@@ -47,8 +38,8 @@
     properties->set_icon(target_exe, dist->GetIconIndex());
 
   if (!properties->has_app_id()) {
-    properties->set_app_id(ShellUtil::GetBrowserModelId(
-        dist, InstallUtil::IsPerUserInstall(target_exe)));
+    properties->set_app_id(
+        ShellUtil::GetBrowserModelId(dist, InstallUtil::IsPerUserInstall()));
   }
 
   if (!properties->has_description())
@@ -60,8 +51,8 @@
     InstallStatus status,
     bool system_level) const {
   base::CommandLine base_command(setup_path);
-  AppendProductFlags(&base_command);
-  installer::LaunchBrowserUserExperiment(base_command, status, system_level);
+  InstallUtil::AppendModeSwitch(&base_command);
+  LaunchBrowserUserExperiment(base_command, status, system_level);
 }
 
 }  // namespace installer

diff --git a/chrome/installer/util/chrome_browser_operations.h b/chrome/installer/util/chrome_browser_operations.h
index ecdb837..af6c6413 100644
--- a/chrome/installer/util/chrome_browser_operations.h
+++ b/chrome/installer/util/chrome_browser_operations.h

@@ -17,10 +17,6 @@
 
   void AddKeyFiles(std::vector<base::FilePath>* key_files) const override;
 
-  void AppendProductFlags(base::CommandLine* cmd_line) const override;
-
-  void AppendRenameFlags(base::CommandLine* cmd_line) const override;
-
   void AddDefaultShortcutProperties(
       BrowserDistribution* dist,
       const base::FilePath& target_exe,

diff --git a/chrome/installer/util/chrome_browser_sxs_operations.cc b/chrome/installer/util/chrome_browser_sxs_operations.cc
deleted file mode 100644
index d3a5250..0000000
--- a/chrome/installer/util/chrome_browser_sxs_operations.cc
+++ /dev/null

@@ -1,29 +0,0 @@
-// Copyright (c) 2012 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 "chrome/installer/util/chrome_browser_sxs_operations.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "chrome/installer/util/util_constants.h"
-
-namespace installer {
-
-void ChromeBrowserSxSOperations::AppendProductFlags(
-    base::CommandLine* cmd_line) const {
-  DCHECK(cmd_line);
-
-  cmd_line->AppendSwitch(switches::kChromeSxS);
-  ChromeBrowserOperations::AppendProductFlags(cmd_line);
-}
-
-void ChromeBrowserSxSOperations::AppendRenameFlags(
-    base::CommandLine* cmd_line) const {
-  DCHECK(cmd_line);
-
-  cmd_line->AppendSwitch(switches::kChromeSxS);
-  ChromeBrowserOperations::AppendRenameFlags(cmd_line);
-}
-
-}  // namespace installer

diff --git a/chrome/installer/util/chrome_browser_sxs_operations.h b/chrome/installer/util/chrome_browser_sxs_operations.h
deleted file mode 100644
index 3f9e43eb..0000000
--- a/chrome/installer/util/chrome_browser_sxs_operations.h
+++ /dev/null

@@ -1,28 +0,0 @@
-// Copyright (c) 2012 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 CHROME_INSTALLER_UTIL_CHROME_BROWSER_SXS_OPERATIONS_H_
-#define CHROME_INSTALLER_UTIL_CHROME_BROWSER_SXS_OPERATIONS_H_
-
-#include "base/macros.h"
-#include "chrome/installer/util/chrome_browser_operations.h"
-
-namespace installer {
-
-// Operations specific to Chrome SxS; see ProductOperations for general info.
-class ChromeBrowserSxSOperations : public ChromeBrowserOperations {
- public:
-  ChromeBrowserSxSOperations() {}
-
-  void AppendProductFlags(base::CommandLine* cmd_line) const override;
-
-  void AppendRenameFlags(base::CommandLine* cmd_line) const override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserSxSOperations);
-};
-
-}  // namespace installer
-
-#endif  // CHROME_INSTALLER_UTIL_CHROME_BROWSER_SXS_OPERATIONS_H_

diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index 5bef0952..ec04bcf 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc

@@ -188,10 +188,9 @@
 
 }  // namespace
 
+// TODO(grt): Remove this now that it has no added value.
 bool GoogleUpdateSettings::IsSystemInstall() {
-  // TODO(grt): Remove this unused argument.
-  base::FilePath unused;
-  return !InstallUtil::IsPerUserInstall(unused);
+  return !InstallUtil::IsPerUserInstall();
 }
 
 bool GoogleUpdateSettings::GetCollectStatsConsent() {

diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 328327d..95eb1e3 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc

@@ -8,7 +8,6 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/strings/string16.h"
@@ -16,7 +15,6 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
-#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
@@ -146,13 +144,8 @@
 }
 
 void ElevateIfNeededToReenableUpdates() {
-  base::FilePath chrome_exe;
-  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
-    NOTREACHED();
-    return;
-  }
   installer::ProductState product_state;
-  const bool system_install = !InstallUtil::IsPerUserInstall(chrome_exe);
+  const bool system_install = !InstallUtil::IsPerUserInstall();
   if (!product_state.Initialize(system_install))
     return;
   base::FilePath exe_path(product_state.GetSetupPath());
@@ -163,8 +156,7 @@
 
   base::CommandLine cmd(exe_path);
   cmd.AppendSwitch(installer::switches::kReenableAutoupdates);
-  installer::Product product(BrowserDistribution::GetDistribution());
-  product.AppendProductFlags(&cmd);
+  InstallUtil::AppendModeSwitch(&cmd);
   if (system_install)
     cmd.AppendSwitch(installer::switches::kSystemLevel);
   if (product_state.uninstall_command().HasSwitch(

diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 277102c..a1446fa 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc

@@ -271,7 +271,7 @@
   }
 }
 
-bool InstallUtil::IsPerUserInstall(const base::FilePath& /* exe_path */) {
+bool InstallUtil::IsPerUserInstall() {
   return !install_static::InstallDetails::Get().system_level();
 }
 
@@ -427,6 +427,13 @@
       base::CommandLine::FromString(L"\"" + program + L"\" " + arguments);
 }
 
+void InstallUtil::AppendModeSwitch(base::CommandLine* command_line) {
+  const install_static::InstallDetails& install_details =
+      install_static::InstallDetails::Get();
+  if (*install_details.install_switch())
+    command_line->AppendSwitch(install_details.install_switch());
+}
+
 // static
 base::string16 InstallUtil::GetCurrentDate() {
   static const wchar_t kDateFormat[] = L"yyyyMMdd";

diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index 3a586a6..1ce2356 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h

@@ -86,9 +86,9 @@
   // Returns true if this installation path is per user, otherwise returns false
   // (per machine install, meaning: the exe_path contains the path to Program
   // Files).
-  // TODO(grt): remove |exe_path| and consider replacing all callers with
-  // direct use of InstallDetails.
-  static bool IsPerUserInstall(const base::FilePath& exe_path);
+  // TODO(grt): consider replacing all callers with direct use of
+  // InstallDetails.
+  static bool IsPerUserInstall();
 
   // Returns true if this is running setup process for Chrome SxS (as
   // indicated by the presence of --chrome-sxs on the command line) or if this
@@ -170,6 +170,10 @@
                                  const base::string16& arguments,
                                  base::CommandLine* command_line);
 
+  // Appends the installer switch that selects the current install mode (see
+  // install_static::InstallDetails).
+  static void AppendModeSwitch(base::CommandLine* command_line);
+
   // Returns a string in the form YYYYMMDD of the current date.
   static base::string16 GetCurrentDate();
 

diff --git a/chrome/installer/util/product.cc b/chrome/installer/util/product.cc
index 6d6c55c..2bf4d32 100644
--- a/chrome/installer/util/product.cc
+++ b/chrome/installer/util/product.cc

@@ -8,11 +8,11 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/process/launch.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/chrome_browser_operations.h"
-#include "chrome/installer/util/chrome_browser_sxs_operations.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/product_operations.h"
@@ -23,9 +23,7 @@
 
 Product::Product(BrowserDistribution* distribution)
     : distribution_(distribution),
-      operations_(InstallUtil::IsChromeSxSProcess()
-                      ? new ChromeBrowserSxSOperations()
-                      : new ChromeBrowserOperations()) {}
+      operations_(base::MakeUnique<ChromeBrowserOperations>()) {}
 
 Product::~Product() {
 }
@@ -103,14 +101,6 @@
   operations_->AddKeyFiles(key_files);
 }
 
-void Product::AppendProductFlags(base::CommandLine* command_line) const {
-  operations_->AppendProductFlags(command_line);
-}
-
-void Product::AppendRenameFlags(base::CommandLine* command_line) const {
-  operations_->AppendRenameFlags(command_line);
-}
-
 void Product::AddDefaultShortcutProperties(
     const base::FilePath& target_exe,
     ShellUtil::ShortcutProperties* properties) const {

diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h
index 231c0bbc..bed2fc1 100644
--- a/chrome/installer/util/product.h
+++ b/chrome/installer/util/product.h

@@ -65,12 +65,6 @@
   // See ProductOperations::AddKeyFiles.
   void AddKeyFiles(std::vector<base::FilePath>* key_files) const;
 
-  // See ProductOperations::AppendProductFlags.
-  void AppendProductFlags(base::CommandLine* command_line) const;
-
-  // See ProductOperations::AppendRenameFlags.
-  void AppendRenameFlags(base::CommandLine* command_line) const;
-
   // See ProductOperations::AddDefaultShortcutProperties.
   void AddDefaultShortcutProperties(
       const base::FilePath& target_exe,

diff --git a/chrome/installer/util/product_operations.h b/chrome/installer/util/product_operations.h
index bd9555f..c3616e9 100644
--- a/chrome/installer/util/product_operations.h
+++ b/chrome/installer/util/product_operations.h

@@ -13,10 +13,6 @@
 
 class BrowserDistribution;
 
-namespace base {
-class CommandLine;
-}
-
 namespace installer {
 
 
@@ -36,14 +32,6 @@
   // name(s).
   virtual void AddKeyFiles(std::vector<base::FilePath>* key_files) const = 0;
 
-  // Given a command line, appends the set of product-specific flags. These are
-  // required for product-specific uninstall commands, but are of use for any
-  // invocation of setup.exe for the product.
-  virtual void AppendProductFlags(base::CommandLine* cmd_line) const = 0;
-
-  // Given a command line, appends the set of product-specific rename flags.
-  virtual void AppendRenameFlags(base::CommandLine* cmd_line) const = 0;
-
   // Modifies a ShellUtil::ShortcutProperties object by assigning default values
   // to unintialized members.
   virtual void AddDefaultShortcutProperties(

diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index f2bd698..e6023f9 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc

@@ -360,8 +360,8 @@
   app_info.command_line = ShellUtil::GetChromeShellOpenCmd(chrome_exe);
   // For user-level installs: entries for the app id will be in HKCU; thus we
   // do not need a suffix on those entries.
-  app_info.app_id = ShellUtil::GetBrowserModelId(
-      dist, InstallUtil::IsPerUserInstall(chrome_exe));
+  app_info.app_id =
+      ShellUtil::GetBrowserModelId(dist, InstallUtil::IsPerUserInstall());
 
   // TODO(grt): http://crbug.com/75152 Write a reference to a localized
   // resource for name, description, and company.
@@ -675,7 +675,7 @@
   // Failing that, read the path to setup.exe from Chrome's ClientState key,
   // which is the canonical location of the installer for all types of installs
   // (see AddUninstallShortcutWorkItems).
-  const bool is_per_user = InstallUtil::IsPerUserInstall(chrome_exe);
+  const bool is_per_user = InstallUtil::IsPerUserInstall();
   if (!base::PathExists(exe_path)) {
     RegKey key(is_per_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE,
                dist->GetStateKey().c_str(), KEY_QUERY_VALUE | KEY_WOW64_32KEY);
@@ -849,7 +849,7 @@
 bool GetInstallationSpecificSuffix(BrowserDistribution* dist,
                                    const base::FilePath& chrome_exe,
                                    base::string16* suffix) {
-  if (!InstallUtil::IsPerUserInstall(chrome_exe) ||
+  if (!InstallUtil::IsPerUserInstall() ||
       QuickIsChromeRegistered(dist, chrome_exe, base::string16(),
                               CONFIRM_SHELL_REGISTRATION)) {
     // No suffix on system-level installs and user-level installs already
@@ -1000,10 +1000,9 @@
 
 // Cleans up an old verb (run) we used to register in
 // <root>\Software\Classes\Chrome<.suffix>\.exe\shell\run on Windows 8.
-void RemoveRunVerbOnWindows8(BrowserDistribution* dist,
-                             const base::FilePath& chrome_exe) {
+void RemoveRunVerbOnWindows8(BrowserDistribution* dist) {
   if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    bool is_per_user_install = InstallUtil::IsPerUserInstall(chrome_exe);
+    bool is_per_user_install = InstallUtil::IsPerUserInstall();
     HKEY root_key = DetermineRegistrationRoot(is_per_user_install);
     // There's no need to rollback, so forgo the usual work item lists and just
     // remove the key from the registry.
@@ -1683,7 +1682,7 @@
   //   2) Username (old-style).
   //   3) Unsuffixed (even worse).
   base::string16 tested_suffix;
-  if (InstallUtil::IsPerUserInstall(chrome_exe) &&
+  if (InstallUtil::IsPerUserInstall() &&
       (!GetUserSpecificRegistrySuffix(&tested_suffix) ||
        !QuickIsChromeRegistered(dist, chrome_exe, tested_suffix,
                                 CONFIRM_PROGID_REGISTRATION)) &&
@@ -1802,7 +1801,7 @@
   static const wchar_t* const kChromeProtocols[] = { L"http", L"https" };
   DefaultState default_state = ProbeProtocolHandlers(
       chrome_exe, kChromeProtocols, arraysize(kChromeProtocols));
-  UpdateDefaultBrowserBeaconWithState(chrome_exe, distribution, default_state);
+  UpdateDefaultBrowserBeaconWithState(distribution, default_state);
   return default_state;
 }
 
@@ -2071,9 +2070,9 @@
     return false;
   }
 
-  RemoveRunVerbOnWindows8(dist, chrome_exe);
+  RemoveRunVerbOnWindows8(dist);
 
-  bool user_level = InstallUtil::IsPerUserInstall(chrome_exe);
+  bool user_level = InstallUtil::IsPerUserInstall();
   HKEY root = DetermineRegistrationRoot(user_level);
 
   // Look only in HKLM for system-level installs (otherwise, if a user-level
@@ -2155,7 +2154,7 @@
     return false;
   }
 
-  bool user_level = InstallUtil::IsPerUserInstall(chrome_exe);
+  bool user_level = InstallUtil::IsPerUserInstall();
   HKEY root = DetermineRegistrationRoot(user_level);
 
   // Look only in HKLM for system-level installs (otherwise, if a user-level

diff --git a/chrome/service/OWNERS b/chrome/service/OWNERS
index adb99ff8..3a21c291 100644
--- a/chrome/service/OWNERS
+++ b/chrome/service/OWNERS

@@ -1,3 +1,5 @@
 gene@chromium.org
 scottbyer@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 471f316..49a64ef 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn

@@ -577,8 +577,8 @@
         ]
       }
       if (is_win || is_linux) {
-        # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once
-        # it is supported.
+        # TODO(crbug.com/679127): Investigate why these tests currently break
+        # on Mac, and enable them.
         sources += [
           "../browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc",
           "../browser/ui/views/payments/payment_request_interactive_uitest.cc",
@@ -1194,6 +1194,7 @@
 
     deps += [
       "//mash/package",
+      "//mash/session/public/interfaces:constants",
       "//services/service_manager/background:lib",
     ]
 
@@ -2014,13 +2015,6 @@
       ]
     }
 
-    # TODO(crbug.com/679127): Enable these tests on "mac_views_browser" once it
-    # is supported.
-    if (is_linux || is_win) {
-      sources +=
-          [ "../browser/payments/site_per_process_payments_browsertest.cc" ]
-    }
-
     if (enable_captive_portal_detection) {
       sources +=
           [ "../browser/ssl/captive_portal_blocking_page_browsertest.cc" ]
@@ -2143,6 +2137,7 @@
     }
     if (toolkit_views) {
       sources += [
+        "../browser/payments/site_per_process_payments_browsertest.cc",
         "../browser/ui/global_error/global_error_service_browsertest.cc",
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc",
@@ -2561,7 +2556,10 @@
       }
     }
     if (is_win) {
-      sources += [ "../browser/extensions/api/networking_private/networking_private_credentials_getter_browsertest.cc" ]
+      sources += [
+        "../browser/extensions/api/networking_private/networking_private_credentials_getter_browsertest.cc",
+        "../browser/ui/views/settings_reset_prompt_dialog_browsertest.cc",
+      ]
     }
     if (is_mac || is_win) {
       sources += [
@@ -3366,6 +3364,7 @@
     "../browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc",
     "../browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc",
     "../browser/ui/chrome_select_file_policy_unittest.cc",
+    "../browser/ui/cocoa/location_bar/location_bar_view_mac_unittest.mm",
     "../browser/ui/find_bar/find_backend_unittest.cc",
     "../browser/ui/login/login_handler_unittest.cc",
     "../browser/ui/passwords/manage_passwords_state_unittest.cc",
@@ -3735,6 +3734,7 @@
       "../browser/ui/webui/options/password_manager_handler_unittest.cc",
       "../browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc",
       "../browser/ui/webui/options/sync_setup_handler_unittest.cc",
+      "../browser/ui/webui/settings/downloads_handler_unittest.cc",
       "../browser/ui/webui/settings/metrics_reporting_handler_unittest.cc",
       "../browser/ui/webui/settings/people_handler_unittest.cc",
       "../browser/ui/webui/settings/profile_info_handler_unittest.cc",
@@ -4812,6 +4812,9 @@
       "../browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc",
       "../browser/ui/views/confirm_bubble_views_unittest.cc",
       "../browser/ui/views/global_error_bubble_view_unittest.cc",
+      "../browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc",
+      "../browser/ui/views/payments/validating_textfield_unittest.cc",
+      "../browser/ui/views/payments/view_stack_unittest.cc",
       "../browser/ui/views/website_settings/website_settings_popup_view_unittest.cc",
     ]
     if (is_chromeos) {
@@ -4844,9 +4847,6 @@
         "../browser/ui/views/frame/web_contents_close_handler_unittest.cc",
         "../browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc",
         "../browser/ui/views/omnibox/omnibox_view_views_unittest.cc",
-        "../browser/ui/views/payments/credit_card_editor_view_controller_unittest.cc",
-        "../browser/ui/views/payments/validating_textfield_unittest.cc",
-        "../browser/ui/views/payments/view_stack_unittest.cc",
         "../browser/ui/views/status_icons/status_tray_win_unittest.cc",
         "../browser/ui/views/sync/bubble_sync_promo_view_unittest.cc",
         "../browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_unittest.cc",

diff --git a/chrome/test/DEPS b/chrome/test/DEPS
index c65a276..cfc1016 100644
--- a/chrome/test/DEPS
+++ b/chrome/test/DEPS

@@ -10,6 +10,7 @@
   "+device/geolocation",
   "+extensions",
   "+mash/package",
+  "+mash/session/public/interfaces",
   "+mojo",
   "+rlz/features",
   "+services",

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
index 7b021eb..23c3c65 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.test;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 
@@ -113,6 +114,12 @@
             }
         }
 
+        private boolean supportsWebVr() {
+            // WebVR support is tied to VR Services support, which is currently only on N+
+            // TODO(bsheedy): Change this to >= N when the SDK supports it
+            return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
+        }
+
         @Override
         protected boolean restrictionApplies(String restriction) {
             if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_PHONE)
@@ -154,6 +161,20 @@
                     && !isDaydreamViewPaired()) {
                 return true;
             }
+            if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_WEBVR_SUPPORTED)
+                    || TextUtils.equals(
+                               restriction, ChromeRestriction.RESTRICTION_TYPE_WEBVR_UNSUPPORTED)) {
+                boolean webvrSupported = supportsWebVr();
+                if (TextUtils.equals(
+                            restriction, ChromeRestriction.RESTRICTION_TYPE_WEBVR_SUPPORTED)
+                        && !webvrSupported) {
+                    return true;
+                } else if (TextUtils.equals(restriction,
+                                   ChromeRestriction.RESTRICTION_TYPE_WEBVR_UNSUPPORTED)
+                        && webvrSupported) {
+                    return true;
+                }
+            }
             return false;
         }
     }

diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
index 2f44fe9..f6d6b4a 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeRestriction.java

@@ -23,4 +23,8 @@
     public static final String RESTRICTION_TYPE_NON_DAYDREAM = "Non-Daydream";
     /** Specifies the test is only valid if the current VR viewer is Daydream View */
     public static final String RESTRICTION_TYPE_DAYDREAM_VIEW = "Daydream_View";
+    /** Specifies the test is only valid on devices that support WebVR */
+    public static final String RESTRICTION_TYPE_WEBVR_SUPPORTED = "WebVR_Supported";
+    /** Specifies the test is only valid on devices that do not support WebVR */
+    public static final String RESTRICTION_TYPE_WEBVR_UNSUPPORTED = "WebVR_Unsupported";
 }

diff --git a/chrome/test/base/mash_browser_tests_main.cc b/chrome/test/base/mash_browser_tests_main.cc
index a97abff..bc097e1 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc

@@ -27,6 +27,7 @@
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/test/test_launcher.h"
 #include "mash/package/mash_packaged_service.h"
+#include "mash/session/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
@@ -43,7 +44,7 @@
     FILE_PATH_LITERAL("mash_browser_tests_catalog.json");
 
 void ConnectToDefaultApps(service_manager::Connector* connector) {
-  connector->Connect("mash_session");
+  connector->Connect(mash::session::mojom::kServiceName);
 }
 
 class MashTestSuite : public ChromeTestSuite {

diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
index 28d42ab5..240318b 100644
--- a/chrome/test/chromedriver/capabilities.cc
+++ b/chrome/test/chromedriver/capabilities.cc

@@ -612,7 +612,7 @@
 Capabilities::Capabilities()
     : android_use_running_app(false),
       detach(false),
-      force_devtools_screenshot(false),
+      force_devtools_screenshot(true),
       page_load_strategy(PageLoadStrategy::kNormal),
       network_emulation_enabled(false) {}
 

diff --git a/chrome/test/chromedriver/test/run_py_tests.py b/chrome/test/chromedriver/test/run_py_tests.py
index 1adb0e2d..c6c901c 100755
--- a/chrome/test/chromedriver/test/run_py_tests.py
+++ b/chrome/test/chromedriver/test/run_py_tests.py

@@ -83,8 +83,6 @@
     # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1673
     'ChromeDownloadDirTest.testFileDownloadWithGet',
     'ChromeDriverPageLoadTimeoutTest.*',
-    # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1683
-    'ChromeDriverTest.testShadowDomClick',
 ]
 _VERSION_SPECIFIC_FILTER['57'] = [
     # https://code.google.com/p/chromedriver/issues/detail?id=992
@@ -2257,6 +2255,8 @@
     if util.IsLinux() and not util.Is64Bit():
       # Workaround for crbug.com/611886.
       cmd.append('--no-sandbox')
+      # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1695
+      cmd.append('--disable-gpu')
     process = subprocess.Popen(cmd)
     if process is None:
       raise RuntimeError('Chrome could not be started with debugging port')

diff --git a/chrome/test/chromedriver/test/test_expectations b/chrome/test/chromedriver/test/test_expectations
index fb8da8e5..8d893ea 100644
--- a/chrome/test/chromedriver/test/test_expectations
+++ b/chrome/test/chromedriver/test/test_expectations

@@ -147,24 +147,6 @@
 ]
 
 _SPECIFIC_OS_REVISION_NEGATIVE_FILTER = {}
-_SPECIFIC_OS_REVISION_NEGATIVE_FILTER['linux_HEAD'] = [
-    # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1683
-    'ClickScrollingTest.testShouldBeAbleToClickElementInAFrameThatIsOutOfView',
-    'ClickScrollingTest.testShouldBeAbleToClickElementThatIsOutOfViewInAFrameThatIsOutOfView',
-    'ClickTest.testClickingLabelShouldSetCheckbox',
-    'ElementFindingTest.testRemovingAnElementDynamicallyFromTheDomShouldCauseAStaleRefException',
-    'FrameSwitchingTest.testShouldBeAbleToSwitchToTheTopIfTheFrameIsDeletedFromUnderUs',
-]
-_SPECIFIC_OS_REVISION_NEGATIVE_FILTER['win_HEAD'] = [
-    # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1683
-    'RenderedWebElementTest.testMoveRelativeToBody',
-    'RenderedWebElementTest.testCanClickOnSuckerFishMenuItem',
-    'BasicKeyboardInterfaceTest.testBasicKeyboardInput',
-]
-_SPECIFIC_OS_REVISION_NEGATIVE_FILTER['mac_HEAD'] = [
-    # https://bugs.chromium.org/p/chromedriver/issues/detail?id=1683
-    'AlertsTest.testShouldHandleAlertOnPageLoad',
-]
 
 _OS_NEGATIVE_FILTER['android:chrome'] = [
     'ChromeOptionsFunctionalTest.canStartChromeWithCustomOptions',

diff --git a/chrome/test/conflicts/OWNERS b/chrome/test/conflicts/OWNERS
index 2ffdf656..186b2df 100644
--- a/chrome/test/conflicts/OWNERS
+++ b/chrome/test/conflicts/OWNERS

@@ -1,2 +1,4 @@
 chrisha@chromium.org
 pmonette@chromium.org
+
+# COMPONENT: Internals>Core

diff --git a/chrome/test/data/extensions/platform_apps/window_api/test.js b/chrome/test/data/extensions/platform_apps/window_api/test.js
index 8b73af8..b3a90279 100644
--- a/chrome/test/data/extensions/platform_apps/window_api/test.js
+++ b/chrome/test/data/extensions/platform_apps/window_api/test.js

@@ -399,6 +399,25 @@
       }));
     },
 
+    // Regression for crbug.com/694248.
+    function testInnerBoundsNegativeZero() {
+      var innerBounds = {
+        left: -0,
+        top: 100,
+        width: 400,
+        height: 300,
+      };
+      chrome.app.window.create('test.html', {
+        innerBounds: innerBounds
+      }, callbackPass(function(win) {
+        chrome.test.assertTrue(win != null);
+        assertBoundsEq(innerBounds, win.innerBounds);
+        assertBoundsConsistent(win);
+        assertConstraintsUnspecified(win);
+        win.close();
+      }));
+    },
+
     function testOuterBoundsOnly() {
       var outerBounds = {
         left: 150,

diff --git a/chrome/test/data/webui/cr_elements/cr_dialog_test.js b/chrome/test/data/webui/cr_elements/cr_dialog_test.js
new file mode 100644
index 0000000..fa617c5
--- /dev/null
+++ b/chrome/test/data/webui/cr_elements/cr_dialog_test.js

@@ -0,0 +1,41 @@
+// 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.
+
+suite('cr-dialog', function() {
+  setup(function() {
+    PolymerTest.clearBody();
+  });
+
+  test('focuses title on show', function() {
+    document.body.innerHTML = `
+      <dialog is="cr-dialog">
+        <div class="title">title</div>
+        <div class="body"><button>button</button></div>
+      </dialog>`;
+
+    assertFalse(document.activeElement.matches('div.title'));
+    assertFalse(document.activeElement.matches('button'));
+
+    document.body.querySelector('dialog').showModal();
+
+    expectTrue(document.activeElement.matches('div.title'));
+    expectFalse(document.activeElement.matches('button'));
+  });
+
+  test('focuses [autofocus] instead of title when present', function() {
+    document.body.innerHTML = `
+      <dialog is="cr-dialog">
+        <div class="title">title</div>
+        <div class="body"><button autofocus>button</button></div>
+      </dialog>`;
+
+    assertFalse(document.activeElement.matches('button'));
+    assertFalse(document.activeElement.matches('div.title'));
+
+    document.body.querySelector('dialog').showModal();
+
+    expectTrue(document.activeElement.matches('button'));
+    expectFalse(document.activeElement.matches('div.title'));
+  });
+});

diff --git a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
index a4f41d7..20cb50e9 100644
--- a/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js
+++ b/chrome/test/data/webui/cr_elements/cr_elements_browsertest.js

@@ -37,6 +37,10 @@
   },
 };
 
+/**
+ * @constructor
+ * @extends {CrElementsBrowserTest}
+ */
 function CrElementsLazyRenderTest() {}
 
 /**
@@ -175,6 +179,10 @@
   mocha.run();
 });
 
+/**
+ * @constructor
+ * @extends {CrElementsBrowserTest}
+ */
 function CrElementsPolicyPrefIndicatorTest() {}
 
 CrElementsPolicyPrefIndicatorTest.prototype = {
@@ -193,3 +201,25 @@
 TEST_F('CrElementsPolicyPrefIndicatorTest', 'All', function() {
   mocha.run();
 });
+
+/**
+ * @constructor
+ * @extends {CrElementsBrowserTest}
+ */
+function CrElementsDialogTest() {}
+
+CrElementsDialogTest.prototype = {
+  __proto__: CrElementsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://resources/cr_elements/cr_dialog/cr_dialog.html',
+
+  /** @override */
+  extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
+    'cr_dialog_test.js',
+  ]),
+};
+
+TEST_F('CrElementsDialogTest', 'All', function() {
+  mocha.run();
+});

diff --git a/chrome/test/data/webui/settings/about_page_tests.js b/chrome/test/data/webui/settings/about_page_tests.js
index 9e02715..32837a6 100644
--- a/chrome/test/data/webui/settings/about_page_tests.js
+++ b/chrome/test/data/webui/settings/about_page_tests.js

@@ -152,11 +152,16 @@
   function registerAboutPageTests() {
     /**
      * @param {!UpdateStatus} status
-     * @param {number=} opt_progress
+     * @param {{
+     *   progress: number|undefined,
+     *   message: string|undefined
+     * }} opt_options
      */
-    function fireStatusChanged(status, opt_progress) {
+    function fireStatusChanged(status, opt_options) {
+      var options = opt_options || {};
       cr.webUIListenerCallback('update-status-changed', {
-        progress: opt_progress === undefined ? 1 : opt_progress,
+        progress: options.progress === undefined ? 1 : options.progress,
+        message: options.message,
         status: status,
       });
     }
@@ -224,14 +229,14 @@
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         previousMessageText = statusMessageEl.textContent;
 
-        fireStatusChanged(UpdateStatus.UPDATING, 0);
+        fireStatusChanged(UpdateStatus.UPDATING, {progress: 0});
         assertEquals(SPINNER_ICON, icon.src);
         assertEquals(null, icon.getAttribute('icon'));
         assertFalse(statusMessageEl.textContent.includes('%'));
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         previousMessageText = statusMessageEl.textContent;
 
-        fireStatusChanged(UpdateStatus.UPDATING, 1);
+        fireStatusChanged(UpdateStatus.UPDATING, {progress: 1});
         assertNotEquals(previousMessageText, statusMessageEl.textContent);
         assertTrue(statusMessageEl.textContent.includes('%'));
         previousMessageText = statusMessageEl.textContent;
@@ -258,6 +263,14 @@
         assertEquals(0, statusMessageEl.textContent.trim().length);
       });
 
+      test('ErrorMessageWithHtml', function() {
+        var htmlError = 'hello<br>there<br>was<pre>an</pre>error';
+        fireStatusChanged(
+            UpdateStatus.FAILED, {message: htmlError});
+        var statusMessageEl = page.$.updateStatusMessage;
+        assertEquals(htmlError, statusMessageEl.innerHTML);
+      });
+
       /**
        * Test that when the current platform has been marked as deprecated (but
        * not end of the line) a deprecation warning message is displayed,

diff --git a/chrome/tools/service_discovery_sniffer/OWNERS b/chrome/tools/service_discovery_sniffer/OWNERS
index 58265a3..4633094 100644
--- a/chrome/tools/service_discovery_sniffer/OWNERS
+++ b/chrome/tools/service_discovery_sniffer/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chrome/utility/cloud_print/OWNERS b/chrome/utility/cloud_print/OWNERS
index 58265a3..4633094 100644
--- a/chrome/utility/cloud_print/OWNERS
+++ b/chrome/utility/cloud_print/OWNERS

@@ -1,2 +1,4 @@
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/chromecast/base/alarm_manager.cc b/chromecast/base/alarm_manager.cc
index e393377..e6b47557 100644
--- a/chromecast/base/alarm_manager.cc
+++ b/chromecast/base/alarm_manager.cc

@@ -21,6 +21,14 @@
 
 namespace {
 int kClockPollInterval = 5;
+
+void VerifyHandleCallback(const base::Closure& task,
+                          base::WeakPtr<AlarmManager::AlarmHandle> handle) {
+  if (!handle.get()) {
+    return;
+  }
+  task.Run();
+}
 }  // namespace
 
 AlarmManager::AlarmInfo::AlarmInfo(
@@ -51,8 +59,13 @@
 
 AlarmManager::~AlarmManager() {}
 
-void AlarmManager::PostAlarmTask(const base::Closure& task, base::Time time) {
-  AddAlarm(task, time, base::ThreadTaskRunnerHandle::Get());
+std::unique_ptr<AlarmManager::AlarmHandle> AlarmManager::PostAlarmTask(
+    const base::Closure& task,
+    base::Time time) {
+  std::unique_ptr<AlarmHandle> handle = base::MakeUnique<AlarmHandle>();
+  AddAlarm(base::Bind(&VerifyHandleCallback, task, handle->AsWeakPtr()), time,
+           base::ThreadTaskRunnerHandle::Get());
+  return handle;
 }
 
 void AlarmManager::AddAlarm(

diff --git a/chromecast/base/alarm_manager.h b/chromecast/base/alarm_manager.h
index 0f0a3c7b..653ffc7 100644
--- a/chromecast/base/alarm_manager.h
+++ b/chromecast/base/alarm_manager.h

@@ -29,6 +29,7 @@
 // equal or past the requested time, the alarm will fire.
 class AlarmManager {
  public:
+  class AlarmHandle : public base::SupportsWeakPtr<AlarmHandle> {};
   // Construct and start the alarm manager. The clock poller will run on the
   // caller's thread.
   AlarmManager();
@@ -41,17 +42,20 @@
 
   // Add an alarm.
   // |task| will be executed at around |time|.
+  // Returns an AlarmHandle that must be kept alive. If the AlarmHandle is
+  // destroyed, the alarm will not fire.
   //
   // Any thread can add alarms. The alarm will be fired on the original
   // thread used to set the alarm.
   //
   // When an alarm is added to the alarm manager, the task is guaranteed to not
   // run before the clock passes the requested time. The task may not run even
-  // if
-  // it is past the requested time if the software is suspended. However, once
-  // woken up, the event will fire within 5 seconds if the target time has
+  // if it is past the requested time if the software is suspended. However,
+  // once woken up, the event will fire within 5 seconds if the target time has
   // passed.
-  void PostAlarmTask(const base::Closure& task, base::Time time);
+  std::unique_ptr<AlarmManager::AlarmHandle> PostAlarmTask(
+      const base::Closure& task,
+      base::Time time) WARN_UNUSED_RESULT;
 
  private:
   class AlarmInfo {

diff --git a/chromecast/base/alarm_manager_unittest.cc b/chromecast/base/alarm_manager_unittest.cc
index ac44df4..d51d606 100644
--- a/chromecast/base/alarm_manager_unittest.cc
+++ b/chromecast/base/alarm_manager_unittest.cc

@@ -54,9 +54,9 @@
       base::MakeUnique<AlarmManager>(std::move(test_clock), task_runner_);
 
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
   task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(9));
   clock->Advance(base::TimeDelta::FromMinutes(9));
   task_runner_->RunUntilIdle();
@@ -78,9 +78,9 @@
 
   // Add an alarm.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
   clock->Advance(base::TimeDelta::FromMinutes(10));
   task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(10));
   task_runner_->RunUntilIdle();
@@ -108,9 +108,9 @@
 
   // Add an alarm in the past. Should fire right away.
   base::Time alarm_time = base::Time::Now() - base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
   task_runner_->FastForwardBy(base::TimeDelta::FromSeconds(10));
   task_runner_->RunUntilIdle();
   ASSERT_TRUE(task.fired_);
@@ -131,9 +131,9 @@
 
   // Add an alarm. The time jumps to the future.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
   clock->Advance(base::TimeDelta::FromMinutes(10));
   task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(1));
   task_runner_->RunUntilIdle();
@@ -155,9 +155,9 @@
 
   // Add an alarm. The time jumps far into the future.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
   clock->Advance(base::TimeDelta::FromMinutes(60));
   task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(1));
   task_runner_->RunUntilIdle();
@@ -181,15 +181,15 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // First task should fire.
   clock->Advance(base::TimeDelta::FromMinutes(10));
@@ -227,15 +227,15 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(10);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Second task should fire.
   clock->Advance(base::TimeDelta::FromMinutes(10));
@@ -275,21 +275,21 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(16);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add third task.
   alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle3(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task3.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // First and third task should fire.
   clock->Advance(base::TimeDelta::FromMinutes(12));
@@ -319,21 +319,21 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(15);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(16);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add third task.
   alarm_time = now + base::TimeDelta::FromMinutes(11);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle3(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task3.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Third task should fire.
   clock->Advance(base::TimeDelta::FromMinutes(12));
@@ -368,21 +368,21 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(15);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add it again with less time.
   alarm_time = now + base::TimeDelta::FromMinutes(1);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(16);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle3(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2.GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // First task should fire.
   clock->Advance(base::TimeDelta::FromMinutes(1));
@@ -424,21 +424,21 @@
 
   // Add first task.
   base::Time alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task1->GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add second task.
   alarm_time = now + base::TimeDelta::FromMinutes(16);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task2->GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Add third task.
   alarm_time = now + base::TimeDelta::FromMinutes(12);
-  manager->PostAlarmTask(
+  std::unique_ptr<AlarmManager::AlarmHandle> handle3(manager->PostAlarmTask(
       base::Bind(&WallClockDependantTask::OnAlarmFire, task3->GetWeakPtr()),
-      alarm_time);
+      alarm_time));
 
   // Remove the first task.
   task1.reset(nullptr);
@@ -450,4 +450,54 @@
   ASSERT_FALSE(task2->fired_);
   ASSERT_TRUE(task3->fired_);
 }
+
+TEST_F(AlarmManagerTest, AlarmDeleteHandle) {
+  std::unique_ptr<WallClockDependantTask> task1 =
+      base::MakeUnique<WallClockDependantTask>();
+  std::unique_ptr<WallClockDependantTask> task2 =
+      base::MakeUnique<WallClockDependantTask>();
+  std::unique_ptr<WallClockDependantTask> task3 =
+      base::MakeUnique<WallClockDependantTask>();
+  ASSERT_FALSE(task1->fired_);
+  ASSERT_FALSE(task2->fired_);
+  ASSERT_FALSE(task3->fired_);
+
+  // Create the AlarmManager.
+  base::Time now = base::Time::Now();
+  std::unique_ptr<base::SimpleTestClock> test_clock =
+      base::MakeUnique<base::SimpleTestClock>();
+  test_clock->SetNow(now);
+  base::SimpleTestClock* clock = test_clock.get();
+  std::unique_ptr<AlarmManager> manager =
+      base::MakeUnique<AlarmManager>(std::move(test_clock), task_runner_);
+
+  // Add first task.
+  base::Time alarm_time = now + base::TimeDelta::FromMinutes(12);
+  std::unique_ptr<AlarmManager::AlarmHandle> handle1(manager->PostAlarmTask(
+      base::Bind(&WallClockDependantTask::OnAlarmFire, task1->GetWeakPtr()),
+      alarm_time));
+
+  // Add second task.
+  alarm_time = now + base::TimeDelta::FromMinutes(16);
+  std::unique_ptr<AlarmManager::AlarmHandle> handle2(manager->PostAlarmTask(
+      base::Bind(&WallClockDependantTask::OnAlarmFire, task2->GetWeakPtr()),
+      alarm_time));
+
+  // Add third task.
+  alarm_time = now + base::TimeDelta::FromMinutes(12);
+  std::unique_ptr<AlarmManager::AlarmHandle> handle3(manager->PostAlarmTask(
+      base::Bind(&WallClockDependantTask::OnAlarmFire, task3->GetWeakPtr()),
+      alarm_time));
+
+  // Delete the first task's handle.
+  handle1.reset();
+
+  // Third task should fire.
+  clock->Advance(base::TimeDelta::FromMinutes(15));
+  task_runner_->FastForwardBy(base::TimeDelta::FromMinutes(1));
+  task_runner_->RunUntilIdle();
+  ASSERT_FALSE(task1->fired_);
+  ASSERT_FALSE(task2->fired_);
+  ASSERT_TRUE(task3->fired_);
+}
 }
\ No newline at end of file

diff --git a/chromecast/browser/cast_web_view.cc b/chromecast/browser/cast_web_view.cc
index 4c90dca..e11f7cc 100644
--- a/chromecast/browser/cast_web_view.cc
+++ b/chromecast/browser/cast_web_view.cc

@@ -4,6 +4,8 @@
 
 #include "chromecast/browser/cast_web_view.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromecast/base/metrics/cast_metrics_helper.h"
@@ -48,13 +50,6 @@
   content::WebContents* web_contents =
       content::WebContents::Create(create_params);
 
-#if defined(USE_AURA)
-  // Resize window
-  aura::Window* content_window = web_contents->GetNativeView();
-  content_window->SetBounds(
-      gfx::Rect(display_size.width(), display_size.height()));
-#endif
-
 #if defined(OS_ANDROID)
   content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
   prefs->use_video_overlay_for_embedded_encrypted_video = true;
@@ -76,6 +71,7 @@
       transparent_(transparent),
       window_(shell::CastContentWindow::Create(delegate)),
       web_contents_(CreateWebContents(browser_context_, site_instance_)),
+      did_start_navigation_(false),
       weak_factory_(this) {
   DCHECK(delegate_);
   DCHECK(browser_context_);
@@ -234,6 +230,11 @@
 
 void CastWebView::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
+  if (did_start_navigation_) {
+    return;
+  }
+  did_start_navigation_ = true;
+
 #if defined(USE_AURA)
   // Resize window
   gfx::Size display_size =

diff --git a/chromecast/browser/cast_web_view.h b/chromecast/browser/cast_web_view.h
index 26195913..f55f4ef1 100644
--- a/chromecast/browser/cast_web_view.h
+++ b/chromecast/browser/cast_web_view.h

@@ -103,6 +103,7 @@
   const bool transparent_;
   const std::unique_ptr<shell::CastContentWindow> window_;
   std::unique_ptr<content::WebContents> web_contents_;
+  bool did_start_navigation_;
 
   base::WeakPtrFactory<CastWebView> weak_factory_;
 

diff --git a/chromecast/browser/service/cast_service_simple.cc b/chromecast/browser/service/cast_service_simple.cc
index 96c4a48..56144b72 100644
--- a/chromecast/browser/service/cast_service_simple.cc
+++ b/chromecast/browser/service/cast_service_simple.cc

@@ -61,8 +61,8 @@
   cast_web_view_ = base::MakeUnique<CastWebView>(this, browser_context(),
                                                  /*site_instance*/ nullptr,
                                                  /*transparent*/ false);
-  cast_web_view_->Show(window_manager_);
   cast_web_view_->LoadUrl(startup_url_);
+  cast_web_view_->Show(window_manager_);
 }
 
 void CastServiceSimple::StopInternal() {

diff --git a/chromeos/components/tether/BUILD.gn b/chromeos/components/tether/BUILD.gn
index 6c4bc46..b43d203 100644
--- a/chromeos/components/tether/BUILD.gn
+++ b/chromeos/components/tether/BUILD.gn

@@ -16,6 +16,8 @@
     "ble_constants.h",
     "ble_scanner.cc",
     "ble_scanner.h",
+    "host_scan_device_prioritizer.cc",
+    "host_scan_device_prioritizer.h",
     "host_scan_scheduler.cc",
     "host_scan_scheduler.h",
     "host_scanner.cc",
@@ -28,6 +30,8 @@
     "message_transfer_operation.h",
     "message_wrapper.cc",
     "message_wrapper.h",
+    "pref_names.cc",
+    "pref_names.h",
   ]
 
   deps = [
@@ -36,6 +40,7 @@
     "//chromeos/components/tether/proto",
     "//components/cryptauth",
     "//components/cryptauth/ble",
+    "//components/prefs",
     "//components/proximity_auth/logging",
     "//device/bluetooth",
   ]
@@ -74,6 +79,7 @@
     "ble_advertiser_unittest.cc",
     "ble_connection_manager_unittest.cc",
     "ble_scanner_unittest.cc",
+    "host_scan_device_prioritizer_unittest.cc",
     "host_scan_scheduler_unittest.cc",
     "local_device_data_provider_unittest.cc",
     "message_transfer_operation_unittest.cc",
@@ -89,6 +95,7 @@
     "//components/cryptauth",
     "//components/cryptauth:test_support",
     "//components/cryptauth/ble",
+    "//components/prefs:test_support",
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//testing/gmock",

diff --git a/chromeos/components/tether/host_scan_device_prioritizer.cc b/chromeos/components/tether/host_scan_device_prioritizer.cc
new file mode 100644
index 0000000..13f2b50
--- /dev/null
+++ b/chromeos/components/tether/host_scan_device_prioritizer.cc

@@ -0,0 +1,116 @@
+// Copyright 2017 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 "chromeos/components/tether/host_scan_device_prioritizer.h"
+
+#include "base/memory/ptr_util.h"
+#include "base/values.h"
+#include "chromeos/components/tether/pref_names.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+
+namespace chromeos {
+
+namespace tether {
+
+// static
+void HostScanDevicePrioritizer::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterListPref(prefs::kMostRecentTetherAvailablilityResponderIds);
+  registry->RegisterStringPref(prefs::kMostRecentConnectTetheringResponderId,
+                               "");
+}
+
+HostScanDevicePrioritizer::HostScanDevicePrioritizer(PrefService* pref_service)
+    : pref_service_(pref_service) {}
+
+HostScanDevicePrioritizer::~HostScanDevicePrioritizer() {}
+
+void HostScanDevicePrioritizer::RecordSuccessfulTetherAvailabilityResponse(
+    const cryptauth::RemoteDevice& remote_device) {
+  std::string device_id = remote_device.GetDeviceId();
+
+  const base::ListValue* ids =
+      pref_service_->GetList(prefs::kMostRecentTetherAvailablilityResponderIds);
+
+  // Create a mutable copy of the stored IDs, or create one if it has yet to be
+  // stored.
+  std::unique_ptr<base::ListValue> updated_ids =
+      ids ? ids->CreateDeepCopy() : base::MakeUnique<base::ListValue>();
+
+  // Remove the device ID if it was already present in the list.
+  std::unique_ptr<base::Value> device_id_value =
+      base::MakeUnique<base::Value>(device_id);
+  updated_ids->Remove(*device_id_value, nullptr);
+
+  // Add the device ID to the front of the queue.
+  updated_ids->Insert(0, std::move(device_id_value));
+
+  // Store the updated list back in |pref_service_|.
+  pref_service_->Set(prefs::kMostRecentTetherAvailablilityResponderIds,
+                     *updated_ids);
+}
+
+void HostScanDevicePrioritizer::RecordSuccessfulConnectTetheringResponse(
+    const cryptauth::RemoteDevice& remote_device) {
+  pref_service_->Set(prefs::kMostRecentConnectTetheringResponderId,
+                     base::Value(remote_device.GetDeviceId()));
+}
+
+void HostScanDevicePrioritizer::SortByHostScanOrder(
+    std::vector<cryptauth::RemoteDevice>* remote_devices) const {
+  // Fetch the stored IDs associated with the devices which most recently sent
+  // TetherAvailabilityResponses.
+  const base::ListValue* tether_availability_ids =
+      pref_service_->GetList(prefs::kMostRecentTetherAvailablilityResponderIds);
+
+  // Create a mutable copy of the stored IDs, or create one if it has yet to be
+  // stored.
+  std::unique_ptr<base::ListValue> prioritized_ids =
+      tether_availability_ids ? tether_availability_ids->CreateDeepCopy()
+                              : base::MakeUnique<base::ListValue>();
+
+  // Now, fetch the ID associated with the device which most recently sent a
+  // ConnectTetheringRequest.
+  std::string connect_tethering_id =
+      pref_service_->GetString(prefs::kMostRecentConnectTetheringResponderId);
+
+  // If an ID exists, insert it at the front of |prioritized_ids|.
+  if (!connect_tethering_id.empty()) {
+    prioritized_ids->Insert(
+        0, base::MakeUnique<base::Value>(connect_tethering_id));
+  }
+
+  // Iterate from the last stored ID to the first stored ID. This ensures that
+  // the items at the front of the list end up in the front of the prioritized
+  // |remote_devices| vector.
+  for (size_t i = prioritized_ids->GetSize(); i-- > 0;) {
+    base::Value* stored_id_value;
+    if (!prioritized_ids->Get(i, &stored_id_value)) {
+      continue;
+    }
+
+    std::string stored_id;
+    if (!stored_id_value->GetAsString(&stored_id)) {
+      continue;
+    }
+
+    // Iterate through |remote_devices| to see if a device exists with a
+    // device ID of |stored_id|. If one exists, remove it from its previous
+    // position in the list and add it at the front instead.
+    for (auto it = remote_devices->begin(); it != remote_devices->end(); ++it) {
+      if (it->GetDeviceId() != stored_id) {
+        continue;
+      }
+
+      cryptauth::RemoteDevice device_to_move = *it;
+      remote_devices->erase(it);
+      remote_devices->insert(remote_devices->begin(), device_to_move);
+      break;
+    }
+  }
+}
+
+}  // namespace tether
+
+}  // namespace chromeos

diff --git a/chromeos/components/tether/host_scan_device_prioritizer.h b/chromeos/components/tether/host_scan_device_prioritizer.h
new file mode 100644
index 0000000..0c89f33e
--- /dev/null
+++ b/chromeos/components/tether/host_scan_device_prioritizer.h

@@ -0,0 +1,62 @@
+// Copyright 2017 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 CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_DEVICE_PRIORITIZER_H_
+#define CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_DEVICE_PRIORITIZER_H_
+
+#include "base/macros.h"
+#include "components/cryptauth/remote_device.h"
+
+class PrefService;
+class PrefRegistrySimple;
+
+namespace chromeos {
+
+namespace tether {
+
+// Prioritizes the order of devices when performing a host scan. To optimize for
+// the most common tethering operations, this class uses the following rules:
+//   * The device which has most recently sent a successful
+//     ConnectTetheringResponse is always at the front of the queue.
+//   * Devices which have most recently sent a successful
+//     TetherAvailabilityResponse are next in the order, as long as they do not
+//     violate the first rule.
+//   * All other devices are left in the order they are passed.
+class HostScanDevicePrioritizer {
+ public:
+  // Note: The PrefService* passed here must be created using the same registry
+  // passed to RegisterPrefs().
+  HostScanDevicePrioritizer(PrefService* pref_service);
+  ~HostScanDevicePrioritizer();
+
+  // Registers the prefs used by this class to |registry|. Must be called before
+  // this class is utilized.
+  static void RegisterPrefs(PrefRegistrySimple* registry);
+
+  // Records a TetherAvailabilityResponse. This function should be called each
+  // time that a response is received from a potential host, even if a
+  // connection is not started.
+  void RecordSuccessfulTetherAvailabilityResponse(
+      const cryptauth::RemoteDevice& remote_device);
+
+  // Records a ConnectTetheringResponse. This function should be called each
+  // time that a response is received from a host.
+  void RecordSuccessfulConnectTetheringResponse(
+      const cryptauth::RemoteDevice& remote_device);
+
+  // Prioritizes |remote_devices| using the rules described above.
+  void SortByHostScanOrder(
+      std::vector<cryptauth::RemoteDevice>* remote_devices) const;
+
+ private:
+  PrefService* pref_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(HostScanDevicePrioritizer);
+};
+
+}  // namespace tether
+
+}  // namespace chromeos
+
+#endif  // CHROMEOS_COMPONENTS_TETHER_HOST_SCAN_DEVICE_PRIORITIZER_H_

diff --git a/chromeos/components/tether/host_scan_device_prioritizer_unittest.cc b/chromeos/components/tether/host_scan_device_prioritizer_unittest.cc
new file mode 100644
index 0000000..30a3c64
--- /dev/null
+++ b/chromeos/components/tether/host_scan_device_prioritizer_unittest.cc

@@ -0,0 +1,115 @@
+// 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.
+
+#include "chromeos/components/tether/host_scan_device_prioritizer.h"
+
+#include "components/cryptauth/remote_device_test_util.h"
+#include "components/prefs/testing_pref_service.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace chromeos {
+
+namespace tether {
+
+class HostScanDevicePrioritizerTest : public testing::Test {
+ protected:
+  HostScanDevicePrioritizerTest()
+      : test_devices_(cryptauth::GenerateTestRemoteDevices(10)) {}
+
+  void SetUp() override {
+    pref_service_ = base::MakeUnique<TestingPrefServiceSimple>();
+    HostScanDevicePrioritizer::RegisterPrefs(pref_service_->registry());
+
+    prioritizer_ =
+        base::MakeUnique<HostScanDevicePrioritizer>(pref_service_.get());
+  }
+
+  const std::vector<cryptauth::RemoteDevice> test_devices_;
+
+  std::unique_ptr<TestingPrefServiceSimple> pref_service_;
+  std::unique_ptr<HostScanDevicePrioritizer> prioritizer_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(HostScanDevicePrioritizerTest);
+};
+
+TEST_F(HostScanDevicePrioritizerTest, TestOnlyTetherAvailabilityResponses) {
+  // Receive TetherAvailabilityResponses from devices 0-4.
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[0]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[1]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[2]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[3]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[4]);
+
+  // Do not receive a ConnectTetheringResponse.
+
+  std::vector<cryptauth::RemoteDevice> test_vector =
+      std::vector<cryptauth::RemoteDevice>{test_devices_[6], test_devices_[5],
+                                           test_devices_[4], test_devices_[3],
+                                           test_devices_[2], test_devices_[1],
+                                           test_devices_[0]};
+
+  prioritizer_->SortByHostScanOrder(&test_vector);
+  EXPECT_EQ((std::vector<cryptauth::RemoteDevice>{
+                test_devices_[4], test_devices_[3], test_devices_[2],
+                test_devices_[1], test_devices_[0], test_devices_[6],
+                test_devices_[5]}),
+            test_vector);
+}
+
+TEST_F(HostScanDevicePrioritizerTest, TestBothTypesOfResponses) {
+  // Receive TetherAvailabilityResponses from devices 0-4.
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[0]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[1]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[2]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[3]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[4]);
+
+  // Receive ConnectTetheringResponse from device 0.
+  prioritizer_->RecordSuccessfulConnectTetheringResponse(test_devices_[0]);
+
+  std::vector<cryptauth::RemoteDevice> test_vector =
+      std::vector<cryptauth::RemoteDevice>{test_devices_[6], test_devices_[5],
+                                           test_devices_[4], test_devices_[3],
+                                           test_devices_[2], test_devices_[1],
+                                           test_devices_[0]};
+
+  prioritizer_->SortByHostScanOrder(&test_vector);
+  EXPECT_EQ((std::vector<cryptauth::RemoteDevice>{
+                test_devices_[0], test_devices_[4], test_devices_[3],
+                test_devices_[2], test_devices_[1], test_devices_[6],
+                test_devices_[5]}),
+            test_vector);
+}
+
+TEST_F(HostScanDevicePrioritizerTest, TestBothTypesOfResponses_DifferentOrder) {
+  // Receive different order.
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[0]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[2]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[1]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[4]);
+  prioritizer_->RecordSuccessfulTetherAvailabilityResponse(test_devices_[3]);
+
+  // Receive ConnectTetheringResponse from device 1.
+  prioritizer_->RecordSuccessfulConnectTetheringResponse(test_devices_[1]);
+
+  std::vector<cryptauth::RemoteDevice> test_vector =
+      std::vector<cryptauth::RemoteDevice>{test_devices_[9], test_devices_[8],
+                                           test_devices_[7], test_devices_[6],
+                                           test_devices_[5], test_devices_[4],
+                                           test_devices_[3], test_devices_[2],
+                                           test_devices_[1], test_devices_[0]};
+
+  prioritizer_->SortByHostScanOrder(&test_vector);
+  EXPECT_EQ((std::vector<cryptauth::RemoteDevice>{
+                test_devices_[1], test_devices_[3], test_devices_[4],
+                test_devices_[2], test_devices_[0], test_devices_[9],
+                test_devices_[8], test_devices_[7], test_devices_[6],
+                test_devices_[5]}),
+            test_vector);
+}
+
+}  // namespace tether
+
+}  // namespace cryptauth

diff --git a/chromeos/components/tether/pref_names.cc b/chromeos/components/tether/pref_names.cc
new file mode 100644
index 0000000..5ab3772
--- /dev/null
+++ b/chromeos/components/tether/pref_names.cc

@@ -0,0 +1,23 @@
+// 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.
+
+#include "chromeos/components/tether/pref_names.h"
+
+namespace chromeos {
+
+namespace tether {
+
+namespace prefs {
+
+const char kMostRecentTetherAvailablilityResponderIds[] =
+    "tether.most_recent_tether_availability_responder_ids";
+
+const char kMostRecentConnectTetheringResponderId[] =
+    "tether.most_recent_connect_tethering_responder_ids";
+
+}  // namespace prefs
+
+}  // namespace tether
+
+}  // namespace chromeos

diff --git a/chromeos/components/tether/pref_names.h b/chromeos/components/tether/pref_names.h
new file mode 100644
index 0000000..7f5b923
--- /dev/null
+++ b/chromeos/components/tether/pref_names.h

@@ -0,0 +1,31 @@
+// Copyright 2017 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 CHROMEOS_COMPONENTS_TETHER_PREF_NAMES_H_
+#define CHROMEOS_COMPONENTS_TETHER_PREF_NAMES_H_
+
+namespace chromeos {
+
+namespace tether {
+
+namespace prefs {
+
+// Preference name for the preference which stores IDs corresponding to devices
+// which have most recently replied to a TetherAvailabilityRequest with a
+// response code indicating that tethering is available. The value stored is a
+// ListValue, with the most recent response residing at the start of the list.
+extern const char kMostRecentTetherAvailablilityResponderIds[];
+
+// Preference name for the preference which stores the ID corresponding to
+// the device which has most recently replied to a ConnectTetheringRequest with
+// a response code indicating that its hotspot has started up successfully.
+extern const char kMostRecentConnectTetheringResponderId[];
+
+}  // namespace prefs
+
+}  // namespace tether
+
+}  // namespace chromeos
+
+#endif  // CHROMEOS_COMPONENTS_TETHER_PREF_NAMES_H_

diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
new file mode 100644
index 0000000..6bd4bacd
--- /dev/null
+++ b/components/background_task_scheduler/BUILD.gn

@@ -0,0 +1,59 @@
+# Copyright 2017 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.
+
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/config/android/rules.gni")
+}
+
+# Convenience target for developers to build prod and test code.
+group("background_task_scheduler") {
+  testonly = true
+
+  if (is_android) {
+    deps = [
+      ":background_task_scheduler_java",
+      ":background_task_scheduler_javatests",
+    ]
+  }
+}
+
+if (is_android) {
+  android_library("background_task_scheduler_java") {
+    java_files = [
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerDelegate.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobService.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverter.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/TaskInfo.java",
+      "android/java/src/org/chromium/components/background_task_scheduler/TaskParameters.java",
+    ]
+
+    deps = [
+      "//base:base_java",
+      "//third_party/android_tools:android_support_annotations_java",
+    ]
+  }
+
+  android_library("background_task_scheduler_javatests") {
+    testonly = true
+
+    java_files = [
+      "android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobServiceTest.java",
+      "android/javatests/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverterTest.java",
+    ]
+
+    deps = [
+      ":background_task_scheduler_java",
+      "//base:base_java",
+      "//base:base_java_test_support",
+      "//third_party/android_support_test_runner:runner_java",
+      "//third_party/junit",
+    ]
+  }
+}

diff --git a/components/background_task_scheduler/OWNERS b/components/background_task_scheduler/OWNERS
new file mode 100644
index 0000000..4d5ae7f
--- /dev/null
+++ b/components/background_task_scheduler/OWNERS

@@ -0,0 +1,4 @@
+awdf@chromium.org
+dtrainor@chromium.org
+nyquist@chromium.org
+

diff --git a/components/background_task_scheduler/README.md b/components/background_task_scheduler/README.md
new file mode 100644
index 0000000..c48720d5
--- /dev/null
+++ b/components/background_task_scheduler/README.md

@@ -0,0 +1,163 @@
+# Quick Start Guide to using BackgroundTaskScheduler
+
+## Background
+
+In Android M+ it is encouraged to use `JobScheduler` for all background jobs,
+instead of using things like `IntentService` or polling using alarms. Using the
+system API is beneficial as it has a full view of what goes on in the system and
+can schedule jobs accordingly.
+
+However, this functionality was introduced in Android L, and
+the API has been very stable since Android M. This means that we also need a
+similar framework for older versions of Android, which is provided by
+Google Play services. We prefer system APIs, since they do not require including
+external libraries which bloats the APK size of Chrome and adds unnecessary
+complexity. The GcmNetworkManager is only used when the system API is not
+available.
+
+The `background_task_scheduler` component provides a new framework for use
+within chromium to schedule and execute background jobs using the frameworks
+available on a given version of Android.
+The public API of the framework is similar to that of the Android
+`JobScheduler`, but it is backed by either the system `JobScheduler` API or by
+GcmNetworkManager. What service is used to back the framework remains unknown to
+callers of the API.
+
+## What is a task
+
+A task is defined as a class that implements the `BackgroundTask` interface,
+which looks like this:
+
+```java
+interface BackgroundTask {
+  interface TaskFinishedCallback {
+    void taskFinished(boolean needsReschedule);
+  }
+
+  boolean onStartTask(Context context,
+                      TaskParameters taskParameters,
+                      TaskFinishedCallback callback);
+  boolean onStopTask(Context context,
+                     TaskParameters taskParameters);
+}
+```
+
+**Any class implementing this interface must have a public constructor which takes
+no arguments.**
+
+A task must also have a unique ID, and it must be listed in `TaskIds` to ensure
+there is no overlap between different tasks.
+
+## How to schedule a task
+
+A task is scheduled by creating an object containing information about the task,
+such as when to run it, whether it requires battery, and other similar
+constraints. This object is called `TaskInfo` and has a builder you can use
+to set all the relevant fields.
+
+There are two main types of tasks; one-off tasks and periodic tasks. One-off
+tasks are only executed once, whereas periodic tasks are executed once per
+a defined interval.
+
+As an example for how to create a one-off task that executes in 200 minutes,
+you can do the following:
+
+```java
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            TimeUnit.MINUTES.toMillis(200)).build();
+```
+
+For a periodic task that executes every 200 minutes, you can call:
+
+```java
+TaskInfo.createPeriodicTask(TaskIds.YOUR_FEATURE,
+                              MyBackgroundTask.class,
+                              TimeUnit.MINUTES.toMillis(200)).build();
+```
+
+Typically you will also set other required parameters such as what type of
+network conditions are necessary and whether the task requires the device to
+be charging. They can be set on the builder like this:
+
+```java
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            TimeUnit.MINUTES.toMillis(100)
+                            TimeUnit.MINUTES.toMillis(200))
+                          .setRequiresCharging(true)
+                          .setRequiredNetworkType(TaskInfo.NETWORK_TYPE_UNMETERED)
+                          .build();
+```
+
+When the task is ready for scheduling, you use the
+`BackgroundTaskSchedulerFactory` to get the current instance of the
+`BackgroundTaskScheduler` and use it to schedule the job.
+
+```java
+BackgroundTaskScheduleFactory.getScheduler().schedule(myTaskInfo);
+```
+
+If you ever need to cancel a task, you can do that by calling `cancel`, and
+passing in the task ID:
+
+```java
+BackgroundTaskScheduleFactory.getScheduler().cancel(TaskIds.YOUR_FEATURE);
+```
+
+## Passing task arguments
+
+A `TaskInfo` supports passing in arguments through a `Bundle`, but only values
+that can be part of an Android `BaseBundle` are allowed. You can pass them in
+using the `TaskInfo.Builder`:
+
+```java
+Bundle myBundle = new Bundle();
+myBundle.putString("foo", "bar");
+myBundle.putLong("number", 1337L);
+
+TaskInfo.createOneOffTask(TaskIds.YOUR_FEATURE,
+                            MyBackgroundTask.class,
+                            TimeUnit.MINUTES.toMillis(100)
+                            TimeUnit.MINUTES.toMillis(200))
+                          .setExtras(myBundle)
+                          .build();
+```
+
+These arguments will be readable for the task through the `TaskParameters`
+object that is passed to both `onStartTask(...)` and `onStopTask(...)`, by
+doing the following:
+
+```java
+boolean onStartTask(Context context,
+                    TaskParameters taskParameters,
+                    TaskFinishedCallback callback) {
+  Bundle myExtras = taskParameters.getExtras();
+  // Use |myExtras|.
+  ...
+}
+```
+
+## Background processing
+
+Even though the `BackgroundTaskScheduler` provides functionality for invoking
+code while the application is in the background, the `BackgroundTask` instance
+is still invoked on the application main thread.
+
+This means that unless the operation is extremely quick, processing must happen
+asynchronously, and the call to `onStartJob(...)` must return before the task
+has finished processing. In that case, `onStartJob(...)` must return true, and
+instead invoke the `TaskFinishedCallback` when the processing is finished, which
+typically happens on a different `Thread`, `Handler` or using an `AsyncTask`.
+
+If the task finishes while still being on the main thread, `onStartJob(...)`
+should return false, indicating that no further processsing is required.
+
+If at any time the constraints given through the `TaskInfo` object does not
+hold anymore, or if the system deems it necessary, `onStopTask(...)` will be
+invoked, requiring all activity to cease immediately. The task can return true
+if the task needs to be rescheduled since it was canceled, or false otherwise.
+
+**The system will hold a wakelock from the time `onStartTask(...)` is invoked
+until either the task itself invokes the `TaskFinishedCallback`, or
+`onStopTask(...)` is invoked.**

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java
new file mode 100644
index 0000000..c2fe1a7
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java

@@ -0,0 +1,72 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.content.Context;
+import android.support.annotation.AnyThread;
+import android.support.annotation.MainThread;
+
+/**
+ * Entry point for callbacks from {@link BackgroundTaskScheduler}. Any classes implementing
+ * this interface must have a public constructor which takes no arguments.
+ * The callbacks will be executed on the main thread, which means that execution logic must be
+ * offloaded to another {@link Thread}, {@link android.os.Handler} or {@link android.os.AsyncTask}.
+ */
+public interface BackgroundTask {
+    /**
+     * Callback to invoke whenever background processing has finished after first returning true
+     * from {@link #onStartTask(Context, TaskParameters, TaskFinishedCallback)}.
+     */
+    interface TaskFinishedCallback {
+        /**
+         * Callback to inform the {@link BackgroundTaskScheduler} that the background processing
+         * now has finished. When this callback is invoked, the system will stop holding a wakelock.
+         *
+         * @param needsReschedule whether this task must be rescheduled.
+         */
+        @AnyThread
+        void taskFinished(boolean needsReschedule);
+    }
+
+    /**
+     * Callback from {@link BackgroundTaskScheduler} when your task should start processing.
+     * It is invoked on the main thread, and if your task finishes quickly, you should return false
+     * from this method when you are done processing. If this is a long-running task, you should
+     * return true from this method, and instead invoke the {@link TaskFinishedCallback} when the
+     * processing is finished on some other {@link Thread}, {@link android.os.Handler} or
+     * {@link android.os.AsyncTask}. While this method is running the system holds a wakelock. If
+     * false is returned from this method, the wakelock is immediately released, but if this method
+     * returns true, the wakelock is not released until either the {@link TaskFinishedCallback} is
+     * invoked, or the system calls {@link #onStopTask(Context, TaskParameters)}.
+     *
+     * @param context the current context.
+     * @param taskParameters the data passed in as {@link TaskInfo} when the task was scheduled.
+     * @param callback if the task needs to continue processing after returning from the call to
+     *                 {@link #onStartTask(Context, TaskParameters, TaskFinishedCallback)}, this
+     *                 callback must be invoked when the processing has finished.
+     * @return true if the task needs to continue processing work. False if there is no more work.
+     * @see TaskInfo
+     */
+    @MainThread
+    boolean onStartTask(
+            Context context, TaskParameters taskParameters, TaskFinishedCallback callback);
+
+    /**
+     * Callback from {@link BackgroundTaskScheduler} when the system has determined that the
+     * execution of the task must stop immediately, even before the {@link TaskFinishedCallback}
+     * has been invoked. This will typically happen whenever the required conditions for the task
+     * are no longer met. See {@link TaskInfo}. A wakelock is held by the system while this callback
+     * is invoked, and immediately released after this method returns.
+     *
+     * @param context the current context.
+     * @param taskParameters the data passed in as {@link TaskInfo} when the task was scheduled.
+     * @return true if the task needs to be rescheduled according to the rescheduling criteria
+     * specified when the task was scheduled initially. False if the taskshould not be rescheduled.
+     * Regardless of the value returned, your task must stop executing.
+     * @see TaskInfo
+     */
+    @MainThread
+    boolean onStopTask(Context context, TaskParameters taskParameters);
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java
new file mode 100644
index 0000000..b53b599e
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java

@@ -0,0 +1,104 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.app.job.JobParameters;
+import android.app.job.JobService;
+import android.os.Build;
+
+import org.chromium.base.Log;
+import org.chromium.base.ThreadUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/** Delegates calls out to various tasks that need to run in the background. */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+public class BackgroundTaskJobService extends JobService {
+    private static final String TAG = "BkgrdTaskJS";
+
+    private static class TaskFinishedCallbackJobService
+            implements BackgroundTask.TaskFinishedCallback {
+        private final BackgroundTaskJobService mJobService;
+        private final BackgroundTask mBackgroundTask;
+        private final JobParameters mParams;
+
+        TaskFinishedCallbackJobService(BackgroundTaskJobService jobService,
+                BackgroundTask backgroundTask, JobParameters params) {
+            mJobService = jobService;
+            mBackgroundTask = backgroundTask;
+            mParams = params;
+        }
+
+        @Override
+        public void taskFinished(final boolean needsReschedule) {
+            // Need to remove the current task from the currently running tasks. All other access
+            // happens on the main thread, so do this removal also on the main thread.
+            // To ensure that a new job is not immediately scheduled in between removing the task
+            // from being a current task and before calling jobFinished, leading to us finishing
+            // something with the same ID, call
+            // {@link JobService#jobFinished(JobParameters, boolean} also on the main thread.
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    if (!isCurrentBackgroundTaskForJobId()) {
+                        Log.e(TAG, "Tried finishing non-current BackgroundTask.");
+                        return;
+                    }
+
+                    mJobService.mCurrentTasks.remove(mParams.getJobId());
+                    mJobService.jobFinished(mParams, needsReschedule);
+                }
+            });
+        }
+
+        private boolean isCurrentBackgroundTaskForJobId() {
+            return mJobService.mCurrentTasks.get(mParams.getJobId()) == mBackgroundTask;
+        }
+    }
+
+    private final Map<Integer, BackgroundTask> mCurrentTasks = new HashMap<>();
+
+    @Override
+    public boolean onStartJob(JobParameters params) {
+        ThreadUtils.assertOnUiThread();
+        BackgroundTask backgroundTask =
+                BackgroundTaskSchedulerJobService.getBackgroundTaskFromJobParameters(params);
+        if (backgroundTask == null) {
+            Log.w(TAG, "Failed to start task. Could not instantiate class.");
+            return false;
+        }
+
+        mCurrentTasks.put(params.getJobId(), backgroundTask);
+
+        TaskParameters taskParams =
+                BackgroundTaskSchedulerJobService.getTaskParametersFromJobParameters(params);
+        boolean taskNeedsBackgroundProcessing = backgroundTask.onStartTask(getApplicationContext(),
+                taskParams, new TaskFinishedCallbackJobService(this, backgroundTask, params));
+
+        if (!taskNeedsBackgroundProcessing) mCurrentTasks.remove(params.getJobId());
+        return taskNeedsBackgroundProcessing;
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+        ThreadUtils.assertOnUiThread();
+        if (!mCurrentTasks.containsKey(params.getJobId())) {
+            Log.w(TAG, "Failed to stop job, because job with job id " + params.getJobId()
+                            + " does not exist.");
+            return false;
+        }
+
+        BackgroundTask backgroundTask = mCurrentTasks.get(params.getJobId());
+
+        TaskParameters taskParams =
+                BackgroundTaskSchedulerJobService.getTaskParametersFromJobParameters(params);
+        boolean taskNeedsReschedule =
+                backgroundTask.onStopTask(getApplicationContext(), taskParams);
+        mCurrentTasks.remove(params.getJobId());
+        return taskNeedsReschedule;
+    }
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java
new file mode 100644
index 0000000..ea633c01
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java

@@ -0,0 +1,91 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.Nullable;
+
+import org.chromium.base.Log;
+import org.chromium.base.ThreadUtils;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * A BackgroundTaskScheduler which is used to schedule jobs that run in the background.
+ * It is backed by system APIs ({@link android.app.job.JobScheduler}) on newer platforms
+ * and by GCM ({@link com.google.android.gms.gcm.GcmNetworkManager}) on older platforms.
+ *
+ * To get an instance of this class, use {@link BackgroundTaskSchedulerFactory#getScheduler()}.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+public class BackgroundTaskScheduler {
+    private static final String TAG = "BkgrdTaskScheduler";
+
+    @Nullable
+    static BackgroundTask getBackgroundTaskFromClassName(String backgroundTaskClassName) {
+        if (backgroundTaskClassName == null) return null;
+
+        Class<?> clazz;
+        try {
+            clazz = Class.forName(backgroundTaskClassName);
+        } catch (ClassNotFoundException e) {
+            Log.w(TAG, "Unable to find BackgroundTask class with name " + backgroundTaskClassName);
+            return null;
+        }
+
+        if (!BackgroundTask.class.isAssignableFrom(clazz)) {
+            Log.w(TAG, "Class " + clazz + " is not a BackgroundTask");
+            return null;
+        }
+
+        try {
+            return (BackgroundTask) clazz.newInstance();
+        } catch (InstantiationException | IllegalAccessException e) {
+            Log.w(TAG, "Unable to instantiate class " + clazz);
+            return null;
+        }
+    }
+
+    static boolean hasParameterlessPublicConstructor(Class<? extends BackgroundTask> clazz) {
+        for (Constructor<?> constructor : clazz.getConstructors()) {
+            if (constructor.getParameterTypes().length == 0) return true;
+        }
+        return false;
+    }
+
+    private final BackgroundTaskSchedulerDelegate mSchedulerDelegate;
+
+    BackgroundTaskScheduler(BackgroundTaskSchedulerDelegate schedulerDelegate) {
+        assert schedulerDelegate != null;
+        mSchedulerDelegate = schedulerDelegate;
+    }
+
+    /**
+     * Schedules a background task. See {@link TaskInfo} for information on what types of tasks that
+     * can be scheduled.
+     *
+     * @param context the current context.
+     * @param taskInfo the information about the task to be scheduled.
+     * @return true if the schedule operation succeeded, and false otherwise.
+     * @see TaskInfo
+     */
+    public boolean schedule(Context context, TaskInfo taskInfo) {
+        ThreadUtils.assertOnUiThread();
+        return mSchedulerDelegate.schedule(context, taskInfo);
+    }
+
+    /**
+     * Cancels the task specified by the task ID.
+     *
+     * @param context the current context.
+     * @param taskId the ID of the task to cancel. See {@link TaskIds} for a list.
+     */
+    public void cancel(Context context, int taskId) {
+        ThreadUtils.assertOnUiThread();
+        mSchedulerDelegate.cancel(context, taskId);
+    }
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerDelegate.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerDelegate.java
new file mode 100644
index 0000000..87538f9
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerDelegate.java

@@ -0,0 +1,33 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.content.Context;
+
+/**
+ * The internal representation of a {@link BackgroundTaskScheduler} to make it possible to use
+ * system APIs ({@link android.app.job.JobScheduler} on newer platforms and GCM
+ * ({@link com.google.android.gms.gcm.GcmNetworkManager}) on older platforms.
+ */
+interface BackgroundTaskSchedulerDelegate {
+    /**
+     * Schedules a background task. See {@link TaskInfo} for information on what types of tasks that
+     * can be scheduled.
+     *
+     * @param context the current context.
+     * @param taskInfo the information about the task to be scheduled.
+     * @return true if the schedule operation succeeded, and false otherwise.
+     * @see TaskInfo
+     */
+    boolean schedule(Context context, TaskInfo taskInfo);
+
+    /**
+     * Cancels the task specified by the task ID.
+     *
+     * @param context the current context.
+     * @param taskId the ID of the task to cancel. See {@link TaskIds} for a list.
+     */
+    void cancel(Context context, int taskId);
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
new file mode 100644
index 0000000..239e855
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java

@@ -0,0 +1,39 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+
+import org.chromium.base.ThreadUtils;
+
+/**
+ * A factory for {@link BackgroundTaskScheduler} that ensures there is only ever a single instance.
+ */
+public final class BackgroundTaskSchedulerFactory {
+    private static BackgroundTaskScheduler sInstance;
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private static BackgroundTaskSchedulerDelegate getSchedulerDelegate() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return new BackgroundTaskSchedulerJobService();
+        } else {
+            throw new RuntimeException("Not able to schedule through GCM yet.");
+        }
+    }
+
+    /**
+     * @return the current instance of the {@link BackgroundTaskScheduler}. Creates one if none
+     * exist.
+     */
+    public static BackgroundTaskScheduler getScheduler() {
+        ThreadUtils.assertOnUiThread();
+        if (sInstance == null) sInstance = new BackgroundTaskScheduler(getSchedulerDelegate());
+        return sInstance;
+    }
+
+    // Do not instantiate.
+    private BackgroundTaskSchedulerFactory() {}
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobService.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobService.java
new file mode 100644
index 0000000..cf86dda
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobService.java

@@ -0,0 +1,159 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+
+import org.chromium.base.Log;
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.VisibleForTesting;
+
+/**
+ * An implementation of {@link BackgroundTaskSchedulerDelegate} that uses the system
+ * {@link JobScheduler} to schedule jobs.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+class BackgroundTaskSchedulerJobService implements BackgroundTaskSchedulerDelegate {
+    private static final String TAG = "BkgrdTaskSchedulerJS";
+
+    private static final String BACKGROUND_TASK_CLASS_KEY = "_background_task_class";
+    @VisibleForTesting
+    static final String BACKGROUND_TASK_EXTRAS_KEY = "_background_task_extras";
+
+    static BackgroundTask getBackgroundTaskFromJobParameters(JobParameters jobParameters) {
+        String backgroundTaskClassName = getBackgroundTaskClassFromJobParameters(jobParameters);
+        return BackgroundTaskScheduler.getBackgroundTaskFromClassName(backgroundTaskClassName);
+    }
+
+    private static String getBackgroundTaskClassFromJobParameters(JobParameters jobParameters) {
+        PersistableBundle extras = jobParameters.getExtras();
+        if (extras == null) return null;
+        return extras.getString(BACKGROUND_TASK_CLASS_KEY);
+    }
+
+    /**
+     * Retrieves the {@link TaskParameters} from the {@link JobParameters}, which are passed as
+     * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
+     * values are stripped at the time when the task is scheduled.
+     *
+     * @param jobParameters the {@link JobParameters} to extract the {@link TaskParameters} from.
+     * @return the {@link TaskParameters} for the current job.
+     */
+    static TaskParameters getTaskParametersFromJobParameters(JobParameters jobParameters) {
+        TaskParameters.Builder builder = TaskParameters.create(jobParameters.getJobId());
+
+        PersistableBundle jobExtras = jobParameters.getExtras();
+        PersistableBundle persistableTaskExtras =
+                jobExtras.getPersistableBundle(BACKGROUND_TASK_EXTRAS_KEY);
+
+        Bundle taskExtras = new Bundle();
+        taskExtras.putAll(persistableTaskExtras);
+        builder.addExtras(taskExtras);
+
+        return builder.build();
+    }
+
+    @VisibleForTesting
+    static JobInfo createJobInfoFromTaskInfo(Context context, TaskInfo taskInfo) {
+        PersistableBundle jobExtras = new PersistableBundle();
+        jobExtras.putString(BACKGROUND_TASK_CLASS_KEY, taskInfo.getBackgroundTaskClass().getName());
+
+        PersistableBundle persistableBundle = getTaskExtrasAsPersistableBundle(taskInfo);
+        jobExtras.putPersistableBundle(BACKGROUND_TASK_EXTRAS_KEY, persistableBundle);
+
+        JobInfo.Builder builder =
+                new JobInfo
+                        .Builder(taskInfo.getTaskId(),
+                                new ComponentName(context, BackgroundTaskJobService.class))
+                        .setExtras(jobExtras)
+                        .setPersisted(taskInfo.isPersisted())
+                        .setRequiresCharging(taskInfo.requiresCharging())
+                        .setRequiredNetworkType(getJobInfoNetworkTypeFromTaskNetworkType(
+                                taskInfo.getRequiredNetworkType()));
+
+        if (taskInfo.isPeriodic()) {
+            builder = getPeriodicJobInfo(builder, taskInfo);
+        } else {
+            builder = getOneOffJobInfo(builder, taskInfo);
+        }
+
+        return builder.build();
+    }
+
+    private static JobInfo.Builder getOneOffJobInfo(JobInfo.Builder builder, TaskInfo taskInfo) {
+        TaskInfo.OneOffInfo oneOffInfo = taskInfo.getOneOffInfo();
+        if (oneOffInfo.hasWindowStartTimeConstraint()) {
+            builder = builder.setMinimumLatency(oneOffInfo.getWindowStartTimeMs());
+        }
+        return builder.setOverrideDeadline(oneOffInfo.getWindowEndTimeMs());
+    }
+
+    private static JobInfo.Builder getPeriodicJobInfo(JobInfo.Builder builder, TaskInfo taskInfo) {
+        TaskInfo.PeriodicInfo periodicInfo = taskInfo.getPeriodicInfo();
+        if (periodicInfo.hasFlex()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                return builder.setPeriodic(periodicInfo.getIntervalMs(), periodicInfo.getFlexMs());
+            }
+            return builder.setPeriodic(periodicInfo.getIntervalMs());
+        }
+        return builder.setPeriodic(periodicInfo.getIntervalMs());
+    }
+
+    private static int getJobInfoNetworkTypeFromTaskNetworkType(
+            @TaskInfo.NetworkType int networkType) {
+        // The values are hard coded to represent the same as the network type from JobService.
+        return networkType;
+    }
+
+    private static PersistableBundle getTaskExtrasAsPersistableBundle(TaskInfo taskInfo) {
+        Bundle taskExtras = taskInfo.getExtras();
+        BundleToPersistableBundleConverter.Result convertedData =
+                BundleToPersistableBundleConverter.convert(taskExtras);
+        if (convertedData.hasErrors()) {
+            Log.w(TAG, "Failed converting extras to PersistableBundle: "
+                            + convertedData.getFailedKeysErrorString());
+        }
+        return convertedData.getPersistableBundle();
+    }
+
+    @Override
+    public boolean schedule(Context context, TaskInfo taskInfo) {
+        ThreadUtils.assertOnUiThread();
+        if (!BackgroundTaskScheduler.hasParameterlessPublicConstructor(
+                    taskInfo.getBackgroundTaskClass())) {
+            Log.e(TAG, "BackgroundTask " + taskInfo.getBackgroundTaskClass()
+                            + " has no parameterless public constructor.");
+            return false;
+        }
+
+        JobInfo jobInfo = createJobInfoFromTaskInfo(context, taskInfo);
+
+        JobScheduler jobScheduler =
+                (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+
+        if (taskInfo.shouldUpdateCurrent()) {
+            jobScheduler.cancel(taskInfo.getTaskId());
+        }
+
+        int result = jobScheduler.schedule(jobInfo);
+        return result == JobScheduler.RESULT_SUCCESS;
+    }
+
+    @Override
+    public void cancel(Context context, int taskId) {
+        ThreadUtils.assertOnUiThread();
+        JobScheduler jobScheduler =
+                (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+        jobScheduler.cancel(taskId);
+    }
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverter.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverter.java
new file mode 100644
index 0000000..1ae24f55
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverter.java

@@ -0,0 +1,112 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.annotation.NonNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Converts from {@link Bundle} to {@link PersistableBundle}.
+ *
+ * The {@link android.app.job.JobScheduler} API requires the use of {@link PersistableBundle} in
+ * the {@link android.app.job.JobInfo}, but that was added in API 21 (Lollipop). A later change
+ * related to booleans means that this class required API 22 (Lollipop MR1).
+ * the API of the {@link BackgroundTaskScheduler} needs to take a {@link Bundle}, but convert it to
+ * a {@link PersistableBundle} in the case of using {@link android.app.job.JobScheduler} as the
+ * backend for scheduling.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+class BundleToPersistableBundleConverter {
+    /**
+     * A Result which contains the resulting {@link PersistableBundle} after a conversion, and also
+     * contains a set of all the failed keys.
+     */
+    static class Result {
+        @NonNull
+        private final PersistableBundle mBundle;
+        @NonNull
+        private final Set<String> mFailedKeys;
+
+        private Result(@NonNull PersistableBundle bundle, @NonNull Set<String> failedKeys) {
+            mBundle = bundle;
+            mFailedKeys = failedKeys;
+        }
+
+        boolean hasErrors() {
+            return mFailedKeys.size() > 0;
+        }
+
+        @NonNull
+        PersistableBundle getPersistableBundle() {
+            return mBundle;
+        }
+
+        @NonNull
+        Set<String> getFailedKeys() {
+            return mFailedKeys;
+        }
+
+        String getFailedKeysErrorString() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("{");
+            boolean first = true;
+            for (String key : mFailedKeys) {
+                if (!first) sb.append(", ");
+                first = false;
+
+                sb.append(key);
+            }
+            sb.append("}");
+            return sb.toString();
+        }
+    }
+
+    /**
+     * Copy all entries in the {@link Bundle} that can be part of a {@link PersistableBundle}.
+     *
+     * @param bundle the {@link Bundle} to convert.
+     * @return a result object contain the resulting {@link PersistableBundle} and whether any of
+     *         the keys failed.
+     */
+    static Result convert(Bundle bundle) {
+        PersistableBundle persistableBundle = new PersistableBundle();
+        Set<String> failedKeys = new HashSet<>();
+        for (String key : bundle.keySet()) {
+            Object obj = bundle.get(key);
+            if (obj == null) {
+                persistableBundle.putString(key, null);
+            } else if (obj instanceof Boolean) {
+                persistableBundle.putBoolean(key, (Boolean) obj);
+            } else if (obj instanceof boolean[]) {
+                persistableBundle.putBooleanArray(key, (boolean[]) obj);
+            } else if (obj instanceof Double) {
+                persistableBundle.putDouble(key, (Double) obj);
+            } else if (obj instanceof double[]) {
+                persistableBundle.putDoubleArray(key, (double[]) obj);
+            } else if (obj instanceof Integer) {
+                persistableBundle.putInt(key, (Integer) obj);
+            } else if (obj instanceof int[]) {
+                persistableBundle.putIntArray(key, (int[]) obj);
+            } else if (obj instanceof Long) {
+                persistableBundle.putLong(key, (Long) obj);
+            } else if (obj instanceof long[]) {
+                persistableBundle.putLongArray(key, (long[]) obj);
+            } else if (obj instanceof String) {
+                persistableBundle.putString(key, (String) obj);
+            } else if (obj instanceof String[]) {
+                persistableBundle.putStringArray(key, (String[]) obj);
+            } else {
+                failedKeys.add(key);
+            }
+        }
+        return new Result(persistableBundle, failedKeys);
+    }
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/OWNERS b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/OWNERS
new file mode 100644
index 0000000..1b5e9bc
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/OWNERS

@@ -0,0 +1,3 @@
+# Everyone can add new TaskIds. For structural changes, ask component OWNERS.
+per-file TaskIds.java=*
+

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java
new file mode 100644
index 0000000..72540e5
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskIds.java

@@ -0,0 +1,15 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+/**
+ * This class lists all the unique task IDs used around in Chromium. These are listed here to ensure
+ * that there is no overlap of task IDs between different users of the BackgroundTaskScheduler.
+ */
+public final class TaskIds {
+    public static final int TEST = 0x00008378;
+
+    private TaskIds() {}
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskInfo.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskInfo.java
new file mode 100644
index 0000000..ed78922b
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskInfo.java

@@ -0,0 +1,529 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * TaskInfo represents a request to run a specific {@link BackgroundTask} given the required
+ * parameters, such as whether a special type of network is available.
+ */
+public class TaskInfo {
+    /**
+     * Specifies information regarding one-off tasks.
+     * This is part of a {@link TaskInfo} iff the task is NOT a periodic task.
+     */
+    public static class OneOffInfo {
+        private final long mWindowStartTimeMs;
+        private final long mWindowEndTimeMs;
+        private final boolean mHasWindowStartTimeConstraint;
+
+        private OneOffInfo(long windowStartTimeMs, long windowEndTimeMs,
+                boolean hasWindowStartTimeConstraint) {
+            mWindowStartTimeMs = windowStartTimeMs;
+            mWindowEndTimeMs = windowEndTimeMs;
+            mHasWindowStartTimeConstraint = hasWindowStartTimeConstraint;
+        }
+
+        /**
+         * @return the start of the window that the task can begin executing as a delta in
+         * milliseconds from now.
+         */
+        public long getWindowStartTimeMs() {
+            return mWindowStartTimeMs;
+        }
+
+        /**
+         * @return the end of the window that the task can begin executing as a delta in
+         * milliseconds from now.
+         */
+        public long getWindowEndTimeMs() {
+            return mWindowEndTimeMs;
+        }
+
+        /**
+         * @return whether this one-off task has a window start time constraint.
+         */
+        public boolean hasWindowStartTimeConstraint() {
+            return mHasWindowStartTimeConstraint;
+        }
+
+        @Override
+        public String toString() {
+            return "{windowStartTimeMs: " + mWindowStartTimeMs + ", windowEndTimeMs: "
+                    + mWindowEndTimeMs + "}";
+        }
+    }
+
+    /**
+     * Specifies information regarding periodic tasks.
+     * This is part of a {@link TaskInfo} iff the task is a periodic task.
+     */
+    public static class PeriodicInfo {
+        private final long mIntervalMs;
+        private final long mFlexMs;
+        private final boolean mHasFlex;
+
+        private PeriodicInfo(long intervalMs, long flexMs, boolean hasFlex) {
+            mIntervalMs = intervalMs;
+            mFlexMs = flexMs;
+            mHasFlex = hasFlex;
+        }
+
+        /**
+         * @return the interval between occurrences of this task in milliseconds.
+         */
+        public long getIntervalMs() {
+            return mIntervalMs;
+        }
+
+        /**
+         * @return the flex time for this task. The task can execute at any time in a window of flex
+         * length at the end of the period. It is reported in milliseconds.
+         */
+        public long getFlexMs() {
+            return mFlexMs;
+        }
+
+        /**
+         * @return true whether this task has defined a flex time. False otherwise.
+         */
+        public boolean hasFlex() {
+            return mHasFlex;
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder("{");
+            sb.append("{");
+            sb.append("intervalMs: ").append(mIntervalMs);
+            if (mHasFlex) {
+                sb.append(", flexMs: ").append(mFlexMs);
+            }
+            sb.append("}");
+            return sb.toString();
+        }
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({NETWORK_TYPE_NONE, NETWORK_TYPE_ANY, NETWORK_TYPE_UNMETERED})
+    public @interface NetworkType {}
+
+    /**
+     * This task has no requirements for network connectivity. Default.
+     *
+     * @see NetworkType
+     */
+    public static final int NETWORK_TYPE_NONE = 0;
+    /**
+     * This task requires network connectivity.
+     *
+     * @see NetworkType
+     */
+    public static final int NETWORK_TYPE_ANY = 1;
+    /**
+     * This task requires network connectivity that is unmetered.
+     *
+     * @see NetworkType
+     */
+    public static final int NETWORK_TYPE_UNMETERED = 2;
+
+    /**
+     * The task ID should be unique across all tasks. A list of such unique IDs exists in
+     * {@link TaskIds}.
+     */
+    private final int mTaskId;
+
+    /**
+     * The {@link BackgroundTask} to invoke when this task is run.
+     */
+    @NonNull
+    private final Class<? extends BackgroundTask> mBackgroundTaskClass;
+
+    /**
+     * The extras to provide to the {@link BackgroundTask} when it is run.
+     */
+    @NonNull
+    private final Bundle mExtras;
+
+    /**
+     * The type of network the task requires to run.
+     */
+    @NetworkType
+    private final int mRequiredNetworkType;
+
+    /**
+     * Whether the task requires charging to run.
+     */
+    private final boolean mRequiresCharging;
+
+    /**
+     * Whether or not to persist this task across device reboots.
+     */
+    private final boolean mIsPersisted;
+
+    /**
+     * Whether this task should override any preexisting tasks with the same task id.
+     */
+    private final boolean mUpdateCurrent;
+
+    /**
+     * Whether this task is periodic.
+     */
+    private final boolean mIsPeriodic;
+
+    /**
+     * Task information regarding one-off tasks. Non-null iff {@link #mIsPeriodic} is false.
+     */
+    private final OneOffInfo mOneOffInfo;
+
+    /**
+     * Task information regarding periodic tasks. Non-null iff {@link #mIsPeriodic} is true.
+     */
+    private final PeriodicInfo mPeriodicInfo;
+
+    private TaskInfo(Builder builder) {
+        mTaskId = builder.mTaskId;
+        mBackgroundTaskClass = builder.mBackgroundTaskClass;
+        mExtras = builder.mExtras == null ? new Bundle() : builder.mExtras;
+        mRequiredNetworkType = builder.mRequiredNetworkType;
+        mRequiresCharging = builder.mRequiresCharging;
+        mIsPersisted = builder.mIsPersisted;
+        mUpdateCurrent = builder.mUpdateCurrent;
+        mIsPeriodic = builder.mIsPeriodic;
+        if (mIsPeriodic) {
+            mOneOffInfo = null;
+            mPeriodicInfo =
+                    new PeriodicInfo(builder.mIntervalMs, builder.mFlexMs, builder.mHasFlex);
+        } else {
+            mOneOffInfo = new OneOffInfo(builder.mWindowStartTimeMs, builder.mWindowEndTimeMs,
+                    builder.mHasWindowStartTimeConstraint);
+            mPeriodicInfo = null;
+        }
+    }
+
+    /**
+     * @return the unique ID of this task.
+     */
+    public int getTaskId() {
+        return mTaskId;
+    }
+
+    /**
+     * @return the {@link BackgroundTask} class that will be instantiated for this task.
+     */
+    @NonNull
+    public Class<? extends BackgroundTask> getBackgroundTaskClass() {
+        return mBackgroundTaskClass;
+    }
+
+    /**
+     * @return the extras that will be provided to the {@link BackgroundTask}.
+     */
+    @NonNull
+    public Bundle getExtras() {
+        return mExtras;
+    }
+
+    /**
+     * @return the type of network the task requires to run.
+     */
+    @NetworkType
+    public int getRequiredNetworkType() {
+        return mRequiredNetworkType;
+    }
+
+    /**
+     * @return whether the task requires charging to run.
+     */
+    public boolean requiresCharging() {
+        return mRequiresCharging;
+    }
+
+    /**
+     * @return whether or not to persist this task across device reboots.
+     */
+    public boolean isPersisted() {
+        return mIsPersisted;
+    }
+
+    /**
+     * @return whether this task should override any preexisting tasks with the same task id.
+     */
+    public boolean shouldUpdateCurrent() {
+        return mUpdateCurrent;
+    }
+
+    /**
+     * @return Whether or not this task is a periodic task.
+     */
+    public boolean isPeriodic() {
+        return mIsPeriodic;
+    }
+
+    /**
+    * This is part of a {@link TaskInfo} iff the task is NOT a periodic task, i.e.
+    * {@link TaskInfo#isPeriodic()} returns false.
+    *
+    * @return the specific data that is only available for one-off tasks.
+    */
+    public OneOffInfo getOneOffInfo() {
+        return mOneOffInfo;
+    }
+
+    /**
+     * This is part of a {@link TaskInfo} iff the task is a periodic task, i.e.
+     * {@link TaskInfo#isPeriodic()} returns true.
+     *
+     * @return the specific data that is only available for periodic tasks.
+     */
+    public PeriodicInfo getPeriodicInfo() {
+        return mPeriodicInfo;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        sb.append("taskId: ").append(mTaskId);
+        sb.append(", backgroundTaskClass: ").append(mBackgroundTaskClass);
+        sb.append(", extras: ").append(mExtras);
+        sb.append(", requiredNetworkType: ").append(mRequiredNetworkType);
+        sb.append(", requiresCharging: ").append(mRequiresCharging);
+        sb.append(", isPersisted: ").append(mIsPersisted);
+        sb.append(", updateCurrent: ").append(mUpdateCurrent);
+        sb.append(", isPeriodic: ").append(mIsPeriodic);
+        if (isPeriodic()) {
+            sb.append(", periodicInfo: ").append(mPeriodicInfo);
+        } else {
+            sb.append(", oneOffInfo: ").append(mOneOffInfo);
+        }
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Schedule a one-off task to execute within a deadline. If windowEndTimeMs is 0, the task will
+     * run as soon as possible. For executing a task within a time window, see
+     * {@link #createOneOffTask(int, Class, long, long)}.
+     *
+     * @param taskId the unique task ID for this task. Should be listed in {@link TaskIds}.
+     * @param backgroundTaskClass the {@link BackgroundTask} class that will be instantiated for
+     * this task.
+     * @param windowEndTimeMs the end of the window that the task can begin executing as a delta in
+     * milliseconds from now.
+     * @return the builder which can be used to continue configuration and {@link Builder#build()}.
+     * @see TaskIds
+     */
+    public static Builder createOneOffTask(
+            int taskId, Class<? extends BackgroundTask> backgroundTaskClass, long windowEndTimeMs) {
+        return new Builder(taskId, backgroundTaskClass, false).setWindowEndTimeMs(windowEndTimeMs);
+    }
+
+    /**
+     * Schedule a one-off task to execute within a time window. For executing a task within a
+     * deadline, see {@link #createOneOffTask(int, Class, long)},
+     *
+     * @param taskId the unique task ID for this task. Should be listed in {@link TaskIds}.
+     * @param backgroundTaskClass the {@link BackgroundTask} class that will be instantiated for
+     * this task.
+     * @param windowStartTimeMs the start of the window that the task can begin executing as a delta
+     * in milliseconds from now.
+     * @param windowEndTimeMs the end of the window that the task can begin executing as a delta in
+     * milliseconds from now.
+     * @return the builder which can be used to continue configuration and {@link Builder#build()}.
+     * @see TaskIds
+     */
+    public static Builder createOneOffTask(int taskId,
+            Class<? extends BackgroundTask> backgroundTaskClass, long windowStartTimeMs,
+            long windowEndTimeMs) {
+        return new Builder(taskId, backgroundTaskClass, false)
+                .setWindowStartTimeMs(windowStartTimeMs)
+                .setWindowEndTimeMs(windowEndTimeMs);
+    }
+
+    /**
+     * Schedule a periodic task that will recur at the specified interval, without the need to
+     * be rescheduled. The task will continue to recur until
+     * {@link BackgroundTaskScheduler#cancel(Context, int)} is invoked with the task ID from this
+     * {@link TaskInfo}.
+     *
+     * @param taskId the unique task ID for this task. Should be listed in {@link TaskIds}.
+     * @param backgroundTaskClass the {@link BackgroundTask} class that will be instantiated for
+     * this task.
+     * @param intervalMs the interval between occurrences of this task in milliseconds.
+     * @return the builder which can be used to continue configuration and {@link Builder#build()}.
+     * @see TaskIds
+     */
+    public static Builder createPeriodicTask(
+            int taskId, Class<? extends BackgroundTask> backgroundTaskClass, long intervalMs) {
+        return new Builder(taskId, backgroundTaskClass, true).setIntervalMs(intervalMs);
+    }
+
+    /**
+     * Schedule a periodic task that will recur at the specified interval, without the need to
+     * be rescheduled. The task will continue to recur until
+     * {@link BackgroundTaskScheduler#cancel(Context, int)} is invoked with the task ID from this
+     * {@link TaskInfo}.
+     * The flex time specifies how close to the end of the interval you are willing to execute.
+     * Instead of executing at the exact interval, the task will execute at the interval or up to
+     * flex milliseconds before.
+     *
+     * @param taskId the unique task ID for this task. Should be listed in {@link TaskIds}.
+     * @param backgroundTaskClass the {@link BackgroundTask} class that will be instantiated for
+     * this task.
+     * @param intervalMs the interval between occurrences of this task in milliseconds.
+     * @param flexMs the flex time for this task. The task can execute at any time in a window of
+     * flex
+     * length at the end of the period. It is reported in milliseconds.
+     * @return the builder which can be used to continue configuration and {@link Builder#build()}.
+     * @see TaskIds
+     */
+    public static Builder createPeriodicTask(int taskId,
+            Class<? extends BackgroundTask> backgroundTaskClass, long intervalMs, long flexMs) {
+        return new Builder(taskId, backgroundTaskClass, true)
+                .setIntervalAndFlexMs(intervalMs, flexMs);
+    }
+
+    /**
+     * A helper builder to provide a way to build {@link TaskInfo}. To create a {@link Builder}
+     * use one of the create* class method on {@link TaskInfo}.
+     *
+     * @see #createOneOffTask(int, Class, long)
+     * @see #createOneOffTask(int, Class, long, long)
+     * @see #createPeriodicTask(int, Class, long)
+     * @see #createPeriodicTask(int, Class, long, long)
+     */
+    public static final class Builder {
+        private final int mTaskId;
+        @NonNull
+        private final Class<? extends BackgroundTask> mBackgroundTaskClass;
+        private final boolean mIsPeriodic;
+        private Bundle mExtras;
+        @NetworkType
+        private int mRequiredNetworkType;
+        private boolean mRequiresCharging;
+        private boolean mIsPersisted;
+        private boolean mUpdateCurrent;
+
+        // Data about one-off tasks.
+        private long mWindowStartTimeMs;
+        private long mWindowEndTimeMs;
+        private boolean mHasWindowStartTimeConstraint;
+
+        // Data about periodic tasks.
+        private long mIntervalMs;
+        private long mFlexMs;
+        private boolean mHasFlex;
+
+        Builder(int taskId, @NonNull Class<? extends BackgroundTask> backgroundTaskClass,
+                boolean isPeriodic) {
+            mTaskId = taskId;
+            mBackgroundTaskClass = backgroundTaskClass;
+            mIsPeriodic = isPeriodic;
+        }
+
+        Builder setWindowStartTimeMs(long windowStartTimeMs) {
+            assert !mIsPeriodic;
+            mWindowStartTimeMs = windowStartTimeMs;
+            mHasWindowStartTimeConstraint = true;
+            return this;
+        }
+
+        Builder setWindowEndTimeMs(long windowEndTimeMs) {
+            assert !mIsPeriodic;
+            mWindowEndTimeMs = windowEndTimeMs;
+            return this;
+        }
+
+        Builder setIntervalMs(long intervalMs) {
+            assert mIsPeriodic;
+            mIntervalMs = intervalMs;
+            return this;
+        }
+
+        Builder setIntervalAndFlexMs(long intervalMs, long flexMs) {
+            assert mIsPeriodic;
+            mIntervalMs = intervalMs;
+            mFlexMs = flexMs;
+            mHasFlex = true;
+            return this;
+        }
+
+        /**
+         * Set the optional extra values necessary for this task. Must only ever contain simple
+         * values supported by {@link android.os.BaseBundle}. All other values are thrown away.
+         * If the extras for this builder are not set, or set to null, the resulting
+         * {@link TaskInfo} will have an empty bundle (i.e. not null).
+         *
+         * @param bundle the bundle of extra values necessary for this task.
+         * @return this {@link Builder}.
+         */
+        public Builder setExtras(Bundle bundle) {
+            mExtras = bundle;
+            return this;
+        }
+
+        /**
+         * Set the type of network the task requires to run.
+         *
+         * @param networkType the {@link NetworkType} required for this task.
+         * @return this {@link Builder}.
+         */
+        public Builder setRequiredNetworkType(@NetworkType int networkType) {
+            mRequiredNetworkType = networkType;
+            return this;
+        }
+
+        /**
+         * Set whether the task requires charging to run.
+         *
+         * @param requiresCharging true if this task requires charging.
+         * @return this {@link Builder}.
+         */
+        public Builder setRequiresCharging(boolean requiresCharging) {
+            mRequiresCharging = requiresCharging;
+            return this;
+        }
+
+        /**
+         * Set whether or not to persist this task across device reboots.
+         *
+         * @param isPersisted true if this task should be persisted across reboots.
+         * @return this {@link Builder}.
+         */
+        public Builder setIsPersisted(boolean isPersisted) {
+            mIsPersisted = isPersisted;
+            return this;
+        }
+
+        /**
+         * Set whether this task should override any preexisting tasks with the same task id.
+         *
+         * @param updateCurrent true if this task should overwrite a currently existing task with
+         *                      the same ID, if it exists.
+         * @return this {@link Builder}.
+         */
+        public Builder setUpdateCurrent(boolean updateCurrent) {
+            mUpdateCurrent = updateCurrent;
+            return this;
+        }
+
+        /**
+         * Build the {@link TaskInfo object} specified by this builder.
+         *
+         * @return the {@link TaskInfo} object.
+         */
+        public TaskInfo build() {
+            return new TaskInfo(this);
+        }
+    }
+}

diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskParameters.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskParameters.java
new file mode 100644
index 0000000..f389e1e5
--- /dev/null
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/TaskParameters.java

@@ -0,0 +1,61 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+
+/**
+ * TaskParameters are passed to {@link BackgroundTask}s whenever they are invoked. It contains the
+ * task ID and the extras that the caller of
+ * {@link BackgroundTaskScheduler#schedule(Context, TaskInfo)} passed in with the {@link TaskInfo}.
+ */
+public class TaskParameters {
+    private final int mTaskId;
+    private final Bundle mExtras;
+
+    private TaskParameters(Builder builder) {
+        mTaskId = builder.mTaskId;
+        mExtras = builder.mExtras == null ? new Bundle() : builder.mExtras;
+    }
+
+    /**
+     * @return the task ID.
+     */
+    public int getTaskId() {
+        return mTaskId;
+    }
+
+    /**
+     * @return the extras for this task.
+     */
+    @NonNull
+    public Bundle getExtras() {
+        return mExtras;
+    }
+
+    static Builder create(int taskId) {
+        return new Builder(taskId);
+    }
+
+    static final class Builder {
+        private final int mTaskId;
+        private Bundle mExtras;
+
+        Builder(int taskId) {
+            mTaskId = taskId;
+        }
+
+        Builder addExtras(Bundle extras) {
+            mExtras = extras;
+            return this;
+        }
+
+        TaskParameters build() {
+            return new TaskParameters(this);
+        }
+    }
+}

diff --git a/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobServiceTest.java b/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobServiceTest.java
new file mode 100644
index 0000000..9be58ec0
--- /dev/null
+++ b/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerJobServiceTest.java

@@ -0,0 +1,137 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.test.filters.SmallTest;
+import android.test.InstrumentationTestCase;
+
+import org.chromium.base.test.util.MinAndroidSdkLevel;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for {@link BackgroundTaskSchedulerJobService}.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
+public class BackgroundTaskSchedulerJobServiceTest extends InstrumentationTestCase {
+    private static class TestBackgroundTask implements BackgroundTask {
+        @Override
+        public boolean onStartTask(
+                Context context, TaskParameters taskParameters, TaskFinishedCallback callback) {
+            return false;
+        }
+
+        @Override
+        public boolean onStopTask(Context context, TaskParameters taskParameters) {
+            return false;
+        }
+    }
+
+    @SmallTest
+    public void testOneOffTaskInfoWithDeadlineConversion() {
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TimeUnit.MINUTES.toMillis(200))
+                                      .build();
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), oneOffTask);
+        assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
+        assertFalse(jobInfo.isPeriodic());
+        assertEquals(oneOffTask.getOneOffInfo().getWindowEndTimeMs(),
+                jobInfo.getMaxExecutionDelayMillis());
+    }
+
+    @SmallTest
+    public void testOneOffTaskInfoWithWindowConversion() {
+        TaskInfo oneOffTask =
+                TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                TimeUnit.MINUTES.toMillis(100), TimeUnit.MINUTES.toMillis(200))
+                        .build();
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), oneOffTask);
+        assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
+        assertFalse(jobInfo.isPeriodic());
+        assertEquals(
+                oneOffTask.getOneOffInfo().getWindowStartTimeMs(), jobInfo.getMinLatencyMillis());
+        assertEquals(oneOffTask.getOneOffInfo().getWindowEndTimeMs(),
+                jobInfo.getMaxExecutionDelayMillis());
+    }
+
+    @SmallTest
+    public void testPeriodicTaskInfoWithoutFlexConversion() {
+        TaskInfo periodicTask = TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                                TimeUnit.MINUTES.toMillis(200))
+                                        .build();
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), periodicTask);
+        assertEquals(periodicTask.getTaskId(), jobInfo.getId());
+        assertTrue(jobInfo.isPeriodic());
+        assertEquals(periodicTask.getPeriodicInfo().getIntervalMs(), jobInfo.getIntervalMillis());
+    }
+
+    @SmallTest
+    public void testPeriodicTaskInfoWithFlexConversion() {
+        TaskInfo periodicTask =
+                TaskInfo.createPeriodicTask(TaskIds.TEST, TestBackgroundTask.class,
+                                TimeUnit.MINUTES.toMillis(200), TimeUnit.MINUTES.toMillis(50))
+                        .build();
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), periodicTask);
+        assertEquals(periodicTask.getTaskId(), jobInfo.getId());
+        assertTrue(jobInfo.isPeriodic());
+        assertEquals(periodicTask.getPeriodicInfo().getIntervalMs(), jobInfo.getIntervalMillis());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            assertEquals(periodicTask.getPeriodicInfo().getFlexMs(), jobInfo.getFlexMillis());
+        }
+    }
+
+    @SmallTest
+    public void testTaskInfoWithExtras() {
+        Bundle taskExtras = new Bundle();
+        taskExtras.putString("foo", "bar");
+        taskExtras.putBoolean("bools", true);
+        taskExtras.putLong("longs", 1342543L);
+        TaskInfo oneOffTask = TaskInfo.createOneOffTask(TaskIds.TEST, TestBackgroundTask.class,
+                                              TimeUnit.MINUTES.toMillis(200))
+                                      .setExtras(taskExtras)
+                                      .build();
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), oneOffTask);
+        assertEquals(oneOffTask.getTaskId(), jobInfo.getId());
+        PersistableBundle jobExtras = jobInfo.getExtras();
+        PersistableBundle persistableBundle = jobExtras.getPersistableBundle(
+                BackgroundTaskSchedulerJobService.BACKGROUND_TASK_EXTRAS_KEY);
+        assertEquals(taskExtras.keySet().size(), persistableBundle.keySet().size());
+        assertEquals(taskExtras.getString("foo"), persistableBundle.getString("foo"));
+        assertEquals(taskExtras.getBoolean("bools"), persistableBundle.getBoolean("bools"));
+        assertEquals(taskExtras.getLong("longs"), persistableBundle.getLong("longs"));
+    }
+
+    @SmallTest
+    public void testTaskInfoWithManyConstraints() {
+        TaskInfo.Builder taskBuilder = TaskInfo.createOneOffTask(
+                TaskIds.TEST, TestBackgroundTask.class, TimeUnit.MINUTES.toMillis(200));
+
+        JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(), taskBuilder.setIsPersisted(true).build());
+        assertTrue(jobInfo.isPersisted());
+
+        jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(),
+                taskBuilder.setRequiredNetworkType(TaskInfo.NETWORK_TYPE_UNMETERED).build());
+        assertEquals(JobInfo.NETWORK_TYPE_UNMETERED, jobInfo.getNetworkType());
+
+        jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+                getInstrumentation().getTargetContext(),
+                taskBuilder.setRequiresCharging(true).build());
+        assertTrue(jobInfo.isRequireCharging());
+    }
+}

diff --git a/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverterTest.java b/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverterTest.java
new file mode 100644
index 0000000..4f46d54
--- /dev/null
+++ b/components/background_task_scheduler/android/javatests/src/org/chromium/components/background_task_scheduler/BundleToPersistableBundleConverterTest.java

@@ -0,0 +1,95 @@
+// Copyright 2017 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.
+
+package org.chromium.components.background_task_scheduler;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.support.test.filters.SmallTest;
+import android.test.InstrumentationTestCase;
+
+import org.chromium.base.test.util.MinAndroidSdkLevel;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Set;
+
+/**
+ * Tests for {@link BundleToPersistableBundleConverter}.
+ */
+@TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1)
+@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP_MR1)
+public class BundleToPersistableBundleConverterTest extends InstrumentationTestCase {
+    @SmallTest
+    public void testAllValidConversions() {
+        Bundle bundle = new Bundle();
+        bundle.putString("s", "bar");
+        bundle.putStringArray("sa", new String[] {"b", "a", "r"});
+        bundle.putBoolean("b", true);
+        bundle.putBooleanArray("ba", new boolean[] {true, false, true});
+        bundle.putInt("i", 1342543);
+        bundle.putIntArray("ia", new int[] {1, 2, 3});
+        bundle.putLong("l", 1342543L);
+        bundle.putLongArray("la", new long[] {1L, 2L, 3L});
+        bundle.putDouble("d", 5.3223);
+        bundle.putDoubleArray("da", new double[] {5.3223, 42.42});
+
+        BundleToPersistableBundleConverter.Result result =
+                BundleToPersistableBundleConverter.convert(bundle);
+        PersistableBundle pBundle = result.getPersistableBundle();
+
+        assertFalse(result.hasErrors());
+        assertEquals(bundle.getString("s"), pBundle.getString("s"));
+        assertTrue(Arrays.equals(bundle.getStringArray("sa"), pBundle.getStringArray("sa")));
+        assertEquals(bundle.getBoolean("b"), pBundle.getBoolean("b"));
+        assertTrue(Arrays.equals(bundle.getBooleanArray("ba"), pBundle.getBooleanArray("ba")));
+        assertEquals(bundle.getInt("i"), pBundle.getInt("i"));
+        assertTrue(Arrays.equals(bundle.getIntArray("ia"), pBundle.getIntArray("ia")));
+        assertEquals(bundle.getLong("l"), pBundle.getLong("l"));
+        assertTrue(Arrays.equals(bundle.getLongArray("la"), pBundle.getLongArray("la")));
+        assertEquals(bundle.getDouble("d"), pBundle.getDouble("d"));
+        assertTrue(Arrays.equals(bundle.getDoubleArray("da"), pBundle.getDoubleArray("da")));
+    }
+
+    @SmallTest
+    public void testSomeBadConversions() {
+        Bundle bundle = new Bundle();
+        bundle.putString("s", "this should be there");
+        bundle.putByte("byte", (byte) 0x30);
+        bundle.putFloat("float", 14.04F);
+        ArrayList<String> arrayList = new ArrayList<>();
+        arrayList.add("a");
+        arrayList.add("b");
+        bundle.putStringArrayList("arrayList", arrayList);
+
+        BundleToPersistableBundleConverter.Result result =
+                BundleToPersistableBundleConverter.convert(bundle);
+
+        assertTrue(result.hasErrors());
+        Set<String> failedKeys = result.getFailedKeys();
+        assertEquals(3, failedKeys.size());
+        assertTrue(failedKeys.contains("byte"));
+        assertTrue(failedKeys.contains("float"));
+        assertTrue(failedKeys.contains("arrayList"));
+        assertEquals(bundle.getString("s"), result.getPersistableBundle().getString("s"));
+    }
+
+    @SmallTest
+    public void testNullValue() {
+        Bundle bundle = new Bundle();
+        bundle.putString("foo", "value1");
+        bundle.putString("bar", "");
+        bundle.putString("qux", null);
+
+        BundleToPersistableBundleConverter.Result result =
+                BundleToPersistableBundleConverter.convert(bundle);
+
+        assertFalse(result.hasErrors());
+        assertEquals(bundle.getString("foo"), result.getPersistableBundle().getString("foo"));
+        assertEquals(bundle.getString("bar"), result.getPersistableBundle().getString("bar"));
+        assertEquals(bundle.getString("qux"), result.getPersistableBundle().getString("qux"));
+    }
+}

diff --git a/components/cast_certificate/cast_cert_validator.cc b/components/cast_certificate/cast_cert_validator.cc
index 2a48ca3..60c76fb 100644
--- a/components/cast_certificate/cast_cert_validator.cc
+++ b/components/cast_certificate/cast_cert_validator.cc

@@ -13,8 +13,8 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
-#include "net/cert/internal/cert_issuer_source_static.h"
 #include "components/cast_certificate/cast_crl.h"
+#include "net/cert/internal/cert_issuer_source_static.h"
 #include "net/cert/internal/certificate_policies.h"
 #include "net/cert/internal/extended_key_usage.h"
 #include "net/cert/internal/parse_certificate.h"
@@ -25,6 +25,7 @@
 #include "net/cert/internal/signature_policy.h"
 #include "net/cert/internal/trust_store_in_memory.h"
 #include "net/cert/internal/verify_signed_data.h"
+#include "net/cert/x509_util.h"
 #include "net/der/encode_values.h"
 #include "net/der/input.h"
 
@@ -286,7 +287,8 @@
   net::CertIssuerSourceStatic intermediate_cert_issuer_source;
   for (size_t i = 0; i < certs.size(); ++i) {
     scoped_refptr<net::ParsedCertificate> cert(net::ParsedCertificate::Create(
-        certs[i], GetCertParsingOptions(), &errors));
+        net::x509_util::CreateCryptoBuffer(certs[i]), GetCertParsingOptions(),
+        &errors));
     // TODO(eroman): Propagate/log these parsing errors.
     if (!cert)
       return false;

diff --git a/components/cast_certificate/cast_cert_validator_test_helpers.cc b/components/cast_certificate/cast_cert_validator_test_helpers.cc
index b63be34..d9ade267 100644
--- a/components/cast_certificate/cast_cert_validator_test_helpers.cc
+++ b/components/cast_certificate/cast_cert_validator_test_helpers.cc

@@ -4,10 +4,11 @@
 
 #include "components/cast_certificate/cast_cert_validator_test_helpers.h"
 
-#include "net/cert/internal/cert_errors.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
+#include "net/cert/internal/cert_errors.h"
 #include "net/cert/pem_tokenizer.h"
+#include "net/cert/x509_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cast_certificate {
@@ -89,8 +90,8 @@
       cast_certificate::testing::ReadCertificateChainFromFile(path);
   for (const auto& trusted_root : trusted_test_roots) {
     net::CertErrors errors;
-    scoped_refptr<net::ParsedCertificate> cert(
-        net::ParsedCertificate::Create(trusted_root, {}, &errors));
+    scoped_refptr<net::ParsedCertificate> cert(net::ParsedCertificate::Create(
+        net::x509_util::CreateCryptoBuffer(trusted_root), {}, &errors));
     EXPECT_TRUE(cert) << errors.ToDebugString();
     scoped_refptr<net::TrustAnchor> anchor =
         net::TrustAnchor::CreateFromCertificateWithConstraints(std::move(cert));

diff --git a/components/cast_certificate/cast_cert_validator_unittest.cc b/components/cast_certificate/cast_cert_validator_unittest.cc
index 1896755..a32e728 100644
--- a/components/cast_certificate/cast_cert_validator_unittest.cc
+++ b/components/cast_certificate/cast_cert_validator_unittest.cc

@@ -8,6 +8,7 @@
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/internal/trust_store_in_memory.h"
+#include "net/cert/x509_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cast_certificate {
@@ -82,7 +83,8 @@
       // Parse the root certificate of the chain.
       net::CertErrors errors;
       scoped_refptr<net::ParsedCertificate> root =
-          net::ParsedCertificate::Create(certs.back(), {}, &errors);
+          net::ParsedCertificate::Create(
+              net::x509_util::CreateCryptoBuffer(certs.back()), {}, &errors);
       ASSERT_TRUE(root) << errors.ToDebugString();
 
       // Remove it from the chain.

diff --git a/components/cast_certificate/cast_crl.cc b/components/cast_certificate/cast_crl.cc
index d805f7f..fa95ae3 100644
--- a/components/cast_certificate/cast_crl.cc
+++ b/components/cast_certificate/cast_crl.cc

@@ -22,6 +22,7 @@
 #include "net/cert/internal/verify_certificate_chain.h"
 #include "net/cert/internal/verify_signed_data.h"
 #include "net/cert/x509_certificate.h"
+#include "net/cert/x509_util.h"
 #include "net/der/encode_values.h"
 #include "net/der/input.h"
 #include "net/der/parse_values.h"
@@ -110,7 +111,9 @@
   // Verify the trust of the CRL authority.
   net::CertErrors parse_errors;
   scoped_refptr<net::ParsedCertificate> parsed_cert =
-      net::ParsedCertificate::Create(crl.signer_cert(), {}, &parse_errors);
+      net::ParsedCertificate::Create(
+          net::x509_util::CreateCryptoBuffer(crl.signer_cert()), {},
+          &parse_errors);
   if (parsed_cert == nullptr) {
     VLOG(2) << "CRL - Issuer certificate parsing failed:\n"
             << parse_errors.ToDebugString();

diff --git a/components/cloud_devices/OWNERS b/components/cloud_devices/OWNERS
index 58265a3..6e670c1 100644
--- a/components/cloud_devices/OWNERS
+++ b/components/cloud_devices/OWNERS

@@ -1,2 +1,5 @@
+thestig@chromium.org
 gene@chromium.org
 vitalybuka@chromium.org
+
+# COMPONENT: Services>CloudPrint

diff --git a/components/crash/content/app/breakpad_win.cc b/components/crash/content/app/breakpad_win.cc
index a5fb543..c80c023 100644
--- a/components/crash/content/app/breakpad_win.cc
+++ b/components/crash/content/app/breakpad_win.cc

@@ -555,9 +555,6 @@
   exe_path[0] = 0;
   GetModuleFileNameW(NULL, exe_path, MAX_PATH);
 
-  bool is_per_user_install =
-      GetCrashReporterClient()->GetIsPerUserInstall(exe_path);
-
   // This is intentionally leaked.
   CrashKeysWin* keeper = new CrashKeysWin();
 
@@ -590,7 +587,7 @@
   }
 
   if (GetCrashReporterClient()->ShouldCreatePipeName(process_type))
-    InitPipeNameEnvVar(is_per_user_install);
+    InitPipeNameEnvVar(GetCrashReporterClient()->GetIsPerUserInstall());
 
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   std::string pipe_name_ascii;
@@ -622,8 +619,7 @@
   // Capture full memory if explicitly instructed to.
   if (command.HasSwitch(switches::kFullMemoryCrashReport))
     dump_type = kFullDumpType;
-  else if (GetCrashReporterClient()->GetShouldDumpLargerDumps(
-               is_per_user_install))
+  else if (GetCrashReporterClient()->GetShouldDumpLargerDumps())
     dump_type = kLargerDumpType;
 
   g_breakpad = new google_breakpad::ExceptionHandler(temp_dir, &FilterCallback,

diff --git a/components/crash/content/app/crash_keys_win_unittest.cc b/components/crash/content/app/crash_keys_win_unittest.cc
index bc3af69..aebe4535 100644
--- a/components/crash/content/app/crash_keys_win_unittest.cc
+++ b/components/crash/content/app/crash_keys_win_unittest.cc

@@ -35,8 +35,8 @@
                                              bool* is_rtl_locale));
   MOCK_METHOD0(AboutToRestart, bool());
   MOCK_METHOD1(GetDeferredUploadsSupported, bool(bool is_per_user_install));
-  MOCK_METHOD1(GetIsPerUserInstall, bool(const base::string16& exe_path));
-  MOCK_METHOD1(GetShouldDumpLargerDumps, bool(bool is_per_user_install));
+  MOCK_METHOD0(GetIsPerUserInstall, bool());
+  MOCK_METHOD0(GetShouldDumpLargerDumps, bool());
   MOCK_METHOD0(GetResultCodeRespawnFailed, int());
   MOCK_METHOD0(InitBrowserCrashDumpsRegKey, void());
   MOCK_METHOD1(RecordCrashDumpAttempt, void(bool is_real_crash));

diff --git a/components/crash/content/app/crash_reporter_client.cc b/components/crash/content/app/crash_reporter_client.cc
index 3dfbd99..fd88348 100644
--- a/components/crash/content/app/crash_reporter_client.cc
+++ b/components/crash/content/app/crash_reporter_client.cc

@@ -75,11 +75,11 @@
   return false;
 }
 
-bool CrashReporterClient::GetIsPerUserInstall(const base::string16& exe_path) {
+bool CrashReporterClient::GetIsPerUserInstall() {
   return true;
 }
 
-bool CrashReporterClient::GetShouldDumpLargerDumps(bool is_per_user_install) {
+bool CrashReporterClient::GetShouldDumpLargerDumps() {
   return false;
 }
 

diff --git a/components/crash/content/app/crash_reporter_client.h b/components/crash/content/app/crash_reporter_client.h
index 25ae505..513727c 100644
--- a/components/crash/content/app/crash_reporter_client.h
+++ b/components/crash/content/app/crash_reporter_client.h

@@ -94,10 +94,10 @@
   virtual bool GetDeferredUploadsSupported(bool is_per_user_install);
 
   // Returns true if the running binary is a per-user installation.
-  virtual bool GetIsPerUserInstall(const base::string16& exe_path);
+  virtual bool GetIsPerUserInstall();
 
   // Returns true if larger crash dumps should be dumped.
-  virtual bool GetShouldDumpLargerDumps(bool is_per_user_install);
+  virtual bool GetShouldDumpLargerDumps();
 
   // Returns the result code to return when breakpad failed to respawn a
   // crashed process.

diff --git a/components/crash/content/app/crashpad_win.cc b/components/crash/content/app/crashpad_win.cc
index 1e9c06c..3ad5f8d 100644
--- a/components/crash/content/app/crashpad_win.cc
+++ b/components/crash/content/app/crashpad_win.cc

@@ -94,9 +94,7 @@
 
     base::FilePath exe_file(exe_file_path);
 
-    bool is_per_user_install =
-        crash_reporter_client->GetIsPerUserInstall(exe_file.value());
-    if (crash_reporter_client->GetShouldDumpLargerDumps(is_per_user_install)) {
+    if (crash_reporter_client->GetShouldDumpLargerDumps()) {
       const uint32_t kIndirectMemoryLimit = 4 * 1024 * 1024;
       crashpad::CrashpadInfo::GetCrashpadInfo()
           ->set_gather_indirectly_referenced_memory(

diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc
index 7d0bf0f..a74342c 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.cc
+++ b/components/cronet/android/cronet_url_request_context_adapter.cc

@@ -10,6 +10,7 @@
 
 #include <limits>
 #include <map>
+#include <set>
 #include <utility>
 #include <vector>
 
@@ -1022,16 +1023,18 @@
   base::FilePath file_path(dir_path);
   DCHECK(base::PathIsWritable(file_path));
 
-  bounded_file_observer_.reset(
-      new net::FileNetLogObserver(GetFileThread()->task_runner()));
+  bounded_file_observer_ = net::FileNetLogObserver::CreateBounded(
+      GetFileThread()->task_runner(), file_path, size, kNumNetLogEventFiles,
+      /*constants=*/nullptr);
+
+  CreateNetLogEntriesForActiveObjects({context_.get()},
+                                      bounded_file_observer_.get());
 
   net::NetLogCaptureMode capture_mode =
       include_socket_bytes ? net::NetLogCaptureMode::IncludeSocketBytes()
                            : net::NetLogCaptureMode::Default();
-
-  bounded_file_observer_->StartObservingBounded(
-      g_net_log.Get().net_log(), capture_mode, file_path,
-      /*constants=*/nullptr, context_.get(), size, kNumNetLogEventFiles);
+  bounded_file_observer_->StartObserving(g_net_log.Get().net_log(),
+                                         capture_mode);
 }
 
 void CronetURLRequestContextAdapter::StopBoundedFileNetLogOnNetworkThread() {

diff --git a/components/cryptauth/fake_secure_channel.cc b/components/cryptauth/fake_secure_channel.cc
index 11bfe17..e06a0d4d 100644
--- a/components/cryptauth/fake_secure_channel.cc
+++ b/components/cryptauth/fake_secure_channel.cc

@@ -24,7 +24,7 @@
 
   // Copy to prevent channel from being removed during handler.
   std::vector<Observer*> observers_copy = observers_;
-  for (auto observer : observers_copy) {
+  for (auto* observer : observers_copy) {
     observer->OnSecureChannelStatusChanged(this, old_status, status_);
   }
 }
@@ -33,7 +33,7 @@
                                        const std::string& payload) {
   // Copy to prevent channel from being removed during handler.
   std::vector<Observer*> observers_copy = observers_;
-  for (auto observer : observers_copy) {
+  for (auto* observer : observers_copy) {
     observer->OnMessageReceived(this, feature, payload);
   }
 }

diff --git a/components/display_compositor/gpu_compositor_frame_sink.cc b/components/display_compositor/gpu_compositor_frame_sink.cc
index 58b833d..ce450b6 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_compositor_frame_sink.cc

@@ -66,16 +66,6 @@
     client_->DidReceiveCompositorFrameAck();
 }
 
-void GpuCompositorFrameSink::AddChildFrameSink(
-    const cc::FrameSinkId& child_frame_sink_id) {
-  support_->AddChildFrameSink(child_frame_sink_id);
-}
-
-void GpuCompositorFrameSink::RemoveChildFrameSink(
-    const cc::FrameSinkId& child_frame_sink_id) {
-  support_->RemoveChildFrameSink(child_frame_sink_id);
-}
-
 void GpuCompositorFrameSink::RequestCopyOfSurface(
     std::unique_ptr<cc::CopyOutputRequest> request) {
   support_->RequestCopyOfSurface(std::move(request));

diff --git a/components/display_compositor/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h
index 761acdd..b500825 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_compositor_frame_sink.h

@@ -46,9 +46,6 @@
   void Satisfy(const cc::SurfaceSequence& sequence) override;
 
   // cc::mojom::MojoCompositorFrameSinkPrivate:
-  void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
-  void RemoveChildFrameSink(
-      const cc::FrameSinkId& child_frame_sink_id) override;
   void RequestCopyOfSurface(
       std::unique_ptr<cc::CopyOutputRequest> request) override;
 

diff --git a/components/display_compositor/gpu_root_compositor_frame_sink.cc b/components/display_compositor/gpu_root_compositor_frame_sink.cc
index 4254c6b9..76180ba 100644
--- a/components/display_compositor/gpu_root_compositor_frame_sink.cc
+++ b/components/display_compositor/gpu_root_compositor_frame_sink.cc

@@ -99,16 +99,6 @@
   support_->Satisfy(sequence);
 }
 
-void GpuRootCompositorFrameSink::AddChildFrameSink(
-    const cc::FrameSinkId& child_frame_sink_id) {
-  support_->AddChildFrameSink(child_frame_sink_id);
-}
-
-void GpuRootCompositorFrameSink::RemoveChildFrameSink(
-    const cc::FrameSinkId& child_frame_sink_id) {
-  support_->RemoveChildFrameSink(child_frame_sink_id);
-}
-
 void GpuRootCompositorFrameSink::RequestCopyOfSurface(
     std::unique_ptr<cc::CopyOutputRequest> request) {
   support_->RequestCopyOfSurface(std::move(request));

diff --git a/components/display_compositor/gpu_root_compositor_frame_sink.h b/components/display_compositor/gpu_root_compositor_frame_sink.h
index a978eb7..e9b41df 100644
--- a/components/display_compositor/gpu_root_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_root_compositor_frame_sink.h

@@ -64,9 +64,6 @@
   void Satisfy(const cc::SurfaceSequence& sequence) override;
 
   // cc::mojom::MojoCompositorFrameSinkPrivate:
-  void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
-  void RemoveChildFrameSink(
-      const cc::FrameSinkId& child_frame_sink_id) override;
   void RequestCopyOfSurface(
       std::unique_ptr<cc::CopyOutputRequest> request) override;
 

diff --git a/components/exo/display.cc b/components/exo/display.cc
index 4216d8a..44b975a2 100644
--- a/components/exo/display.cc
+++ b/components/exo/display.cc

@@ -179,6 +179,7 @@
 
 std::unique_ptr<ShellSurface> Display::CreateRemoteShellSurface(
     Surface* surface,
+    const gfx::Point& origin,
     int container) {
   TRACE_EVENT2("exo", "Display::CreateRemoteShellSurface", "surface",
                surface->AsTracedValue(), "container", container);
@@ -192,7 +193,7 @@
   bool can_minimize = container != ash::kShellWindowId_SystemModalContainer;
 
   return base::MakeUnique<ShellSurface>(
-      surface, nullptr, ShellSurface::BoundsMode::CLIENT, gfx::Point(),
+      surface, nullptr, ShellSurface::BoundsMode::CLIENT, origin,
       true /* activatable */, can_minimize, container);
 }
 

diff --git a/components/exo/display.h b/components/exo/display.h
index dd9098a..7e9ee4e 100644
--- a/components/exo/display.h
+++ b/components/exo/display.h

@@ -74,8 +74,10 @@
       const gfx::Point& position);
 
   // Creates a remote shell surface for an existing surface using |container|.
-  std::unique_ptr<ShellSurface> CreateRemoteShellSurface(Surface* surface,
-                                                         int container);
+  std::unique_ptr<ShellSurface> CreateRemoteShellSurface(
+      Surface* surface,
+      const gfx::Point& origin,
+      int container);
 
   // Creates a sub-surface for an existing surface. The sub-surface will be
   // a child of |parent|.

diff --git a/components/exo/display_unittest.cc b/components/exo/display_unittest.cc
index a27d0d6..a9a4f0e 100644
--- a/components/exo/display_unittest.cc
+++ b/components/exo/display_unittest.cc

@@ -147,12 +147,13 @@
   // Create a remote shell surface for surface1.
   std::unique_ptr<ShellSurface> shell_surface1 =
       display->CreateRemoteShellSurface(
-          surface1.get(), ash::kShellWindowId_SystemModalContainer);
+          surface1.get(), gfx::Point(),
+          ash::kShellWindowId_SystemModalContainer);
   EXPECT_TRUE(shell_surface1);
 
   // Create a remote shell surface for surface2.
   std::unique_ptr<ShellSurface> shell_surface2 =
-      display->CreateRemoteShellSurface(surface2.get(),
+      display->CreateRemoteShellSurface(surface2.get(), gfx::Point(),
                                         ash::kShellWindowId_DefaultContainer);
   EXPECT_TRUE(shell_surface2);
 }

diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 7183474b..e5322a67 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc

@@ -369,8 +369,10 @@
       break;
   }
 
-  if (widget_)
+  if (widget_) {
     UpdateWidgetBounds();
+    UpdateShadow();
+  }
 }
 
 void ShellSurface::SetParent(ShellSurface* parent) {
@@ -629,7 +631,29 @@
 void ShellSurface::SetOrigin(const gfx::Point& origin) {
   TRACE_EVENT1("exo", "ShellSurface::SetOrigin", "origin", origin.ToString());
 
+  if (origin == origin_)
+    return;
+
+  if (bounds_mode_ != BoundsMode::CLIENT) {
+    origin_ = origin;
+    return;
+  }
+
+  // If the origin changed, give the client a chance to adjust window positions
+  // before switching to the new coordinate system. Retain the old origin by
+  // reverting the origin delta until the next configure is acknowledged.
+  gfx::Vector2d delta = origin - origin_;
+  origin_offset_ -= delta;
+  pending_origin_offset_accumulator_ += delta;
+
   origin_ = origin;
+
+  if (widget_) {
+    UpdateWidgetBounds();
+    UpdateShadow();
+  }
+
+  Configure();
 }
 
 void ShellSurface::SetActivatable(bool activatable) {
@@ -676,10 +700,12 @@
 
   if (enabled() && !widget_) {
     // Defer widget creation until surface contains some contents.
-    if (surface_->content_size().IsEmpty())
+    if (surface_->content_size().IsEmpty()) {
       Configure();
-    else
-      CreateShellSurfaceWidget(ui::SHOW_STATE_NORMAL);
+      return;
+    }
+
+    CreateShellSurfaceWidget(ui::SHOW_STATE_NORMAL);
   }
 
   // Apply the accumulated pending origin offset to reflect acknowledged
@@ -871,7 +897,10 @@
     // cross-fade animations. The configure callback provides a mechanism for
     // the client to inform us that a frame has taken the state change into
     // account and without this cross-fade animations are unreliable.
-    if (configure_callback_.is_null())
+
+    // TODO(domlaskowski): For shell surfaces whose bounds are controlled by the
+    // client, the configure callback does not yet support window state changes.
+    if (configure_callback_.is_null() || bounds_mode_ == BoundsMode::CLIENT)
       scoped_animations_disabled_.reset(new ScopedAnimationsDisabled(this));
   }
 }
@@ -903,6 +932,11 @@
 void ShellSurface::OnWindowBoundsChanged(aura::Window* window,
                                          const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
+  // TODO(domlaskowski): For shell surfaces whose bounds are controlled by the
+  // client, the configure callback does not yet support resizing.
+  if (bounds_mode_ == BoundsMode::CLIENT)
+    return;
+
   if (!widget_ || !surface_ || ignore_window_bounds_changes_)
     return;
 
@@ -1154,10 +1188,11 @@
       serial = configure_callback_.Run(
           non_client_view->frame_view()->GetBoundsForClientView().size(),
           ash::wm::GetWindowState(widget_->GetNativeWindow())->GetStateType(),
-          IsResizing(), widget_->IsActive());
+          IsResizing(), widget_->IsActive(), origin_);
     } else {
-      serial = configure_callback_.Run(
-          gfx::Size(), ash::wm::WINDOW_STATE_TYPE_NORMAL, false, false);
+      serial = configure_callback_.Run(gfx::Size(),
+                                       ash::wm::WINDOW_STATE_TYPE_NORMAL, false,
+                                       false, origin_);
     }
   }
 
@@ -1290,21 +1325,16 @@
 }
 
 gfx::Point ShellSurface::GetSurfaceOrigin() const {
-  // For client-positioned shell surfaces, the surface origin corresponds to the
-  // widget position relative to the origin specified by the client. Since the
-  // surface is positioned relative to the widget, negate this vector to align
-  // the surface with the widget.
-  if (bounds_mode_ != BoundsMode::SHELL) {
-    gfx::Point position = widget_->GetNativeWindow()->bounds().origin();
-    wm::ConvertPointToScreen(widget_->GetNativeWindow()->parent(), &position);
-    return origin_ - position.OffsetFromOrigin();
-  }
+  DCHECK(bounds_mode_ == BoundsMode::SHELL || resize_component_ == HTCAPTION);
 
   gfx::Rect visible_bounds = GetVisibleBounds();
   gfx::Rect client_bounds =
       widget_->non_client_view()->frame_view()->GetBoundsForClientView();
   switch (resize_component_) {
     case HTCAPTION:
+      if (bounds_mode_ == BoundsMode::CLIENT)
+        return origin_ + origin_offset_ - visible_bounds.OffsetFromOrigin();
+
       return gfx::Point() + origin_offset_ - visible_bounds.OffsetFromOrigin();
     case HTBOTTOM:
     case HTRIGHT:
@@ -1357,8 +1387,8 @@
   switch (bounds_mode_) {
     case BoundsMode::CLIENT:
     case BoundsMode::FIXED:
-      // Position is relative to the origin.
-      new_widget_bounds += origin_.OffsetFromOrigin();
+      new_widget_bounds.set_origin(origin_ -
+                                   GetSurfaceOrigin().OffsetFromOrigin());
       break;
     case BoundsMode::SHELL:
       // Update widget origin using the surface origin if the current location
@@ -1407,22 +1437,41 @@
     wm::SetShadowElevation(window, wm::ShadowElevation::MEDIUM);
     gfx::Rect shadow_content_bounds =
         gfx::ScaleToEnclosedRect(shadow_content_bounds_, 1.f / scale_);
+
+    // Convert from screen to display coordinates.
+    if (!shadow_content_bounds.IsEmpty()) {
+      gfx::Point origin = shadow_content_bounds.origin() - origin_offset_;
+      wm::ConvertPointFromScreen(window->parent(), &origin);
+      shadow_content_bounds.set_origin(origin);
+    }
+
     gfx::Rect shadow_underlay_bounds = shadow_content_bounds_;
-    if (shadow_underlay_bounds.IsEmpty())
+
+    if (shadow_underlay_bounds.IsEmpty()) {
       shadow_underlay_bounds = gfx::Rect(surface_->window()->bounds().size());
+    } else if (shadow_underlay_in_surface_) {
+      // Since the shadow underlay is positioned relative to the surface, its
+      // origin corresponds to the shadow content position relative to the
+      // origin specified by the client.
+      shadow_underlay_bounds -=
+          gfx::ScaleToCeiledPoint(origin_ + origin_offset_, scale_)
+              .OffsetFromOrigin();
+    }
 
     if (!shadow_underlay_in_surface_) {
       shadow_content_bounds = shadow_content_bounds_;
       if (shadow_content_bounds.IsEmpty()) {
         shadow_content_bounds = window->bounds();
+      } else {
+        // Convert from screen to display coordinates.
+        gfx::Point origin = shadow_content_bounds.origin() - origin_offset_;
+        wm::ConvertPointFromScreen(window->parent(), &origin);
+        shadow_content_bounds.set_origin(origin);
       }
     }
 
-    // TODO(oshima): Adjust the coordinates from client screen to
-    // chromeos screen when multi displays are supported.
-    gfx::Point origin = window->bounds().origin();
     gfx::Point shadow_origin = shadow_content_bounds.origin();
-    shadow_origin -= origin.OffsetFromOrigin();
+    shadow_origin -= window->bounds().OffsetFromOrigin();
     gfx::Rect shadow_bounds(shadow_origin, shadow_content_bounds.size());
 
     // Always create and show the underlay, even in maximized/fullscreen.

diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index 20b6d5b..74ff30d 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h

@@ -56,7 +56,8 @@
   //
   // When bounds are controlled by the client, it represents the origin of a
   // coordinate system to which the position of the shell surface, specified
-  // as part of the geometry, is relative.
+  // as part of the geometry, is relative. The client must acknowledge changes
+  // to the origin, and offset the geometry accordingly.
   ShellSurface(Surface* surface,
                ShellSurface* parent,
                BoundsMode bounds_mode,
@@ -96,7 +97,8 @@
       base::Callback<uint32_t(const gfx::Size& size,
                               ash::wm::WindowStateType state_type,
                               bool resizing,
-                              bool activated)>;
+                              bool activated,
+                              const gfx::Point& origin)>;
   void set_configure_callback(const ConfigureCallback& configure_callback) {
     configure_callback_ = configure_callback;
   }

diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc
index 44a0b116..45cc534 100644
--- a/components/exo/shell_surface_unittest.cc
+++ b/components/exo/shell_surface_unittest.cc

@@ -41,7 +41,8 @@
                              const gfx::Size& size,
                              ash::wm::WindowStateType state_type,
                              bool resizing,
-                             bool activated) {
+                             bool activated,
+                             const gfx::Point& origin) {
   EXPECT_EQ(ash::wm::WINDOW_STATE_TYPE_FULLSCREEN, state_type);
   return serial;
 }
@@ -367,7 +368,8 @@
                    const gfx::Size& size,
                    ash::wm::WindowStateType state_type,
                    bool resizing,
-                   bool activated) {
+                   bool activated,
+                   const gfx::Point& origin) {
   *suggested_size = size;
   *has_state_type = state_type;
   *is_resizing = resizing;

diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 89f0382..4386237 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc

@@ -1005,7 +1005,8 @@
     const gfx::Size& size,
     ash::wm::WindowStateType state_type,
     bool resizing,
-    bool activated) {
+    bool activated,
+    const gfx::Point& origin) {
   wl_shell_surface_send_configure(resource, WL_SHELL_SURFACE_RESIZE_NONE,
                                   size.width(), size.height());
   wl_client_flush(wl_resource_get_client(resource));
@@ -1530,7 +1531,8 @@
     const gfx::Size& size,
     ash::wm::WindowStateType state_type,
     bool resizing,
-    bool activated) {
+    bool activated,
+    const gfx::Point& origin) {
   wl_array states;
   wl_array_init(&states);
   if (state_type == ash::wm::WINDOW_STATE_TYPE_MAXIMIZED)
@@ -1667,7 +1669,8 @@
     const gfx::Size& size,
     ash::wm::WindowStateType state_type,
     bool resizing,
-    bool activated) {
+    bool activated,
+    const gfx::Point& origin) {
   wl_array states;
   wl_array_init(&states);
   if (state_type == ash::wm::WINDOW_STATE_TYPE_MAXIMIZED)
@@ -1976,7 +1979,7 @@
 void remote_surface_ack_configure(wl_client* client,
                                   wl_resource* resource,
                                   uint32_t serial) {
-  NOTIMPLEMENTED();
+  GetUserDataAs<ShellSurface>(resource)->AcknowledgeConfigure(serial);
 }
 
 void remote_surface_move(wl_client* client, wl_resource* resource) {
@@ -2048,9 +2051,13 @@
     display::Screen::GetScreen()->RemoveObserver(this);
   }
 
+  bool IsMultiDisplaySupported() const {
+    return wl_resource_get_version(remote_shell_resource_) >= 3;
+  }
+
   std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface,
                                                    int container) {
-    return display_->CreateRemoteShellSurface(surface, container);
+    return display_->CreateRemoteShellSurface(surface, gfx::Point(), container);
   }
 
   std::unique_ptr<NotificationSurface> CreateNotificationSurface(
@@ -2222,14 +2229,32 @@
   wl_client_flush(wl_resource_get_client(resource));
 }
 
+uint32_t HandleRemoteSurfaceConfigureCallback(
+    wl_resource* resource,
+    const gfx::Size& size,
+    ash::wm::WindowStateType state_type,
+    bool resizing,
+    bool activated,
+    const gfx::Point& origin) {
+  wl_array states;
+  wl_array_init(&states);
+  uint32_t serial = wl_display_next_serial(
+      wl_client_get_display(wl_resource_get_client(resource)));
+  zcr_remote_surface_v1_send_configure(resource, origin.x(), origin.y(),
+                                       &states, serial);
+  wl_client_flush(wl_resource_get_client(resource));
+  wl_array_release(&states);
+  return serial;
+}
+
 void remote_shell_get_remote_surface(wl_client* client,
                                      wl_resource* resource,
                                      uint32_t id,
                                      wl_resource* surface,
                                      uint32_t container) {
-  std::unique_ptr<ShellSurface> shell_surface =
-      GetUserDataAs<WaylandRemoteShell>(resource)->CreateShellSurface(
-          GetUserDataAs<Surface>(surface), RemoteSurfaceContainer(container));
+  WaylandRemoteShell* shell = GetUserDataAs<WaylandRemoteShell>(resource);
+  std::unique_ptr<ShellSurface> shell_surface = shell->CreateShellSurface(
+      GetUserDataAs<Surface>(surface), RemoteSurfaceContainer(container));
   if (!shell_surface) {
     wl_resource_post_error(resource, ZCR_REMOTE_SHELL_V1_ERROR_ROLE,
                            "surface has already been assigned a role");
@@ -2246,6 +2271,11 @@
   shell_surface->set_state_changed_callback(
       base::Bind(&HandleRemoteSurfaceStateChangedCallback,
                  base::Unretained(remote_surface_resource)));
+  if (shell->IsMultiDisplaySupported()) {
+    shell_surface->set_configure_callback(
+        base::Bind(&HandleRemoteSurfaceConfigureCallback,
+                   base::Unretained(remote_surface_resource)));
+  }
 
   SetImplementation(remote_surface_resource, &remote_surface_implementation,
                     std::move(shell_surface));

diff --git a/components/guest_view/renderer/guest_view_request.cc b/components/guest_view/renderer/guest_view_request.cc
index 1d26c3f4..abc7e3a7 100644
--- a/components/guest_view/renderer/guest_view_request.cc
+++ b/components/guest_view/renderer/guest_view_request.cc

@@ -97,8 +97,7 @@
   if (frame->isWebLocalFrame()) {
     window = frame->mainWorldScriptContext()->Global();
   } else {
-    window =
-        frame->toWebRemoteFrame()->deprecatedMainWorldScriptContext()->Global();
+    window = frame->toWebRemoteFrame()->globalProxy();
   }
 
   const int argc = 1;

diff --git a/components/history/content/browser/BUILD.gn b/components/history/content/browser/BUILD.gn
index 352b4c8..55bdb00 100644
--- a/components/history/content/browser/BUILD.gn
+++ b/components/history/content/browser/BUILD.gn

@@ -6,8 +6,8 @@
   sources = [
     "content_visit_delegate.cc",
     "content_visit_delegate.h",
-    "download_constants_utils.cc",
-    "download_constants_utils.h",
+    "download_conversions.cc",
+    "download_conversions.h",
     "history_context_helper.cc",
     "history_context_helper.h",
     "history_database_helper.cc",
@@ -29,6 +29,7 @@
   testonly = true
   sources = [
     "content_history_backend_db_unittest.cc",
+    "download_conversions_unittest.cc",
   ]
   deps = [
     ":browser",

diff --git a/components/history/content/browser/download_constants_utils.cc b/components/history/content/browser/download_constants_utils.cc
deleted file mode 100644
index 9fa1c46..0000000
--- a/components/history/content/browser/download_constants_utils.cc
+++ /dev/null

@@ -1,127 +0,0 @@
-// Copyright 2015 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/history/content/browser/download_constants_utils.h"
-
-#include "base/logging.h"
-#include "components/history/core/browser/download_constants.h"
-
-namespace history {
-
-content::DownloadItem::DownloadState ToContentDownloadState(
-    DownloadState state) {
-  switch (state) {
-    case DownloadState::IN_PROGRESS:
-      return content::DownloadItem::IN_PROGRESS;
-    case DownloadState::COMPLETE:
-      return content::DownloadItem::COMPLETE;
-    case DownloadState::CANCELLED:
-      return content::DownloadItem::CANCELLED;
-    case DownloadState::INTERRUPTED:
-      return content::DownloadItem::INTERRUPTED;
-    case DownloadState::INVALID:
-    case DownloadState::BUG_140687:
-      NOTREACHED();
-      return content::DownloadItem::MAX_DOWNLOAD_STATE;
-  }
-  NOTREACHED();
-  return content::DownloadItem::MAX_DOWNLOAD_STATE;
-}
-
-DownloadState ToHistoryDownloadState(
-    content::DownloadItem::DownloadState state) {
-  switch (state) {
-    case content::DownloadItem::IN_PROGRESS:
-      return DownloadState::IN_PROGRESS;
-    case content::DownloadItem::COMPLETE:
-      return DownloadState::COMPLETE;
-    case content::DownloadItem::CANCELLED:
-      return DownloadState::CANCELLED;
-    case content::DownloadItem::INTERRUPTED:
-      return DownloadState::INTERRUPTED;
-    case content::DownloadItem::MAX_DOWNLOAD_STATE:
-      NOTREACHED();
-      return DownloadState::INVALID;
-  }
-  NOTREACHED();
-  return DownloadState::INVALID;
-}
-
-content::DownloadDangerType ToContentDownloadDangerType(
-    DownloadDangerType danger_type) {
-  switch (danger_type) {
-    case DownloadDangerType::NOT_DANGEROUS:
-      return content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
-    case DownloadDangerType::DANGEROUS_FILE:
-      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
-    case DownloadDangerType::DANGEROUS_URL:
-      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL;
-    case DownloadDangerType::DANGEROUS_CONTENT:
-      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT;
-    case DownloadDangerType::MAYBE_DANGEROUS_CONTENT:
-      return content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT;
-    case DownloadDangerType::UNCOMMON_CONTENT:
-      return content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT;
-    case DownloadDangerType::USER_VALIDATED:
-      return content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED;
-    case DownloadDangerType::DANGEROUS_HOST:
-      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST;
-    case DownloadDangerType::POTENTIALLY_UNWANTED:
-      return content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED;
-    case DownloadDangerType::INVALID:
-      NOTREACHED();
-      return content::DOWNLOAD_DANGER_TYPE_MAX;
-  }
-  NOTREACHED();
-  return content::DOWNLOAD_DANGER_TYPE_MAX;
-}
-
-DownloadDangerType ToHistoryDownloadDangerType(
-    content::DownloadDangerType danger_type) {
-  switch (danger_type) {
-    case content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
-      return DownloadDangerType::NOT_DANGEROUS;
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
-      return DownloadDangerType::DANGEROUS_FILE;
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
-      return DownloadDangerType::DANGEROUS_URL;
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
-      return DownloadDangerType::DANGEROUS_CONTENT;
-    case content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
-      return DownloadDangerType::MAYBE_DANGEROUS_CONTENT;
-    case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
-      return DownloadDangerType::UNCOMMON_CONTENT;
-    case content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
-      return DownloadDangerType::USER_VALIDATED;
-    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
-      return DownloadDangerType::DANGEROUS_HOST;
-    case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
-      return DownloadDangerType::POTENTIALLY_UNWANTED;
-    default:
-      NOTREACHED();
-      return DownloadDangerType::INVALID;
-  }
-}
-
-content::DownloadInterruptReason ToContentDownloadInterruptReason(
-    DownloadInterruptReason interrupt_reason) {
-  return static_cast<content::DownloadInterruptReason>(interrupt_reason);
-}
-
-DownloadInterruptReason ToHistoryDownloadInterruptReason(
-    content::DownloadInterruptReason interrupt_reason) {
-  return static_cast<DownloadInterruptReason>(interrupt_reason);
-}
-
-uint32_t ToContentDownloadId(DownloadId id) {
-  DCHECK_NE(id, kInvalidDownloadId);
-  return static_cast<uint32_t>(id);
-}
-
-DownloadId ToHistoryDownloadId(uint32_t id) {
-  DCHECK_NE(id, content::DownloadItem::kInvalidId);
-  return static_cast<DownloadId>(id);
-}
-
-}  // namespace history

diff --git a/components/history/content/browser/download_constants_utils.h b/components/history/content/browser/download_constants_utils.h
deleted file mode 100644
index 284e8c6c..0000000
--- a/components/history/content/browser/download_constants_utils.h
+++ /dev/null

@@ -1,49 +0,0 @@
-// Copyright 2015 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_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONSTANTS_UTILS_H_
-#define COMPONENTS_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONSTANTS_UTILS_H_
-
-#include <stdint.h>
-
-#include <string>
-
-#include "components/history/core/browser/download_types.h"
-#include "content/public/browser/download_danger_type.h"
-#include "content/public/browser/download_interrupt_reasons.h"
-#include "content/public/browser/download_item.h"
-
-namespace history {
-
-// Utility functions to convert between content::DownloadItem::DownloadState
-// enumeration and history::DownloadState constants.
-content::DownloadItem::DownloadState ToContentDownloadState(
-    DownloadState state);
-DownloadState ToHistoryDownloadState(
-    content::DownloadItem::DownloadState state);
-
-// Utility functions to convert between content::DownloadDangerType enumeration
-// and history::DownloadDangerType constants.
-content::DownloadDangerType ToContentDownloadDangerType(
-    DownloadDangerType danger_type);
-DownloadDangerType ToHistoryDownloadDangerType(
-    content::DownloadDangerType danger_type);
-
-// Utility functions to convert between content::DownloadInterruptReason
-// enumeration and history::DownloadInterruptReason type (value have no
-// meaning in history, but have a different type to avoid bugs due to
-// implicit conversions).
-content::DownloadInterruptReason ToContentDownloadInterruptReason(
-    DownloadInterruptReason interrupt_reason);
-DownloadInterruptReason ToHistoryDownloadInterruptReason(
-    content::DownloadInterruptReason interrupt_reason);
-
-// Utility functions to convert between content download id values and
-// history::DownloadId type (value have no meaning in history, except
-// for kInvalidDownloadId).
-uint32_t ToContentDownloadId(DownloadId id);
-DownloadId ToHistoryDownloadId(uint32_t id);
-}  // namespace history
-
-#endif  // COMPONENTS_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONSTANTS_UTILS_H_

diff --git a/components/history/content/browser/download_conversions.cc b/components/history/content/browser/download_conversions.cc
new file mode 100644
index 0000000..ea9f112
--- /dev/null
+++ b/components/history/content/browser/download_conversions.cc

@@ -0,0 +1,147 @@
+// Copyright 2017 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/history/content/browser/download_conversions.h"
+
+#include "base/logging.h"
+#include "components/history/core/browser/download_constants.h"
+
+namespace history {
+
+content::DownloadItem::DownloadState ToContentDownloadState(
+    DownloadState state) {
+  switch (state) {
+    case DownloadState::IN_PROGRESS:
+      return content::DownloadItem::IN_PROGRESS;
+    case DownloadState::COMPLETE:
+      return content::DownloadItem::COMPLETE;
+    case DownloadState::CANCELLED:
+      return content::DownloadItem::CANCELLED;
+    case DownloadState::INTERRUPTED:
+      return content::DownloadItem::INTERRUPTED;
+    case DownloadState::INVALID:
+    case DownloadState::BUG_140687:
+      NOTREACHED();
+      return content::DownloadItem::MAX_DOWNLOAD_STATE;
+  }
+  NOTREACHED();
+  return content::DownloadItem::MAX_DOWNLOAD_STATE;
+}
+
+DownloadState ToHistoryDownloadState(
+    content::DownloadItem::DownloadState state) {
+  switch (state) {
+    case content::DownloadItem::IN_PROGRESS:
+      return DownloadState::IN_PROGRESS;
+    case content::DownloadItem::COMPLETE:
+      return DownloadState::COMPLETE;
+    case content::DownloadItem::CANCELLED:
+      return DownloadState::CANCELLED;
+    case content::DownloadItem::INTERRUPTED:
+      return DownloadState::INTERRUPTED;
+    case content::DownloadItem::MAX_DOWNLOAD_STATE:
+      NOTREACHED();
+      return DownloadState::INVALID;
+  }
+  NOTREACHED();
+  return DownloadState::INVALID;
+}
+
+content::DownloadDangerType ToContentDownloadDangerType(
+    DownloadDangerType danger_type) {
+  switch (danger_type) {
+    case DownloadDangerType::NOT_DANGEROUS:
+      return content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
+    case DownloadDangerType::DANGEROUS_FILE:
+      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
+    case DownloadDangerType::DANGEROUS_URL:
+      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL;
+    case DownloadDangerType::DANGEROUS_CONTENT:
+      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT;
+    case DownloadDangerType::MAYBE_DANGEROUS_CONTENT:
+      return content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT;
+    case DownloadDangerType::UNCOMMON_CONTENT:
+      return content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT;
+    case DownloadDangerType::USER_VALIDATED:
+      return content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED;
+    case DownloadDangerType::DANGEROUS_HOST:
+      return content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST;
+    case DownloadDangerType::POTENTIALLY_UNWANTED:
+      return content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED;
+    case DownloadDangerType::INVALID:
+      NOTREACHED();
+      return content::DOWNLOAD_DANGER_TYPE_MAX;
+  }
+  NOTREACHED();
+  return content::DOWNLOAD_DANGER_TYPE_MAX;
+}
+
+DownloadDangerType ToHistoryDownloadDangerType(
+    content::DownloadDangerType danger_type) {
+  switch (danger_type) {
+    case content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
+      return DownloadDangerType::NOT_DANGEROUS;
+    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
+      return DownloadDangerType::DANGEROUS_FILE;
+    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
+      return DownloadDangerType::DANGEROUS_URL;
+    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
+      return DownloadDangerType::DANGEROUS_CONTENT;
+    case content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
+      return DownloadDangerType::MAYBE_DANGEROUS_CONTENT;
+    case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
+      return DownloadDangerType::UNCOMMON_CONTENT;
+    case content::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
+      return DownloadDangerType::USER_VALIDATED;
+    case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
+      return DownloadDangerType::DANGEROUS_HOST;
+    case content::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
+      return DownloadDangerType::POTENTIALLY_UNWANTED;
+    default:
+      NOTREACHED();
+      return DownloadDangerType::INVALID;
+  }
+}
+
+content::DownloadInterruptReason ToContentDownloadInterruptReason(
+    DownloadInterruptReason interrupt_reason) {
+  return static_cast<content::DownloadInterruptReason>(interrupt_reason);
+}
+
+DownloadInterruptReason ToHistoryDownloadInterruptReason(
+    content::DownloadInterruptReason interrupt_reason) {
+  return static_cast<DownloadInterruptReason>(interrupt_reason);
+}
+
+uint32_t ToContentDownloadId(DownloadId id) {
+  DCHECK_NE(id, kInvalidDownloadId);
+  return static_cast<uint32_t>(id);
+}
+
+DownloadId ToHistoryDownloadId(uint32_t id) {
+  DCHECK_NE(id, content::DownloadItem::kInvalidId);
+  return static_cast<DownloadId>(id);
+}
+
+std::vector<content::DownloadItem::ReceivedSlice> ToContentReceivedSlices(
+    const std::vector<DownloadSliceInfo>& slice_infos) {
+  std::vector<content::DownloadItem::ReceivedSlice> result;
+
+  for (const auto& slice_info : slice_infos)
+    result.emplace_back(slice_info.offset, slice_info.received_bytes);
+
+  return result;
+}
+
+std::vector<DownloadSliceInfo> GetHistoryDownloadSliceInfos(
+    const content::DownloadItem& item) {
+  std::vector<DownloadSliceInfo> result;
+
+  for (const auto& slice : item.GetReceivedSlices())
+    result.emplace_back(item.GetId(), slice.offset, slice.received_bytes);
+
+  return result;
+}
+
+}  // namespace history

diff --git a/components/history/content/browser/download_conversions.h b/components/history/content/browser/download_conversions.h
new file mode 100644
index 0000000..e708944a
--- /dev/null
+++ b/components/history/content/browser/download_conversions.h

@@ -0,0 +1,61 @@
+// Copyright 2017 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_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONVERSIONS_H_
+#define COMPONENTS_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONVERSIONS_H_
+
+#include <stdint.h>
+
+#include <string>
+
+#include "components/history/core/browser/download_slice_info.h"
+#include "components/history/core/browser/download_types.h"
+#include "content/public/browser/download_danger_type.h"
+#include "content/public/browser/download_interrupt_reasons.h"
+#include "content/public/browser/download_item.h"
+
+namespace history {
+
+// Utility functions to convert between content::DownloadItem::DownloadState
+// enumeration and history::DownloadState constants.
+content::DownloadItem::DownloadState ToContentDownloadState(
+    DownloadState state);
+DownloadState ToHistoryDownloadState(
+    content::DownloadItem::DownloadState state);
+
+// Utility functions to convert between content::DownloadDangerType enumeration
+// and history::DownloadDangerType constants.
+content::DownloadDangerType ToContentDownloadDangerType(
+    DownloadDangerType danger_type);
+DownloadDangerType ToHistoryDownloadDangerType(
+    content::DownloadDangerType danger_type);
+
+// Utility functions to convert between content::DownloadInterruptReason
+// enumeration and history::DownloadInterruptReason type (value have no
+// meaning in history, but have a different type to avoid bugs due to
+// implicit conversions).
+content::DownloadInterruptReason ToContentDownloadInterruptReason(
+    DownloadInterruptReason interrupt_reason);
+DownloadInterruptReason ToHistoryDownloadInterruptReason(
+    content::DownloadInterruptReason interrupt_reason);
+
+// Utility functions to convert between content download id values and
+// history::DownloadId type (value have no meaning in history, except
+// for kInvalidDownloadId).
+uint32_t ToContentDownloadId(DownloadId id);
+DownloadId ToHistoryDownloadId(uint32_t id);
+
+// Utility function to convert a history::DownloadSliceInfo vector into a
+// vector of content::DownloadItem::ReceivedSlice.
+std::vector<content::DownloadItem::ReceivedSlice> ToContentReceivedSlices(
+    const std::vector<DownloadSliceInfo>& slice_infos);
+
+// Construct a vector of history::DownloadSliceInfo from a
+// content::DownloadItem object.
+std::vector<DownloadSliceInfo> GetHistoryDownloadSliceInfos(
+    const content::DownloadItem& item);
+
+}  // namespace history
+
+#endif  // COMPONENTS_HISTORY_CONTENT_BROWSER_DOWNLOAD_CONVERSIONS_H_

diff --git a/components/history/content/browser/download_conversions_unittest.cc b/components/history/content/browser/download_conversions_unittest.cc
new file mode 100644
index 0000000..d972c86
--- /dev/null
+++ b/components/history/content/browser/download_conversions_unittest.cc

@@ -0,0 +1,32 @@
+// Copyright 2017 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/history/content/browser/download_conversions.h"
+
+#include <vector>
+
+#include "components/history/core/browser/download_slice_info.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace history {
+
+TEST(DownloadConversionsTest, ToContentReceivedSlices) {
+  std::vector<DownloadSliceInfo> info;
+  int64_t offset1 = 0;
+  int64_t received1 = 100;
+  int64_t offset2 = 1000;
+  int64_t received2 = 50;
+  DownloadId id = 1;
+  info.emplace_back(id, offset1, received1);
+  info.emplace_back(id, offset2, received2);
+  std::vector<content::DownloadItem::ReceivedSlice> received_slices =
+      ToContentReceivedSlices(info);
+  EXPECT_EQ(2u, received_slices.size());
+  EXPECT_EQ(offset1, received_slices[0].offset);
+  EXPECT_EQ(received1, received_slices[0].received_bytes);
+  EXPECT_EQ(offset2, received_slices[1].offset);
+  EXPECT_EQ(received2, received_slices[1].received_bytes);
+}
+
+}  // namespace history

diff --git a/components/history/content/browser/history_database_helper.cc b/components/history/content/browser/history_database_helper.cc
index 14fef9b..8d0b7fd2c 100644
--- a/components/history/content/browser/history_database_helper.cc
+++ b/components/history/content/browser/history_database_helper.cc

@@ -5,7 +5,7 @@
 #include "components/history/content/browser/history_database_helper.h"
 
 #include "base/files/file_path.h"
-#include "components/history/content/browser/download_constants_utils.h"
+#include "components/history/content/browser/download_conversions.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 

diff --git a/components/history/core/browser/download_row.h b/components/history/core/browser/download_row.h
index d446cf09e2..1c47635 100644
--- a/components/history/core/browser/download_row.h
+++ b/components/history/core/browser/download_row.h

@@ -138,6 +138,8 @@
   std::string by_ext_id;
   std::string by_ext_name;
 
+  // Data slices that have been downloaded so far. The slices must be ordered
+  // by their offset.
   std::vector<DownloadSliceInfo> download_slice_info;
 };
 

diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc
index 4514ed5..9f597fa 100644
--- a/components/infobars/core/infobar_delegate.cc
+++ b/components/infobars/core/infobar_delegate.cc

@@ -10,7 +10,7 @@
 #include "components/infobars/core/infobar_manager.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/gfx/vector_icon_types.h"
 
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 #include "ui/gfx/color_palette.h"
@@ -37,15 +37,16 @@
   return kNoIconID;
 }
 
-gfx::VectorIconId InfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
+const gfx::VectorIcon& InfoBarDelegate::GetVectorIcon() const {
+  CR_DEFINE_STATIC_LOCAL(gfx::VectorIcon, empty_icon, ());
+  return empty_icon;
 }
 
 gfx::Image InfoBarDelegate::GetIcon() const {
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
-  gfx::VectorIconId vector_id = GetVectorIconId();
-  if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
-    return gfx::Image(gfx::CreateVectorIcon(vector_id, 16,
+  const gfx::VectorIcon& vector_icon = GetVectorIcon();
+  if (!vector_icon.is_empty()) {
+    return gfx::Image(gfx::CreateVectorIcon(vector_icon, 16,
                                             GetInfoBarType() == WARNING_TYPE
                                                 ? SkColorSetRGB(0xFF, 0x67, 0)
                                                 : gfx::kGoogleBlue500));

diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h
index 08b7f4f..1396e16 100644
--- a/components/infobars/core/infobar_delegate.h
+++ b/components/infobars/core/infobar_delegate.h

@@ -36,7 +36,7 @@
 
 namespace gfx {
 class Image;
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace infobars {
@@ -186,7 +186,7 @@
   // Returns the vector icon identifier to be shown for this InfoBar. This will
   // take precedence over GetIconId() (although typically only one of the two
   // should be defined for any given infobar).
-  virtual gfx::VectorIconId GetVectorIconId() const;
+  virtual const gfx::VectorIcon& GetVectorIcon() const;
 
   // Returns the icon to be shown for this InfoBar. If the returned Image is
   // empty, no icon is shown.

diff --git a/components/infobars/core/simple_alert_infobar_delegate.cc b/components/infobars/core/simple_alert_infobar_delegate.cc
index fb66586..02b942a 100644
--- a/components/infobars/core/simple_alert_infobar_delegate.cc
+++ b/components/infobars/core/simple_alert_infobar_delegate.cc

@@ -14,25 +14,22 @@
 void SimpleAlertInfoBarDelegate::Create(
     infobars::InfoBarManager* infobar_manager,
     infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
-    int icon_id,
-    gfx::VectorIconId vector_icon_id,
+    const gfx::VectorIcon* vector_icon,
     const base::string16& message,
     bool auto_expire) {
   infobar_manager->AddInfoBar(infobar_manager->CreateConfirmInfoBar(
       std::unique_ptr<ConfirmInfoBarDelegate>(new SimpleAlertInfoBarDelegate(
-          infobar_identifier, icon_id, vector_icon_id, message, auto_expire))));
+          infobar_identifier, vector_icon, message, auto_expire))));
 }
 
 SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
     infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
-    int icon_id,
-    gfx::VectorIconId vector_icon_id,
+    const gfx::VectorIcon* vector_icon,
     const base::string16& message,
     bool auto_expire)
     : ConfirmInfoBarDelegate(),
       infobar_identifier_(infobar_identifier),
-      icon_id_(icon_id),
-      vector_icon_id_(vector_icon_id),
+      vector_icon_(vector_icon),
       message_(message),
       auto_expire_(auto_expire) {}
 
@@ -44,12 +41,8 @@
   return infobar_identifier_;
 }
 
-int SimpleAlertInfoBarDelegate::GetIconId() const {
-  return icon_id_;
-}
-
-gfx::VectorIconId SimpleAlertInfoBarDelegate::GetVectorIconId() const {
-  return vector_icon_id_;
+const gfx::VectorIcon& SimpleAlertInfoBarDelegate::GetVectorIcon() const {
+  return vector_icon_ ? *vector_icon_ : InfoBarDelegate::GetVectorIcon();
 }
 
 bool SimpleAlertInfoBarDelegate::ShouldExpire(

diff --git a/components/infobars/core/simple_alert_infobar_delegate.h b/components/infobars/core/simple_alert_infobar_delegate.h
index 2e47f9ae..da98369 100644
--- a/components/infobars/core/simple_alert_infobar_delegate.h
+++ b/components/infobars/core/simple_alert_infobar_delegate.h

@@ -9,7 +9,10 @@
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
-#include "ui/gfx/vector_icons_public.h"
+
+namespace gfx {
+struct VectorIcon;
+}
 
 namespace infobars {
 class InfoBarManager;
@@ -18,37 +21,32 @@
 class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates a simple alert infobar and delegate and adds the infobar to
-  // |infobar_manager|. If |vector_icon_id| is not VECTOR_ICON_NONE, it will be
-  // shown; otherwise, |icon_id| (if present) will be used as the icon.
+  // |infobar_manager|. If |vector_icon| is not null, it will be shown.
   // |infobar_identifier| names what class triggered the infobar for metrics.
   static void Create(
       infobars::InfoBarManager* infobar_manager,
       infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
-      int icon_id,
-      gfx::VectorIconId vector_icon_id,
+      const gfx::VectorIcon* vector_icon,
       const base::string16& message,
       bool auto_expire);
 
  private:
   SimpleAlertInfoBarDelegate(
       infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier,
-      int icon_id,
-      gfx::VectorIconId vector_icon_id,
+      const gfx::VectorIcon* vector_icon,
       const base::string16& message,
       bool auto_expire);
   ~SimpleAlertInfoBarDelegate() override;
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  int GetIconId() const override;
-  gfx::VectorIconId GetVectorIconId() const override;
+  const gfx::VectorIcon& GetVectorIcon() const override;
   bool ShouldExpire(const NavigationDetails& details) const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
 
   infobars::InfoBarDelegate::InfoBarIdentifier infobar_identifier_;
-  const int icon_id_;
-  gfx::VectorIconId vector_icon_id_;
+  const gfx::VectorIcon* vector_icon_;
   base::string16 message_;
   bool auto_expire_;  // Should it expire automatically on navigation?
 

diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
index 91e7dd23..c3155e4 100644
--- a/components/metrics/metrics_service.cc
+++ b/components/metrics/metrics_service.cc

@@ -173,10 +173,6 @@
 const base::Feature kUMAThrottleEvents{"UMAThrottleEvents",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
-bool HasUploadScheduler() {
-  return base::FeatureList::IsEnabled(kUploadSchedulerFeature);
-}
-
 // The delay, in seconds, after starting recording before doing expensive
 // initialization work.
 #if defined(OS_ANDROID) || defined(OS_IOS)
@@ -298,24 +294,15 @@
       base::Bind(&MetricsService::StartScheduledUpload,
                  self_ptr_factory_.GetWeakPtr());
 
-  if (HasUploadScheduler()) {
-    rotation_scheduler_.reset(new MetricsRotationScheduler(
-        upload_callback,
-        // MetricsServiceClient outlives MetricsService, and
-        // MetricsRotationScheduler is tied to the lifetime of |this|.
-        base::Bind(&MetricsServiceClient::GetStandardUploadInterval,
-                   base::Unretained(client_))));
-    base::Closure send_next_log_callback = base::Bind(
-        &MetricsService::SendNextLog, self_ptr_factory_.GetWeakPtr());
-    upload_scheduler_.reset(new MetricsUploadScheduler(send_next_log_callback));
-  } else {
-    scheduler_.reset(new MetricsReportingScheduler(
-        upload_callback,
-        // MetricsServiceClient outlives MetricsService, and
-        // MetricsReportingScheduler is tied to the lifetime of |this|.
-        base::Bind(&MetricsServiceClient::GetStandardUploadInterval,
-                   base::Unretained(client_))));
-  }
+  rotation_scheduler_.reset(new MetricsRotationScheduler(
+      upload_callback,
+      // MetricsServiceClient outlives MetricsService, and
+      // MetricsRotationScheduler is tied to the lifetime of |this|.
+      base::Bind(&MetricsServiceClient::GetStandardUploadInterval,
+                 base::Unretained(client_))));
+  base::Closure send_next_log_callback =
+      base::Bind(&MetricsService::SendNextLog, self_ptr_factory_.GetWeakPtr());
+  upload_scheduler_.reset(new MetricsUploadScheduler(send_next_log_callback));
 
   for (auto& provider : metrics_providers_)
     provider->Init();
@@ -459,12 +446,8 @@
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
 void MetricsService::OnAppEnterBackground() {
-  if (upload_scheduler_) {
-    rotation_scheduler_->Stop();
-    upload_scheduler_->Stop();
-  } else {
-    scheduler_->Stop();
-  }
+  rotation_scheduler_->Stop();
+  upload_scheduler_->Stop();
 
   MarkAppCleanShutdownAndCommit(&clean_exit_beacon_, local_state_);
 
@@ -644,11 +627,7 @@
     NotifyOnDidCreateMetricsLog();
   }
 
-  if (upload_scheduler_) {
-    rotation_scheduler_->InitTaskComplete();
-  } else {
-    scheduler_->InitTaskComplete();
-  }
+  rotation_scheduler_->InitTaskComplete();
 }
 
 void MetricsService::GetUptimes(PrefService* pref,
@@ -766,12 +745,8 @@
   // persisted on shutdown or backgrounding.
   if (recording_active() &&
       (reporting_active() || state_ < SENDING_LOGS)) {
-    if (upload_scheduler_) {
-      rotation_scheduler_->Start();
-      upload_scheduler_->Start();
-    } else {
-      scheduler_->Start();
-    }
+    rotation_scheduler_->Start();
+    upload_scheduler_->Start();
   }
 }
 
@@ -789,25 +764,16 @@
   if (idle_since_last_transmission_ ||
       !recording_active() ||
       (!reporting_active() && state_ >= SENDING_LOGS)) {
-    if (upload_scheduler_) {
-      rotation_scheduler_->Stop();
-      rotation_scheduler_->RotationFinished();
-    } else {
-      scheduler_->Stop();
-      scheduler_->UploadCancelled();
-    }
+    rotation_scheduler_->Stop();
+    rotation_scheduler_->RotationFinished();
     return;
   }
 
   // If there are unsent logs, send the next one. If not, start the asynchronous
   // process of finalizing the current log for upload.
   if (state_ == SENDING_LOGS && log_store_.has_unsent_logs()) {
-    if (upload_scheduler_) {
-      upload_scheduler_->Start();
-      rotation_scheduler_->RotationFinished();
-    } else {
-      SendNextLog();
-    }
+    upload_scheduler_->Start();
+    rotation_scheduler_->RotationFinished();
   } else {
     // There are no logs left to send, so start creating a new one.
     client_->CollectFinalMetricsForLog(
@@ -818,24 +784,10 @@
 
 void MetricsService::OnFinalLogInfoCollectionDone() {
   DVLOG(1) << "OnFinalLogInfoCollectionDone";
-  if (!upload_scheduler_) {
-    // If somehow there is a log upload in progress, we return and hope things
-    // work out. The scheduler isn't informed since if this happens, the
-    // scheduler will get a response from the upload.
-    DCHECK(!log_upload_in_progress_);
-    if (log_upload_in_progress_)
-      return;
-  }
-
   // Abort if metrics were turned off during the final info gathering.
   if (!recording_active()) {
-    if (upload_scheduler_) {
-      rotation_scheduler_->Stop();
-      rotation_scheduler_->RotationFinished();
-    } else {
-      scheduler_->Stop();
-      scheduler_->UploadCancelled();
-    }
+    rotation_scheduler_->Stop();
+    rotation_scheduler_->RotationFinished();
     return;
   }
 
@@ -846,39 +798,22 @@
     CloseCurrentLog();
     OpenNewLog();
   }
-  if (upload_scheduler_) {
-    HandleIdleSinceLastTransmission(true);
-    upload_scheduler_->Start();
-    rotation_scheduler_->RotationFinished();
-  } else {
-    SendNextLog();
-  }
+  HandleIdleSinceLastTransmission(true);
+  upload_scheduler_->Start();
+  rotation_scheduler_->RotationFinished();
 }
 
 void MetricsService::SendNextLog() {
   DVLOG(1) << "SendNextLog";
-  if (!upload_scheduler_)
-    DCHECK_EQ(SENDING_LOGS, state_);
   if (!reporting_active()) {
-    if (upload_scheduler_) {
-      upload_scheduler_->StopAndUploadCancelled();
-    } else {
-      scheduler_->Stop();
-      scheduler_->UploadCancelled();
-    }
+    upload_scheduler_->StopAndUploadCancelled();
     return;
   }
   if (!log_store_.has_unsent_logs()) {
     // Should only get here if serializing the log failed somehow.
-    if (upload_scheduler_) {
-      upload_scheduler_->Stop();
-      // Reset backoff interval
-      upload_scheduler_->UploadFinished(true);
-    } else {
-      // Just tell the scheduler it was uploaded and wait for the next log
-      // interval.
-      scheduler_->UploadFinished(true, log_store_.has_unsent_logs());
-    }
+    upload_scheduler_->Stop();
+    // Reset backoff interval
+    upload_scheduler_->UploadFinished(true);
     return;
   }
   if (!log_store_.has_staged_log())
@@ -891,11 +826,7 @@
   if (is_cellular_logic && data_use_tracker_ &&
       !data_use_tracker_->ShouldUploadLogOnCellular(
           log_store_.staged_log_hash().size())) {
-    if (upload_scheduler_) {
-      upload_scheduler_->UploadOverDataUsageCap();
-    } else {
-      scheduler_->UploadCancelled();
-    }
+    upload_scheduler_->UploadOverDataUsageCap();
     upload_canceled = true;
   } else {
     SendStagedLog();
@@ -1008,16 +939,11 @@
   const std::string hash = base::HexEncode(log_store_.staged_log_hash().data(),
                                            log_store_.staged_log_hash().size());
   log_uploader_->UploadLog(log_store_.staged_log(), hash);
-
-  if (!upload_scheduler_)
-    HandleIdleSinceLastTransmission(true);
 }
 
 
 void MetricsService::OnLogUploadComplete(int response_code) {
   DVLOG(1) << "OnLogUploadComplete:" << response_code;
-  if (!upload_scheduler_)
-    DCHECK_EQ(SENDING_LOGS, state_);
   DCHECK(log_upload_in_progress_);
   log_upload_in_progress_ = false;
 
@@ -1051,15 +977,11 @@
   // Error 400 indicates a problem with the log, not with the server, so
   // don't consider that a sign that the server is in trouble.
   bool server_is_healthy = upload_succeeded || response_code == 400;
-  if (upload_scheduler_) {
-    if (!log_store_.has_unsent_logs()) {
-      DVLOG(1) << "Stopping upload_scheduler_";
-      upload_scheduler_->Stop();
-    }
-    upload_scheduler_->UploadFinished(server_is_healthy);
-  } else {
-    scheduler_->UploadFinished(server_is_healthy, log_store_.has_unsent_logs());
+  if (!log_store_.has_unsent_logs()) {
+    DVLOG(1) << "Stopping upload_scheduler_";
+    upload_scheduler_->Stop();
   }
+  upload_scheduler_->UploadFinished(server_is_healthy);
 }
 
 void MetricsService::IncrementLongPrefsValue(const char* path) {

diff --git a/components/metrics/metrics_service.h b/components/metrics/metrics_service.h
index fc23bdc..574e7be 100644
--- a/components/metrics/metrics_service.h
+++ b/components/metrics/metrics_service.h

@@ -51,7 +51,6 @@
 namespace metrics {
 
 class MetricsLogUploader;
-class MetricsReportingScheduler;
 class MetricsRotationScheduler;
 class MetricsUploadScheduler;
 class MetricsServiceAccessor;
@@ -421,9 +420,6 @@
   // A number that identifies the how many times the app has been launched.
   int session_id_;
 
-  // The scheduler for determining when log rotations+uploads should happen.
-  // TODO(holte): Remove this once we've switched to split schedulers.
-  std::unique_ptr<MetricsReportingScheduler> scheduler_;
   // The scheduler for determining when log rotations should happen.
   std::unique_ptr<MetricsRotationScheduler> rotation_scheduler_;
   // The scheduler for determining when uploads should happen.

diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc
index 32e386f..5cc3c15 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc

@@ -479,33 +479,7 @@
   EXPECT_TRUE(test_provider->init_called());
 }
 
-TEST_F(MetricsServiceTest, BasicRotation) {
-  feature_list_.InitAndDisableFeature(kUploadSchedulerFeature);
-  TestMetricsServiceClient client;
-  TestMetricsService service(GetMetricsStateManager(), &client,
-                             GetLocalState());
-  service.InitializeMetricsRecordingState();
-  service.Start();
-  // Should rotate, mark state idle, and start upload.
-  task_runner_->RunPendingTasks();
-  EXPECT_TRUE(client.uploader()->is_uploading());
-  EXPECT_EQ(0U, task_runner_->NumPendingTasks());
-  // Should schedule next rotation on upload completion.
-  client.uploader()->CompleteUpload(200);
-  EXPECT_FALSE(client.uploader()->is_uploading());
-  EXPECT_EQ(1U, task_runner_->NumPendingTasks());
-  // Should cancel rotation due to being idle.
-  task_runner_->RunPendingTasks();
-  EXPECT_FALSE(client.uploader()->is_uploading());
-  EXPECT_EQ(0U, task_runner_->NumPendingTasks());
-  // Should resume rotation on non-idle.
-  service.OnApplicationNotIdle();
-  EXPECT_FALSE(client.uploader()->is_uploading());
-  EXPECT_EQ(1U, task_runner_->NumPendingTasks());
-}
-
 TEST_F(MetricsServiceTest, SplitRotation) {
-  feature_list_.InitAndEnableFeature(kUploadSchedulerFeature);
   TestMetricsServiceClient client;
   TestMetricsService service(GetMetricsStateManager(), &client,
                              GetLocalState());

diff --git a/components/net_log/net_log_file_writer.cc b/components/net_log/net_log_file_writer.cc
index 8b27749..3fb3833 100644
--- a/components/net_log/net_log_file_writer.cc
+++ b/components/net_log/net_log_file_writer.cc

@@ -4,6 +4,7 @@
 
 #include "components/net_log/net_log_file_writer.h"
 
+#include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ -22,6 +23,10 @@
 #include "net/log/net_log_util.h"
 #include "net/url_request/url_request_context_getter.h"
 
+namespace net {
+class URLRequestContext;
+}
+
 namespace net_log {
 
 namespace {
@@ -62,6 +67,19 @@
   return results;
 }
 
+// Generates net log entries for ongoing events from |context_getters| and
+// adds them to |observer|.
+void CreateNetLogEntriesForActiveObjects(
+    const NetLogFileWriter::URLRequestContextGetterList& context_getters,
+    net::NetLog::ThreadSafeObserver* observer) {
+  std::set<net::URLRequestContext*> contexts;
+  for (const auto& getter : context_getters) {
+    DCHECK(getter->GetNetworkTaskRunner()->BelongsToCurrentThread());
+    contexts.insert(getter->GetURLRequestContext());
+  }
+  net::CreateNetLogEntriesForActiveObjects(contexts, observer);
+}
+
 // Adds net info from net::GetNetInfo() to |polled_data|.
 std::unique_ptr<base::DictionaryValue> AddNetInfo(
     scoped_refptr<net::URLRequestContextGetter> context_getter,
@@ -128,10 +146,10 @@
   DCHECK(net_task_runner);
 
   if (file_task_runner_)
-    DCHECK_EQ(file_task_runner, file_task_runner_);
+    DCHECK_EQ(file_task_runner_, file_task_runner);
   file_task_runner_ = file_task_runner;
   if (net_task_runner_)
-    DCHECK_EQ(net_task_runner, net_task_runner_);
+    DCHECK_EQ(net_task_runner_, net_task_runner);
   net_task_runner_ = net_task_runner;
 
   if (state_ != STATE_UNINITIALIZED)
@@ -148,8 +166,10 @@
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void NetLogFileWriter::StartNetLog(const base::FilePath& log_path,
-                                   net::NetLogCaptureMode capture_mode) {
+void NetLogFileWriter::StartNetLog(
+    const base::FilePath& log_path,
+    net::NetLogCaptureMode capture_mode,
+    const URLRequestContextGetterList& context_getters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(file_task_runner_);
 
@@ -161,19 +181,38 @@
 
   DCHECK(!log_path_.empty());
 
-  state_ = STATE_LOGGING;
-  log_exists_ = true;
-  log_capture_mode_known_ = true;
-  log_capture_mode_ = capture_mode;
+  state_ = STATE_STARTING_LOG;
 
   NotifyStateObserversAsync();
 
   std::unique_ptr<base::Value> constants(
       ChromeNetLog::GetConstants(command_line_string_, channel_string_));
-  file_net_log_observer_ =
-      base::MakeUnique<net::FileNetLogObserver>(file_task_runner_);
-  file_net_log_observer_->StartObservingUnbounded(
-      chrome_net_log_, capture_mode, log_path_, std::move(constants), nullptr);
+  // Instantiate a FileNetLogObserver in unbounded mode.
+  file_net_log_observer_ = net::FileNetLogObserver::CreateUnbounded(
+      file_task_runner_, log_path_, std::move(constants));
+
+  net_task_runner_->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&CreateNetLogEntriesForActiveObjects, context_getters,
+                 base::Unretained(file_net_log_observer_.get())),
+      base::Bind(
+          &NetLogFileWriter::StartNetLogAfterCreateEntriesForActiveObjects,
+          weak_ptr_factory_.GetWeakPtr(), capture_mode));
+}
+
+void NetLogFileWriter::StartNetLogAfterCreateEntriesForActiveObjects(
+    net::NetLogCaptureMode capture_mode) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_EQ(STATE_STARTING_LOG, state_);
+
+  state_ = STATE_LOGGING;
+  log_exists_ = true;
+  log_capture_mode_known_ = true;
+  log_capture_mode_ = capture_mode;
+
+  NotifyStateObservers();
+
+  file_net_log_observer_->StartObserving(chrome_net_log_, capture_mode);
 }
 
 void NetLogFileWriter::StopNetLog(
@@ -220,6 +259,9 @@
     case STATE_NOT_LOGGING:
       state_string = "NOT_LOGGING";
       break;
+    case STATE_STARTING_LOG:
+      state_string = "STARTING_LOG";
+      break;
     case STATE_LOGGING:
       state_string = "LOGGING";
       break;
@@ -305,7 +347,7 @@
 void NetLogFileWriter::SetStateAfterSetUpDefaultLogPath(
     const DefaultLogPathResults& set_up_default_log_path_results) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK_EQ(state_, STATE_INITIALIZING);
+  DCHECK_EQ(STATE_INITIALIZING, state_);
 
   if (set_up_default_log_path_results.default_log_path_success) {
     state_ = STATE_NOT_LOGGING;
@@ -321,7 +363,7 @@
 void NetLogFileWriter::StopNetLogAfterAddNetInfo(
     std::unique_ptr<base::DictionaryValue> polled_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK_EQ(state_, STATE_STOPPING_LOG);
+  DCHECK_EQ(STATE_STOPPING_LOG, state_);
 
   file_net_log_observer_->StopObserving(
       std::move(polled_data),

diff --git a/components/net_log/net_log_file_writer.h b/components/net_log/net_log_file_writer.h
index e2f3ca8..1f741c9e 100644
--- a/components/net_log/net_log_file_writer.h
+++ b/components/net_log/net_log_file_writer.h

@@ -71,8 +71,9 @@
   };
 
   using FilePathCallback = base::Callback<void(const base::FilePath&)>;
-
   using DirectoryGetter = base::Callback<bool(base::FilePath*)>;
+  using URLRequestContextGetterList =
+      std::vector<scoped_refptr<net::URLRequestContextGetter>>;
 
   ~NetLogFileWriter();
 
@@ -97,8 +98,14 @@
   // Starts collecting NetLog data into the file at |log_path|. If |log_path| is
   // empty, the default log path is used. If NetLogFileWriter is already
   // logging, this is a no-op and |capture_mode| is ignored.
+  //
+  // |context_getters| is an optional list of URLRequestContextGetters used only
+  // to add log entries for ongoing events when logging starts. They are not
+  // used for retrieving polled data. All the contexts must be bound to the same
+  // thread.
   void StartNetLog(const base::FilePath& log_path,
-                   net::NetLogCaptureMode capture_mode);
+                   net::NetLogCaptureMode capture_mode,
+                   const URLRequestContextGetterList& context_getters);
 
   // Stops collecting NetLog data into the file. It is a no-op if
   // NetLogFileWriter is currently not logging.
@@ -108,6 +115,9 @@
   // If |context_getter| is not null, then  StopNetLog() will automatically
   // append net info (from net::GetNetInfo() retrieved using |context_getter|)
   // to |polled_data|.
+  // Note that StopNetLog() accepts (optionally) only one context getter for
+  // retrieving net polled data as opposed to StartNetLog() which accepts zero
+  // or more context getters for retrieving ongoing net events.
   void StopNetLog(std::unique_ptr<base::DictionaryValue> polled_data,
                   scoped_refptr<net::URLRequestContextGetter> context_getter);
 
@@ -154,6 +164,8 @@
     STATE_INITIALIZING,
     // Not currently logging to file.
     STATE_NOT_LOGGING,
+    // Currently in the process of starting the log.
+    STATE_STARTING_LOG,
     // Currently logging to file.
     STATE_LOGGING,
     // Currently in the process of stopping the log.
@@ -167,12 +179,19 @@
 
   // Called internally by Initialize(). Will initialize NetLogFileWriter's state
   // variables after the default log directory is set up and the default log
-  // path is determined.
+  // path is determined on the |file_task_runner_|.
   void SetStateAfterSetUpDefaultLogPath(
       const DefaultLogPathResults& set_up_default_log_path_results);
 
-  // Called internally by StopNetLog(). Does the actual work needed by
-  // StopNetLog() outside of retrieving the net info.
+  // Called internally by StartNetLog(). Contains tasks to be done to start
+  // logging after net log entries for ongoing events are added to the log from
+  // the |net_task_runner_|.
+  void StartNetLogAfterCreateEntriesForActiveObjects(
+      net::NetLogCaptureMode capture_mode);
+
+  // Called internally by StopNetLog(). Contains tasks to be done to stop
+  // logging after net-thread polled data is retrieved on the
+  // |net_task_runner_|.
   void StopNetLogAfterAddNetInfo(
       std::unique_ptr<base::DictionaryValue> polled_data);
 

diff --git a/components/net_log/net_log_file_writer_unittest.cc b/components/net_log/net_log_file_writer_unittest.cc
index bca94fb..af2b4e0a 100644
--- a/components/net_log/net_log_file_writer_unittest.cc
+++ b/components/net_log/net_log_file_writer_unittest.cc

@@ -46,6 +46,7 @@
 const char kStateUninitializedString[] = "UNINITIALIZED";
 const char kStateInitializingString[] = "INITIALIZING";
 const char kStateNotLoggingString[] = "NOT_LOGGING";
+const char kStateStartingLogString[] = "STARTING_LOG";
 const char kStateLoggingString[] = "LOGGING";
 const char kStateStoppingLogString[] = "STOPPING_LOG";
 }  // namespace
@@ -180,6 +181,23 @@
       base::ThreadTaskRunnerHandle::Get(), std::move(context));
 }
 
+void SetUpTestContextGetterWithRequest(
+    net::NetLog* net_log,
+    const GURL& url,
+    net::URLRequest::Delegate* delegate,
+    scoped_refptr<net::TestURLRequestContextGetter>* context_getter,
+    std::unique_ptr<net::URLRequest>* request) {
+  auto context = base::MakeUnique<net::TestURLRequestContext>(true);
+  context->set_net_log(net_log);
+  context->Init();
+
+  *request = context->CreateRequest(url, net::IDLE, delegate);
+  (*request)->Start();
+
+  *context_getter = new net::TestURLRequestContextGetter(
+      base::ThreadTaskRunnerHandle::Get(), std::move(context));
+}
+
 // An implementation of NetLogFileWriter::StateObserver that allows waiting
 // until it's notified of a new state.
 class TestStateObserver : public NetLogFileWriter::StateObserver {
@@ -231,6 +249,9 @@
 
 class NetLogFileWriterTest : public ::testing::Test {
  public:
+  using URLRequestContextGetterList =
+      std::vector<scoped_refptr<net::URLRequestContextGetter>>;
+
   NetLogFileWriterTest()
       : net_log_(base::FilePath(),
                  net::NetLogCaptureMode::Default(),
@@ -308,16 +329,17 @@
 
   // If |custom_log_path| is empty path, |net_log_file_writer_| will use its
   // default log path, which is cached in |default_log_path_|.
-  WARN_UNUSED_RESULT ::testing::AssertionResult StartThenVerifyNewState(
+  WARN_UNUSED_RESULT::testing::AssertionResult StartThenVerifyNewState(
       const base::FilePath& custom_log_path,
       net::NetLogCaptureMode capture_mode,
-      const std::string& expected_capture_mode_string) {
-    net_log_file_writer_.StartNetLog(custom_log_path, capture_mode);
+      const std::string& expected_capture_mode_string,
+      const URLRequestContextGetterList& context_getters) {
+    net_log_file_writer_.StartNetLog(custom_log_path, capture_mode,
+                                     context_getters);
     std::unique_ptr<base::DictionaryValue> state =
         test_state_observer_.WaitForNewState();
     ::testing::AssertionResult result =
-        VerifyState(std::move(state), kStateLoggingString, true, true,
-                    expected_capture_mode_string);
+        VerifyState(std::move(state), kStateStartingLogString);
     if (!result) {
       return ::testing::AssertionFailure()
              << "First state after StartNetLog() does not match expected:"
@@ -325,6 +347,16 @@
              << result.message();
     }
 
+    state = test_state_observer_.WaitForNewState();
+    result = VerifyState(std::move(state), kStateLoggingString, true, true,
+                         expected_capture_mode_string);
+    if (!result) {
+      return ::testing::AssertionFailure()
+             << "Second state after StartNetLog() does not match expected:"
+             << std::endl
+             << result.message();
+    }
+
     // Make sure GetFilePath() returns empty path when logging.
     base::FilePath actual_log_path = FileWriterGetFilePathToCompletedLog();
     if (!actual_log_path.empty()) {
@@ -463,16 +495,20 @@
   for (int i = 0; i < 3; ++i) {
     // StartNetLog(), should result in state change.
     ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(), capture_modes[i],
-                                        capture_mode_strings[i]));
+                                        capture_mode_strings[i],
+                                        URLRequestContextGetterList()));
 
     // Calling StartNetLog() again should be a no-op. Try doing StartNetLog()
     // with various capture modes; they should all be ignored and result in no
     // state change.
-    net_log_file_writer_.StartNetLog(base::FilePath(), capture_modes[i]);
+    net_log_file_writer_.StartNetLog(base::FilePath(), capture_modes[i],
+                                     URLRequestContextGetterList());
     net_log_file_writer_.StartNetLog(base::FilePath(),
-                                     capture_modes[(i + 1) % 3]);
+                                     capture_modes[(i + 1) % 3],
+                                     URLRequestContextGetterList());
     net_log_file_writer_.StartNetLog(base::FilePath(),
-                                     capture_modes[(i + 2) % 3]);
+                                     capture_modes[(i + 2) % 3],
+                                     URLRequestContextGetterList());
 
     // StopNetLog(), should result in state change. The capture mode should
     // match that of the first StartNetLog() call (called by
@@ -487,7 +523,8 @@
   // Start and stop one more time just to make sure the last StopNetLog() call
   // was properly ignored and left |net_log_file_writer_| in a valid state.
   ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(), capture_modes[0],
-                                      capture_mode_strings[0]));
+                                      capture_mode_strings[0],
+                                      URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(base::FilePath(), nullptr, nullptr,
                                             capture_mode_strings[0]));
@@ -498,9 +535,9 @@
 TEST_F(NetLogFileWriterTest, StartClearsFile) {
   ASSERT_TRUE(InitializeThenVerifyNewState(true, false));
 
-  ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(),
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(base::FilePath(), nullptr, nullptr,
                                             kCaptureModeDefaultString));
@@ -519,9 +556,9 @@
 
   // Start and stop again and make sure the file is back to the size it was
   // before adding the junk data.
-  ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(),
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(base::FilePath(), nullptr, nullptr,
                                             kCaptureModeDefaultString));
@@ -537,9 +574,9 @@
 TEST_F(NetLogFileWriterTest, AddEvent) {
   ASSERT_TRUE(InitializeThenVerifyNewState(true, false));
 
-  ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(),
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(base::FilePath(), nullptr, nullptr,
                                             kCaptureModeDefaultString));
@@ -548,9 +585,9 @@
   int64_t stop_file_size;
   EXPECT_TRUE(base::GetFileSize(default_log_path_, &stop_file_size));
 
-  ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(),
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   net_log_.AddGlobalEntry(net::NetLogEventType::CANCELLED);
 
@@ -575,9 +612,9 @@
   EXPECT_TRUE(
       base::CreateDirectoryAndGetError(custom_log_path.DirName(), nullptr));
 
-  ASSERT_TRUE(StartThenVerifyNewState(custom_log_path,
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      custom_log_path, net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(custom_log_path, nullptr, nullptr,
                                             kCaptureModeDefaultString));
@@ -586,9 +623,9 @@
   int64_t stop_file_size;
   EXPECT_TRUE(base::GetFileSize(custom_log_path, &stop_file_size));
 
-  ASSERT_TRUE(StartThenVerifyNewState(custom_log_path,
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      custom_log_path, net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   net_log_.AddGlobalEntry(net::NetLogEventType::CANCELLED);
 
@@ -621,9 +658,9 @@
       init_done.closure());
   init_done.WaitForResult();
 
-  ASSERT_TRUE(StartThenVerifyNewState(base::FilePath(),
-                                      net::NetLogCaptureMode::Default(),
-                                      kCaptureModeDefaultString));
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, URLRequestContextGetterList()));
 
   ASSERT_TRUE(StopThenVerifyNewStateAndFile(
       base::FilePath(), std::move(dummy_polled_data), context_getter,
@@ -652,6 +689,53 @@
   EXPECT_EQ(kDummyQuicParam, timeout);
 }
 
+TEST_F(NetLogFileWriterTest, StartWithContextGetters) {
+  ASSERT_TRUE(InitializeThenVerifyNewState(true, false));
+
+  // Create test context getter and request on |net_thread_| and wait for it to
+  // finish.
+  const std::string kDummyUrl = "blah:blah";
+  scoped_refptr<net::TestURLRequestContextGetter> context_getter;
+  std::unique_ptr<net::URLRequest> request;
+  net::TestDelegate delegate;
+  delegate.set_quit_on_complete(false);
+
+  net::TestClosure init_done;
+  net_thread_.task_runner()->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&SetUpTestContextGetterWithRequest, &net_log_, GURL(kDummyUrl),
+                 &delegate, &context_getter, &request),
+      init_done.closure());
+  init_done.WaitForResult();
+
+  ASSERT_TRUE(StartThenVerifyNewState(
+      base::FilePath(), net::NetLogCaptureMode::Default(),
+      kCaptureModeDefaultString, {context_getter}));
+
+  ASSERT_TRUE(StopThenVerifyNewStateAndFile(base::FilePath(), nullptr, nullptr,
+                                            kCaptureModeDefaultString));
+
+  // Read events from log file.
+  std::unique_ptr<base::DictionaryValue> root;
+  ASSERT_TRUE(ReadCompleteLogFile(default_log_path_, &root));
+  base::ListValue* events;
+  ASSERT_TRUE(root->GetList("events", &events));
+
+  // Check there is at least one event as a result of the ongoing request.
+  EXPECT_GE(events->GetSize(), 1u);
+
+  // Check the URL in the params of the first event.
+  base::DictionaryValue* event;
+  EXPECT_TRUE(events->GetDictionary(0, &event));
+  base::DictionaryValue* event_params;
+  EXPECT_TRUE(event->GetDictionary("params", &event_params));
+  std::string event_url;
+  EXPECT_TRUE(event_params->GetString("url", &event_url));
+  EXPECT_EQ(kDummyUrl, event_url);
+
+  net_thread_.task_runner()->DeleteSoon(FROM_HERE, request.release());
+}
+
 TEST_F(NetLogFileWriterTest, ReceiveStartWhileInitializing) {
   // Trigger initialization of |net_log_file_writer_|.
   net_log_file_writer_.Initialize(file_thread_.task_runner(),
@@ -663,7 +747,8 @@
   // before |net_log_file_writer_| finishes initialization, which means this
   // should be a no-op.
   net_log_file_writer_.StartNetLog(base::FilePath(),
-                                   net::NetLogCaptureMode::Default());
+                                   net::NetLogCaptureMode::Default(),
+                                   URLRequestContextGetterList());
 
   // Now run the main message loop. Make sure StartNetLog() was ignored by
   // checking that the next two states are "initializing" followed by
@@ -682,7 +767,7 @@
   // Call StartNetLog() on |net_log_file_writer_| and wait for the state change.
   ASSERT_TRUE(StartThenVerifyNewState(
       base::FilePath(), net::NetLogCaptureMode::IncludeSocketBytes(),
-      kCaptureModeIncludeSocketBytesString));
+      kCaptureModeIncludeSocketBytesString, URLRequestContextGetterList()));
 
   // Tell |net_log_file_writer_| to stop logging.
   net_log_file_writer_.StopNetLog(nullptr, nullptr);
@@ -693,7 +778,8 @@
   // |net_log_file_writer_| finishes stopping, which means this should be a
   // no-op.
   net_log_file_writer_.StartNetLog(base::FilePath(),
-                                   net::NetLogCaptureMode::Default());
+                                   net::NetLogCaptureMode::Default(),
+                                   URLRequestContextGetterList());
 
   // Now run the main message loop. Make sure the last StartNetLog() was
   // ignored by checking that the next two states are "stopping-log" followed by

diff --git a/components/ntp_snippets/remote/remote_suggestion_unittest.cc b/components/ntp_snippets/remote/remote_suggestion_unittest.cc
index 433dd40..e68e106 100644
--- a/components/ntp_snippets/remote/remote_suggestion_unittest.cc
+++ b/components/ntp_snippets/remote/remote_suggestion_unittest.cc

@@ -400,7 +400,7 @@
   proto.set_dismissed(false);
   proto.set_remote_category_id(1);
   proto.set_fetch_date(1476364691);
-  auto source = proto.add_sources();
+  auto* source = proto.add_sources();
   source->set_url("http://cool-suggestions.com/");
   source->set_publisher_name("Great Suggestions Inc.");
   source->set_amp_url("http://cdn.ampproject.org/c/foo/");

diff --git a/components/ntp_snippets_strings.grdp b/components/ntp_snippets_strings.grdp
index e9e2ef5..25c61a7 100644
--- a/components/ntp_snippets_strings.grdp
+++ b/components/ntp_snippets_strings.grdp

@@ -54,4 +54,8 @@
     Your open tabs appear here
   </message>
 
+  <message name="IDS_NTP_NOTIFICATIONS_READ_THIS_STORY_AND_MORE" desc="When notifying the user about a news article, identifies the publisher of that article and gives the number of additional news articles that are available to read. Shown beneath the title of the article. Articles come in batches of 10, so the number of additional articles will usually be 9.">
+    Read stories from <ph name="ARTICLE_PUBLISHER">$1<ex>World News Corporation</ex></ph> and <ph name="OTHER_ARTICLE_COUNT">$2<ex>9</ex></ph> more
+  </message>
+
 </grit-part>

diff --git a/components/offline_pages/core/background/offliner.h b/components/offline_pages/core/background/offliner.h
index a7a5718..c2cf768 100644
--- a/components/offline_pages/core/background/offliner.h
+++ b/components/offline_pages/core/background/offliner.h

@@ -75,6 +75,10 @@
   // CompletionCallback.
   virtual void Cancel() = 0;
 
+  // Handles timeout scenario. Returns true if lowbar is met and try to do a
+  // snapshot of the current webcontents.
+  virtual bool HandleTimeout(const SavePageRequest& request) = 0;
+
   // TODO(dougarnett): add policy support methods.
 };
 

diff --git a/components/offline_pages/core/background/offliner_stub.cc b/components/offline_pages/core/background/offliner_stub.cc
index 0455fe0..3b3c1f56 100644
--- a/components/offline_pages/core/background/offliner_stub.cc
+++ b/components/offline_pages/core/background/offliner_stub.cc

@@ -11,7 +11,10 @@
 namespace offline_pages {
 
 OfflinerStub::OfflinerStub()
-    : disable_loading_(false), enable_callback_(false), cancel_called_(false) {}
+    : disable_loading_(false),
+      enable_callback_(false),
+      cancel_called_(false),
+      snapshot_on_last_retry_(false) {}
 
 OfflinerStub::~OfflinerStub() {}
 
@@ -35,4 +38,14 @@
   cancel_called_ = true;
 }
 
+bool OfflinerStub::HandleTimeout(const SavePageRequest& request) {
+  if (snapshot_on_last_retry_) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE,
+        base::Bind(callback_, request, Offliner::RequestStatus::SAVED));
+    return true;
+  }
+  return false;
+}
+
 }  // namespace offline_pages

diff --git a/components/offline_pages/core/background/offliner_stub.h b/components/offline_pages/core/background/offliner_stub.h
index f7922606..821f5ea9 100644
--- a/components/offline_pages/core/background/offliner_stub.h
+++ b/components/offline_pages/core/background/offliner_stub.h

@@ -27,11 +27,18 @@
 
   bool cancel_called() { return cancel_called_; }
 
+  void reset_cancel_called() { cancel_called_ = false; }
+
+  bool HandleTimeout(const SavePageRequest& request) override;
+
+  void enable_snapshot_on_last_retry() { snapshot_on_last_retry_ = true; }
+
  private:
   CompletionCallback callback_;
   bool disable_loading_;
   bool enable_callback_;
   bool cancel_called_;
+  bool snapshot_on_last_retry_;
 };
 
 }  // namespace offline_pages

diff --git a/components/offline_pages/core/background/request_coordinator.cc b/components/offline_pages/core/background/request_coordinator.cc
index 83a844b09..aaa2821 100644
--- a/components/offline_pages/core/background/request_coordinator.cc
+++ b/components/offline_pages/core/background/request_coordinator.cc

@@ -504,6 +504,8 @@
 void RequestCoordinator::HandleWatchdogTimeout() {
   Offliner::RequestStatus watchdog_status =
       Offliner::REQUEST_COORDINATOR_TIMED_OUT;
+  if (offliner_->HandleTimeout(*active_request_.get()))
+    return;
   StopPrerendering(watchdog_status);
   TryNextRequest(!kStartOfProcessing);
 }

diff --git a/components/offline_pages/core/background/request_coordinator_unittest.cc b/components/offline_pages/core/background/request_coordinator_unittest.cc
index f5dc20d..8fc4f2a7d 100644
--- a/components/offline_pages/core/background/request_coordinator_unittest.cc
+++ b/components/offline_pages/core/background/request_coordinator_unittest.cc

@@ -171,6 +171,10 @@
     offliner_->enable_callback(enable);
   }
 
+  void EnableSnapshotOnLastRetry() {
+    offliner_->enable_snapshot_on_last_retry();
+  }
+
   void SetEffectiveConnectionTypeForTest(net::EffectiveConnectionType type) {
     network_quality_provider_->SetEffectiveConnectionTypeForTest(type);
   }
@@ -249,6 +253,8 @@
 
   bool OfflinerWasCanceled() const { return offliner_->cancel_called(); }
 
+  void ResetOfflinerWasCanceled() { offliner_->reset_cancel_called(); }
+
   ObserverStub observer() { return observer_; }
 
   DeviceConditions device_conditions() { return device_conditions_; }
@@ -1072,7 +1078,8 @@
   EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, observer().state());
 }
 
-TEST_F(RequestCoordinatorTest, WatchdogTimeoutForScheduledProcessing) {
+TEST_F(RequestCoordinatorTest,
+       WatchdogTimeoutForScheduledProcessingNoLastSnapshot) {
   // Build a request to use with the pre-renderer, and put it on the queue.
   offline_pages::SavePageRequest request(kRequestId1, kUrl1, kClientId1,
                                          base::Time::Now(), kUserRequested);
@@ -1112,7 +1119,8 @@
   EXPECT_TRUE(OfflinerWasCanceled());
 }
 
-TEST_F(RequestCoordinatorTest, WatchdogTimeoutForImmediateProcessing) {
+TEST_F(RequestCoordinatorTest,
+       WatchdogTimeoutForImmediateProcessingNoLastSnapshot) {
   // Ensure that the new request does not finish - we simulate it being
   // in progress by asking it to skip making the completion callback.
   EnableOfflinerCallback(false);
@@ -1432,4 +1440,106 @@
   EXPECT_TRUE(is_busy());
 }
 
+TEST_F(RequestCoordinatorTest, SnapshotOnLastTryForScheduledProcessing) {
+  // Build a request to use with the pre-renderer, and put it on the queue.
+  offline_pages::SavePageRequest request(kRequestId1, kUrl1, kClientId1,
+                                         base::Time::Now(), kUserRequested);
+  // Set request to allow one more completed attempt. So that the next try would
+  // be the last retry.
+  int max_tries = coordinator()->policy()->GetMaxCompletedTries();
+  request.set_completed_attempt_count(max_tries - 1);
+  coordinator()->queue()->AddRequest(
+      request,
+      base::Bind(&RequestCoordinatorTest::AddRequestDone,
+                 base::Unretained(this)));
+  PumpLoop();
+
+  // Ensure that the new request does not finish - we simulate it being
+  // in progress by asking it to skip making the completion callback.
+  // Also make snapshot on last retry happen in this case.
+  EnableOfflinerCallback(false);
+  EnableSnapshotOnLastRetry();
+
+  // Sending the request to the offliner.
+  EXPECT_TRUE(coordinator()->StartScheduledProcessing(device_conditions(),
+                                                      waiting_callback()));
+  PumpLoop();
+
+  // Advance the mock clock far enough to cause a watchdog timeout
+  AdvanceClockBy(base::TimeDelta::FromSeconds(
+      coordinator()
+          ->policy()
+          ->GetSinglePageTimeLimitWhenBackgroundScheduledInSeconds() +
+      1));
+  PumpLoop();
+
+  // Wait for timeout to expire.  Use a TaskRunner with a DelayedTaskRunner
+  // which won't time out immediately, so the watchdog thread doesn't kill valid
+  // tasks too soon.
+  WaitForCallback();
+  PumpLoop();
+
+  // Check the offliner didn't get a cancel and the result was success.
+  EXPECT_FALSE(OfflinerWasCanceled());
+  EXPECT_EQ(RequestCoordinator::BackgroundSavePageResult::SUCCESS,
+            observer().last_status());
+  EXPECT_TRUE(observer().completed_called());
+}
+
+TEST_F(RequestCoordinatorTest, SnapshotOnLastTryForImmediateProcessing) {
+  // Ensure that the new request does not finish - we simulate it being
+  // in progress by asking it to skip making the completion callback.
+  EnableOfflinerCallback(false);
+
+  EXPECT_NE(coordinator()->SavePageLater(
+                kUrl1, kClientId1, kUserRequested,
+                RequestCoordinator::RequestAvailability::ENABLED_FOR_OFFLINER),
+            0);
+
+  // Repeat the timeout for MaxCompleteTries - 1 times in order to increase the
+  // completed tries on this request.
+  int max_tries = coordinator()->policy()->GetMaxCompletedTries();
+  for (int i = 0; i < max_tries - 1; i++) {
+    PumpLoop();
+    // Reset states.
+    ResetOfflinerWasCanceled();
+    observer().Clear();
+
+    // Verify that the request is being processed.
+    EXPECT_TRUE(coordinator()->is_busy());
+
+    // Advance the mock clock 1 second more than the watchdog timeout.
+    AdvanceClockBy(base::TimeDelta::FromSeconds(
+        coordinator()
+            ->policy()
+            ->GetSinglePageTimeLimitForImmediateLoadInSeconds() +
+        1));
+    PumpLoop();
+
+    // Verify the request timed out.
+    EXPECT_TRUE(OfflinerWasCanceled());
+    EXPECT_TRUE(observer().changed_called());
+  }
+
+  // Reset states.
+  ResetOfflinerWasCanceled();
+  observer().Clear();
+  // Make snapshot on last retry happen.
+  EnableSnapshotOnLastRetry();
+
+  // Advance the mock clock 1 second more than the watchdog timeout.
+  AdvanceClockBy(base::TimeDelta::FromSeconds(
+      coordinator()
+          ->policy()
+          ->GetSinglePageTimeLimitForImmediateLoadInSeconds() +
+      1));
+  PumpLoop();
+
+  // The last time would trigger the snapshot on last retry and succeed.
+  EXPECT_FALSE(OfflinerWasCanceled());
+  EXPECT_EQ(RequestCoordinator::BackgroundSavePageResult::SUCCESS,
+            observer().last_status());
+  EXPECT_TRUE(observer().completed_called());
+}
+
 }  // namespace offline_pages

diff --git a/components/offline_pages/core/downloads/download_ui_adapter.cc b/components/offline_pages/core/downloads/download_ui_adapter.cc
index bfc4526f..d73ed68 100644
--- a/components/offline_pages/core/downloads/download_ui_adapter.cc
+++ b/components/offline_pages/core/downloads/download_ui_adapter.cc

@@ -192,6 +192,19 @@
   return 0;
 }
 
+void DownloadUIAdapter::UpdateProgress(int64_t offline_id, int64_t bytes) {
+  for (auto& item : items_) {
+    if (item.second->is_request && item.second->offline_id == offline_id) {
+      if (bytes == item.second->ui_item->download_progress_bytes)
+        return;
+
+      item.second->ui_item->download_progress_bytes = bytes;
+      for (Observer& observer : observers_)
+        observer.ItemUpdated(*(item.second->ui_item));
+    }
+  }
+}
+
 // Note that several LoadCache calls may be issued before the async GetAllPages
 // comes back.
 void DownloadUIAdapter::LoadCache() {

diff --git a/components/offline_pages/core/downloads/download_ui_adapter.h b/components/offline_pages/core/downloads/download_ui_adapter.h
index abf413a..f0ecbd6a 100644
--- a/components/offline_pages/core/downloads/download_ui_adapter.h
+++ b/components/offline_pages/core/downloads/download_ui_adapter.h

@@ -95,6 +95,7 @@
   // via Observer or directly by the user (as in 'open').
   void DeleteItem(const std::string& guid);
   int64_t GetOfflineIdByGuid(const std::string& guid) const;
+  void UpdateProgress(int64_t offline_id, int64_t bytes);
 
   // OfflinePageModel::Observer
   void OfflinePageModelLoaded(OfflinePageModel* model) override;

diff --git a/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc b/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc
index d74b2ed..aed1609 100644
--- a/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc
+++ b/components/offline_pages/core/downloads/download_ui_adapter_unittest.cc

@@ -455,4 +455,21 @@
   EXPECT_TRUE(items_loaded);
 }
 
+TEST_F(DownloadUIAdapterTest, UpdateProgress) {
+  offliner_stub->enable_callback(true);
+  AddRequest(GURL(kTestUrl), kTestClientId1);
+  PumpLoop();
+
+  int64_t offline_id = adapter->GetOfflineIdByGuid(kTestGuid1);
+  const DownloadUIItem* item = adapter->GetItem(kTestGuid1);
+
+  ASSERT_NE(nullptr, item);
+  EXPECT_EQ(item->download_progress_bytes, 0);
+  updated_guids.clear();
+
+  adapter->UpdateProgress(offline_id, 15);
+  EXPECT_EQ(kTestGuid1, updated_guids[0]);
+  EXPECT_EQ(item->download_progress_bytes, 15);
+}
+
 }  // namespace offline_pages

diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 2ba6a8a..4528511 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn

@@ -53,6 +53,8 @@
     "builtin_provider.h",
     "clipboard_url_provider.cc",
     "clipboard_url_provider.h",
+    "features.cc",
+    "features.h",
     "history_provider.cc",
     "history_provider.h",
     "history_quick_provider.cc",

diff --git a/components/omnibox/browser/features.cc b/components/omnibox/browser/features.cc
new file mode 100644
index 0000000..4ab8d4a
--- /dev/null
+++ b/components/omnibox/browser/features.cc

@@ -0,0 +1,13 @@
+// Copyright 2017 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/omnibox/browser/features.h"
+
+namespace features {
+
+// Feature used for the Zero Suggest Redirect to Chrome Field Trial.
+const base::Feature kZeroSuggestRedirectToChrome{
+    "ZeroSuggestRedirectToChrome", base::FEATURE_DISABLED_BY_DEFAULT};
+
+}  // namespace features

diff --git a/components/omnibox/browser/features.h b/components/omnibox/browser/features.h
new file mode 100644
index 0000000..06b9d2a
--- /dev/null
+++ b/components/omnibox/browser/features.h

@@ -0,0 +1,16 @@
+// Copyright 2017 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_OMNIBOX_BROWSER_FEATURES_H_
+#define COMPONENTS_OMNIBOX_BROWSER_FEATURES_H_
+
+#include "base/feature_list.h"
+
+namespace features {
+
+extern const base::Feature kZeroSuggestRedirectToChrome;
+
+}  // namespace features
+
+#endif  // COMPONENTS_OMNIBOX_BROWSER_FEATURES_H_

diff --git a/components/omnibox/browser/in_memory_url_index_unittest.cc b/components/omnibox/browser/in_memory_url_index_unittest.cc
index 57751d8..1e08dce 100644
--- a/components/omnibox/browser/in_memory_url_index_unittest.cc
+++ b/components/omnibox/browser/in_memory_url_index_unittest.cc

@@ -792,7 +792,7 @@
 
   // Each next group should fill almost everything, while the previous group
   // should occupy what's left.
-  auto error_position = std::adjacent_find(
+  auto* error_position = std::adjacent_find(
       std::begin(item_groups), std::end(item_groups),
       [&](const ItemGroup& previous, const ItemGroup& current) {
         auto ids = GetHistoryIdsUpTo(current.max_id);

diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
index ef1e0e4..935e2b1 100644
--- a/components/omnibox/browser/omnibox_field_trial.cc
+++ b/components/omnibox/browser/omnibox_field_trial.cc

@@ -17,6 +17,7 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
+#include "components/omnibox/browser/features.h"
 #include "components/omnibox/browser/omnibox_switches.h"
 #include "components/omnibox/browser/url_index_private_data.h"
 #include "components/search/search.h"
@@ -46,10 +47,6 @@
 // Field trial names.
 const char kStopTimerFieldTrialName[] = "OmniboxStopTimer";
 
-// Feature used for the Zero Suggest Redirect to Chrome Field Trial.
-const base::Feature kZeroSuggestRedirectToChrome{
-    "ZeroSuggestRedirectToChrome", base::FEATURE_DISABLED_BY_DEFAULT};
-
 void InitializeBucketsFromString(const std::string& bucket_string,
                                  ScoreBuckets* score_buckets) {
   // Clear the buckets.
@@ -592,20 +589,20 @@
 
 // static
 bool OmniboxFieldTrial::InZeroSuggestRedirectToChromeFieldTrial() {
-  return base::FeatureList::IsEnabled(kZeroSuggestRedirectToChrome);
+  return base::FeatureList::IsEnabled(features::kZeroSuggestRedirectToChrome);
 }
 
 // static
 std::string OmniboxFieldTrial::ZeroSuggestRedirectToChromeServerAddress() {
   return base::GetFieldTrialParamValueByFeature(
-      kZeroSuggestRedirectToChrome,
+      features::kZeroSuggestRedirectToChrome,
       kZeroSuggestRedirectToChromeServerAddressParam);
 }
 
 // static
 std::string OmniboxFieldTrial::ZeroSuggestRedirectToChromeAdditionalFields() {
   return base::GetFieldTrialParamValueByFeature(
-      kZeroSuggestRedirectToChrome,
+      features::kZeroSuggestRedirectToChrome,
       kZeroSuggestRedirectToChromeAdditionalFieldsParam);
 }
 

diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp
index 0b65fc9a..9553cd0 100644
--- a/components/payments_strings.grdp
+++ b/components/payments_strings.grdp

@@ -70,6 +70,9 @@
   <message name="IDS_PAYMENTS_LOADING_MESSAGE" desc="The text that informs the user that payment information is being loaded up." formatter_data="android_java">
     Loading
   </message>
+  <message name="IDS_PAYMENTS_PROCESSING_MESSAGE" desc="The text that informs the user that payment is being processed." formatter_data="android_java">
+    Processing
+  </message>
   <message name="IDS_PAYMENTS_ERROR_MESSAGE" desc="The text that informs the user that there is error in verifying and charging the payment." formatter_data="android_java">
     There was an error processing your order.  Please check your account and try again.
   </message>

diff --git a/components/precache/core/precache_fetcher.cc b/components/precache/core/precache_fetcher.cc
index e84c4d5..bab9bc5 100644
--- a/components/precache/core/precache_fetcher.cc
+++ b/components/precache/core/precache_fetcher.cc

@@ -22,6 +22,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/optional.h"
 #include "base/sha1.h"
 #include "base/strings/string_piece.h"
 #include "base/task_runner_util.h"
@@ -125,18 +126,38 @@
 }
 
 // Returns the resource selection bitset from the |manifest| for the given
-// |experiment_id|. By default all resource will be selected if the experiment
-// group is not found.
-uint64_t GetResourceBitset(const PrecacheManifest& manifest,
-                           uint32_t experiment_id) {
+// |experiment_id|. If the experiment group is not found, then this returns
+// nullopt, in which case all resources should be selected.
+base::Optional<std::vector<bool>> GetResourceBitset(
+    const PrecacheManifest& manifest,
+    uint32_t experiment_id) {
+  base::Optional<std::vector<bool>> ret;
   if (manifest.has_experiments()) {
     const auto& resource_bitset_map =
         manifest.experiments().resources_by_experiment_group();
-    const auto& resource_bitset_it = resource_bitset_map.find(experiment_id);
-    if (resource_bitset_it != resource_bitset_map.end())
-      return resource_bitset_it->second.bitset();
+    const auto& it = resource_bitset_map.find(experiment_id);
+    if (it != resource_bitset_map.end()) {
+      if (it->second.has_bitset()) {
+        const std::string& bitset = it->second.bitset();
+        ret.emplace(bitset.size() * 8);
+        for (size_t i = 0; i < bitset.size(); ++i) {
+          for (size_t j = 0; j < 8; ++j) {
+            if ((1 << j) & bitset[i])
+              ret.value()[i * 8 + j] = true;
+          }
+        }
+      } else if (it->second.has_deprecated_bitset()) {
+        uint64_t bitset = it->second.deprecated_bitset();
+        ret.emplace(64);
+        for (int i = 0; i < 64; ++i) {
+          if ((0x1ULL << i) & bitset)
+            ret.value()[i] = true;
+        }
+      }
+    }
   }
-  return ~0ULL;
+  // Only return one variable to ensure RVO triggers.
+  return ret;
 }
 
 // URLFetcherResponseWriter that ignores the response body, in order to avoid
@@ -419,6 +440,11 @@
   UMA_HISTOGRAM_CUSTOM_COUNTS("Precache.Fetch.ResponseBytes.Network",
                               unfinished_work.network_bytes(), 1,
                               kMaxResponseBytes, 100);
+
+  if (unfinished_work.has_min_weight_fetched()) {
+    UMA_HISTOGRAM_COUNTS_1000("Precache.Fetch.MinWeight",
+                              unfinished_work.min_weight_fetched() * 1000);
+  }
 }
 
 // static
@@ -458,10 +484,8 @@
   // keeping track of the current resource index.
   for (const auto& resource : unfinished_work->resource()) {
     if (resource.has_url() && resource.has_top_host_name()) {
-      // Weight doesn't matter, as the resources have already been sorted by
-      // this point.
-      resources_to_fetch_.emplace_back(GURL(resource.url()),
-                                       resource.top_host_name(), 0);
+      resources_to_fetch_.emplace_back(
+          GURL(resource.url()), resource.top_host_name(), resource.weight());
     }
   }
   unfinished_work_ = std::move(unfinished_work);
@@ -489,11 +513,13 @@
     auto* new_resource = unfinished_work_->add_resource();
     new_resource->set_url(resource.url.spec());
     new_resource->set_top_host_name(resource.referrer);
+    new_resource->set_weight(resource.weight);
   }
   for (const auto& resource : resources_to_fetch_) {
     auto* new_resource = unfinished_work_->add_resource();
     new_resource->set_url(resource.url.spec());
     new_resource->set_top_host_name(resource.referrer);
+    new_resource->set_weight(resource.weight);
   }
   top_hosts_fetching_.clear();
   top_hosts_to_fetch_.clear();
@@ -561,9 +587,8 @@
   }
 }
 
-void PrecacheFetcher::NotifyDone(
-    size_t remaining_manifest_urls_to_fetch,
-    size_t remaining_resource_urls_to_fetch) {
+void PrecacheFetcher::NotifyDone(size_t remaining_manifest_urls_to_fetch,
+                                 size_t remaining_resource_urls_to_fetch) {
   RecordCompletionStatistics(*unfinished_work_,
                              remaining_manifest_urls_to_fetch,
                              remaining_resource_urls_to_fetch);
@@ -743,21 +768,25 @@
     PrecacheManifest manifest;
 
     if (ParseProtoFromFetchResponse(*source.network_url_fetcher(), &manifest)) {
-      const int32_t len =
-          std::min(manifest.resource_size(),
-                   unfinished_work_->config_settings().top_resources_count());
-      const uint64_t resource_bitset =
+      const base::Optional<std::vector<bool>> resource_bitset =
           GetResourceBitset(manifest, experiment_id_);
-      for (int i = 0; i < len; ++i) {
-        if (((0x1ULL << i) & resource_bitset) &&
+      const int32_t included_resources_max =
+          unfinished_work_->config_settings().top_resources_count();
+      int32_t included_resources = 0;
+      for (int i = 0; i < manifest.resource_size() &&
+                      included_resources < included_resources_max;
+           ++i) {
+        if ((!resource_bitset.has_value() || resource_bitset.value()[i]) &&
             manifest.resource(i).has_url()) {
           GURL url(manifest.resource(i).url());
           if (url.is_valid()) {
             double weight = ResourceWeight(
                 unfinished_work_->config_settings().resource_weight_function(),
                 manifest.resource(i).weight_ratio(), host_visits);
-            if (weight >= unfinished_work_->config_settings().min_weight())
+            if (weight >= unfinished_work_->config_settings().min_weight()) {
               resources_to_rank_.emplace_back(url, source.referrer(), weight);
+              ++included_resources;
+            }
           }
         }
       }
@@ -814,9 +843,19 @@
                  source.url(), source.referrer(), base::Time::Now(),
                  source.was_cached(), source.response_bytes()));
 
-  resources_fetching_.remove_if([&source](const ResourceInfo& resource) {
-    return resource.url == source.url();
-  });
+  auto resource =
+      std::find_if(resources_fetching_.begin(), resources_fetching_.end(),
+                   [&source](const ResourceInfo& resource) {
+                     return resource.url == source.url();
+                   });
+  if (resource != resources_fetching_.end()) {
+    if (unfinished_work_->config_settings().global_ranking() &&
+        (!unfinished_work_->has_min_weight_fetched() ||
+         resource->weight < unfinished_work_->min_weight_fetched()))
+      unfinished_work_->set_min_weight_fetched(resource->weight);
+
+    resources_fetching_.erase(resource);
+  }
 
   pool_.Delete(source);
 

diff --git a/components/precache/core/precache_fetcher_unittest.cc b/components/precache/core/precache_fetcher_unittest.cc
index f42c6c39..51ea0c17 100644
--- a/components/precache/core/precache_fetcher_unittest.cc
+++ b/components/precache/core/precache_fetcher_unittest.cc

@@ -576,7 +576,28 @@
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
-TEST_F(PrecacheFetcherTest, PrecacheResourceSelection) {
+class PrecacheFetcherResourceSelectionTest
+    : public PrecacheFetcherTest,
+      public testing::WithParamInterface<PrecacheResourceSelection> {
+ public:
+  // These bitsets are asymmetric and multibyte, in order to test the orderings.
+
+  // Set bits for kGoodResourceURL, kGoodResourceURLC and kGoodResourceURLD.
+  static PrecacheResourceSelection DeprecatedBitset() {
+    PrecacheResourceSelection ret;
+    ret.set_deprecated_bitset(0b110000000001);
+    return ret;
+  }
+
+  // Set bits for kGoodResourceURL, kGoodResourceURLC and kGoodResourceURLD.
+  static PrecacheResourceSelection Bitset() {
+    PrecacheResourceSelection ret;
+    ret.set_bitset("\x01\x0c");
+    return ret;
+  }
+};
+
+TEST_P(PrecacheFetcherResourceSelectionTest, Basic) {
   SetDefaultFlags();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
@@ -590,15 +611,13 @@
   PrecacheResourceSelection resource_selection;
   good_manifest.add_resource()->set_url(kGoodResourceURL);
   good_manifest.add_resource()->set_url(kGoodResourceURLA);
-  good_manifest.add_resource()->set_url(kGoodResourceURLB);
+  for (int i = 0; i < 8; ++i)
+    good_manifest.add_resource()->set_url(kGoodResourceURLB);
   good_manifest.add_resource()->set_url(kGoodResourceURLC);
   good_manifest.add_resource()->set_url(kGoodResourceURLD);
 
-  // Set bits for kGoodResourceURL, kGoodResourceURLB and kGoodResourceURLD.
-  resource_selection.set_bitset(0b10101);
   (*good_manifest.mutable_experiments()
-        ->mutable_resources_by_experiment_group())[kExperimentID] =
-      resource_selection;
+        ->mutable_resources_by_experiment_group())[kExperimentID] = GetParam();
 
   factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
                            net::HTTP_OK, net::URLRequestStatus::SUCCESS);
@@ -607,7 +626,7 @@
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
-  factory_.SetFakeResponse(GURL(kGoodResourceURLB), "good URL B", net::HTTP_OK,
+  factory_.SetFakeResponse(GURL(kGoodResourceURLC), "good URL B", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
   factory_.SetFakeResponse(GURL(kGoodResourceURLD), "good URL D", net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
@@ -630,7 +649,7 @@
   expected_requested_urls.emplace_back(kConfigURL);
   expected_requested_urls.emplace_back(kGoodManifestURL);
   expected_requested_urls.emplace_back(kGoodResourceURL);
-  expected_requested_urls.emplace_back(kGoodResourceURLB);
+  expected_requested_urls.emplace_back(kGoodResourceURLC);
   expected_requested_urls.emplace_back(kGoodResourceURLD);
 
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
@@ -643,7 +662,7 @@
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
-TEST_F(PrecacheFetcherTest, PrecacheResourceSelectionMissingBitset) {
+TEST_P(PrecacheFetcherResourceSelectionTest, MissingBitset) {
   SetDefaultFlags();
 
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
@@ -662,10 +681,9 @@
   good_manifest.add_resource()->set_url(kGoodResourceURLD);
 
   // Set bits for a different experiment group.
-  resource_selection.set_bitset(0b1);
   (*good_manifest.mutable_experiments()
         ->mutable_resources_by_experiment_group())[kExperimentID + 1] =
-      resource_selection;
+      GetParam();
 
   // Resource selection bitset for the experiment group will be missing and all
   // resources will be fetched.
@@ -718,6 +736,12 @@
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
+INSTANTIATE_TEST_CASE_P(
+    PrecacheFetcherResourceSelectionTest,
+    PrecacheFetcherResourceSelectionTest,
+    testing::Values(PrecacheFetcherResourceSelectionTest::DeprecatedBitset(),
+                    PrecacheFetcherResourceSelectionTest::Bitset()));
+
 TEST_F(PrecacheFetcherTest, PrecachePauseResume) {
   SetDefaultFlags();
 
@@ -1070,6 +1094,65 @@
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
 }
 
+TEST_F(PrecacheFetcherTest, TopResourcesCount_ResourceBitset) {
+  SetDefaultFlags();
+
+  std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
+      new PrecacheUnfinishedWork());
+  unfinished_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
+  unfinished_work->add_top_host()->set_hostname("good-manifest.com");
+
+  PrecacheConfigurationSettings config;
+  config.set_top_resources_count(2);
+
+  PrecacheManifest good_manifest;
+  good_manifest.add_resource()->set_url("http://good-manifest.com/retrieved");
+  good_manifest.add_resource()->set_url("http://good-manifest.com/skipped");
+  good_manifest.add_resource()->set_url("http://good-manifest.com/retrieved");
+  good_manifest.add_resource()->set_url("http://good-manifest.com/skipped");
+  good_manifest.add_resource()->set_url("http://good-manifest.com/retrieved");
+  (*good_manifest.mutable_experiments()
+        ->mutable_resources_by_experiment_group())[kExperimentID]
+      .set_deprecated_bitset(0b10101);
+
+  factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
+                           net::HTTP_OK, net::URLRequestStatus::SUCCESS);
+  factory_.SetFakeResponse(GURL(kGoodManifestURL),
+                           good_manifest.SerializeAsString(), net::HTTP_OK,
+                           net::URLRequestStatus::SUCCESS);
+  factory_.SetFakeResponse(GURL("http://good-manifest.com/retrieved"), "good",
+                           net::HTTP_OK, net::URLRequestStatus::SUCCESS);
+
+  base::HistogramTester histogram;
+
+  {
+    PrecacheFetcher precache_fetcher(
+        request_context_.get(), GURL(), std::string(),
+        std::move(unfinished_work), kExperimentID,
+        precache_database_.GetWeakPtr(), task_runner(), &precache_delegate_);
+    precache_fetcher.Start();
+
+    base::RunLoop().RunUntilIdle();
+
+    // Destroy the PrecacheFetcher after it has finished, to record metrics.
+  }
+
+  std::vector<GURL> expected_requested_urls;
+  expected_requested_urls.emplace_back(kConfigURL);
+  expected_requested_urls.emplace_back(kGoodManifestURL);
+  expected_requested_urls.emplace_back("http://good-manifest.com/retrieved");
+  expected_requested_urls.emplace_back("http://good-manifest.com/retrieved");
+
+  EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
+
+  EXPECT_TRUE(precache_delegate_.was_on_done_called());
+
+  histogram.ExpectUniqueSample("Precache.Fetch.PercentCompleted", 100, 1);
+  histogram.ExpectUniqueSample("Precache.Fetch.ResponseBytes.Total",
+                               url_callback_.total_response_bytes(), 1);
+  histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
+}
+
 // MaxBytesPerResource is impossible to test with net::FakeURLFetcherFactory:
 //
 // - The PrecacheFetcher::Fetcher's max_bytes logic only applies to network
@@ -1091,7 +1174,9 @@
   SetDefaultFlags();
   std::unique_ptr<PrecacheUnfinishedWork> unfinished_work(
       new PrecacheUnfinishedWork());
-  unfinished_work->add_top_host()->set_hostname("good-manifest.com");
+  auto* top_host = unfinished_work->add_top_host();
+  top_host->set_hostname("good-manifest.com");
+  top_host->set_visits(1);
   unfinished_work->set_start_time(base::Time::UnixEpoch().ToInternalValue());
 
   // Should be greater than kMaxParallelFetches, so that we can observe
@@ -1110,6 +1195,7 @@
 
   PrecacheConfigurationSettings config;
   config.set_max_bytes_total(kMaxBytesTotal);
+  config.set_global_ranking(true);
 
   factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(),
                            net::HTTP_OK, net::URLRequestStatus::SUCCESS);
@@ -1117,7 +1203,9 @@
   PrecacheManifest good_manifest;
   for (size_t i = 0; i < kNumResources; ++i) {
     const std::string url = "http://good-manifest.com/" + std::to_string(i);
-    good_manifest.add_resource()->set_url(url);
+    auto* resource = good_manifest.add_resource();
+    resource->set_url(url);
+    resource->set_weight_ratio(static_cast<double>(i) / kNumResources);
     factory_.SetFakeResponse(GURL(url), std::string(kBytesPerResource, '.'),
                              net::HTTP_OK, net::URLRequestStatus::SUCCESS);
   }
@@ -1138,15 +1226,20 @@
     base::RunLoop().RunUntilIdle();
   }
 
-  // Fetcher should request config, manifest, and all but 3 resources.
-  // TODO(twifkak): I expected all but 2 resources; this result is surprising.
-  // Figure it out and explain it here.
-  EXPECT_EQ(kNumResources - 1, url_callback_.requested_urls().size());
+  // Fetcher should request config, manifest, and all but 3 resources. For some
+  // reason, we are seeing it fetch all but 4 resources. Meh, close enough.
+  EXPECT_EQ(1 + 1 + kNumResources - 4, url_callback_.requested_urls().size());
 
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
 
   histogram.ExpectTotalCount("Precache.Fetch.PercentCompleted", 1);
   histogram.ExpectTotalCount("Precache.Fetch.TimeToComplete", 1);
+
+  const double expected_min_weight =
+      good_manifest.resource(kNumResources - 3).weight_ratio() *
+      1 /* # of visits to good-manifest.com */;
+  histogram.ExpectBucketCount("Precache.Fetch.MinWeight",
+                              1000.0 * expected_min_weight, 1);
 }
 
 // Tests the parallel fetch behaviour when more precache resource and manifest
@@ -1618,6 +1711,9 @@
   // Continuing with the precache should fetch all resources, as the previous
   // run was cancelled before any finished. They should be fetched in global
   // ranking order.
+
+  base::HistogramTester histogram;
+
   {
     PrecacheFetcher precache_fetcher(
         request_context_.get(), GURL(), std::string(),
@@ -1629,6 +1725,9 @@
   }
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
+
+  histogram.ExpectBucketCount("Precache.Fetch.MinWeight",
+                              1000.0 * resources.back().second, 1);
 }
 
 TEST_F(PrecacheFetcherTest, MaxTotalResources) {
@@ -1674,6 +1773,8 @@
                            manifest.SerializeAsString(), net::HTTP_OK,
                            net::URLRequestStatus::SUCCESS);
 
+  base::HistogramTester histogram;
+
   {
     PrecacheFetcher precache_fetcher(
         request_context_.get(), GURL(), std::string(),
@@ -1685,6 +1786,11 @@
 
   EXPECT_EQ(expected_requested_urls, url_callback_.requested_urls());
   EXPECT_TRUE(precache_delegate_.was_on_done_called());
+
+  const float expected_min_weight =
+      manifest.resource(config.total_resources_count() - 1).weight_ratio();
+  histogram.ExpectUniqueSample("Precache.Fetch.MinWeight",
+                               1000.0 * expected_min_weight, 1);
 }
 
 TEST_F(PrecacheFetcherTest, MinWeight) {

diff --git a/components/precache/core/proto/precache.proto b/components/precache/core/proto/precache.proto
index dd80621..5b987e2a 100644
--- a/components/precache/core/proto/precache.proto
+++ b/components/precache/core/proto/precache.proto

@@ -20,6 +20,12 @@
   // How important this resource is for the host. It ranges from 0.0 to 1.0.
   // Higher values mean more important.
   optional double weight_ratio = 3;
+
+  // How important this resource is for the client; a combination of
+  // weight_ratio and TopHost.visits. Populated only in PrecacheUnfinishedWork.
+  // This is a non-negative number, with higher being more important. Its value
+  // depends on PrecacheConfigurationSettings.resource_weight_function.
+  optional double weight = 4;
 };
 
 message PrecacheManifestId {
@@ -45,17 +51,29 @@
   map<fixed32, PrecacheResourceSelection> resources_by_experiment_group = 1;
 };
 
+// Determines which of the resources in the manifest should be selected.
 message PrecacheResourceSelection {
-  // Select the resources as a std::bitset over the resources listed in the
-  // manifest.
+  // A bitset over the resources listed in the manifest. Bits correspond to
+  // resource position in LSB-to-MSB order, as in:
   //
-  // The bitset should be loaded as:
-  //   std::bitset selection(resource_selection.bitset());
-  // Then manifest.resource(i) is selected for the experiment iff
-  // selection.test(i).
+  //   if ((0x1ULL << i) && DEPRECATED_bitset) IncludeResource(i);
   //
-  // A missing bitset means that the experiment applies to all the resources.
-  optional fixed64 bitset = 1 [default = 0xFFFFFFFFFFFFFFFF];
+  // Deprecated because it only supports up to 64 resources.
+  optional fixed64 DEPRECATED_bitset = 1
+      [default = 0xFFFFFFFFFFFFFFFF, deprecated = true];
+
+  // A bitset over the resources listed in the manifest. Bits correspond to
+  // resource position. Bytes are ordered little-endian, and bits within each
+  // byte are ordered LSB-to-MSB. The resulting bitstream is of mixed order,
+  // but easy to test:
+  //
+  //   if ((1 << (i % 8)) & bitset[i / 8]) IncludeResource(i);
+  //
+  // Takes precedence over DEPRECATED_bitset, if both are present.
+  optional bytes bitset = 2;
+
+  // A PrecacheResourceSelection without DEPRECATED_bitset or bitset means that
+  // all resources should be selected.
 };
 
 message PrecacheConfigurationSettings {

diff --git a/components/precache/core/proto/unfinished_work.proto b/components/precache/core/proto/unfinished_work.proto
index 67c5eb0..cd07cba 100644
--- a/components/precache/core/proto/unfinished_work.proto
+++ b/components/precache/core/proto/unfinished_work.proto

@@ -54,4 +54,8 @@
   // session start time. The start time is the time just before when top hosts
   // are requested.
   optional int64 start_time = 8;
+
+  // The minimum resource weight that has been fetched so far. Populated only if
+  // global ranking is enabled.
+  optional double min_weight_fetched = 10;
 };

diff --git a/components/profile_metrics/OWNERS b/components/profile_metrics/OWNERS
index 367bb85d..e43d48c 100644
--- a/components/profile_metrics/OWNERS
+++ b/components/profile_metrics/OWNERS

@@ -1,3 +1,5 @@
 anthonyvd@chromium.org
 erg@chromium.org
 mlerman@chromium.org
+
+# COMPONENT: UI>Browser>Profiles

diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
index 2b7e0ca..f9663f3 100644
--- a/components/renderer_context_menu/render_view_context_menu_base.cc
+++ b/components/renderer_context_menu/render_view_context_menu_base.cc

@@ -351,11 +351,6 @@
   if (view)
     view->SetShowingContextMenu(false);
   source_web_contents_->NotifyContextMenuClosed(params_.custom_context);
-
-  if (!command_executed_) {
-    for (auto& observer : observers_)
-      observer.OnMenuCancel();
-  }
 }
 
 RenderFrameHost* RenderViewContextMenuBase::GetRenderFrameHost() {

diff --git a/components/renderer_context_menu/render_view_context_menu_observer.h b/components/renderer_context_menu/render_view_context_menu_observer.h
index ccd052b..0cdfda2 100644
--- a/components/renderer_context_menu/render_view_context_menu_observer.h
+++ b/components/renderer_context_menu/render_view_context_menu_observer.h

@@ -100,9 +100,6 @@
 
   // Called when a user selects the specified context-menu item.
   virtual void ExecuteCommand(int command_id) {}
-
-  // Called when a user closes the context menu without selecting any items.
-  virtual void OnMenuCancel() {}
 };
 
 #endif  // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_OBSERVER_H_

diff --git a/components/search_engines/search_engines_test_util.cc b/components/search_engines/search_engines_test_util.cc
index d427a009..01b7d50 100644
--- a/components/search_engines/search_engines_test_util.cc
+++ b/components/search_engines/search_engines_test_util.cc

@@ -15,14 +15,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
-    const std::string& provider_name) {
+    const std::string& keyword) {
   auto data = base::MakeUnique<TemplateURLData>();
-  data->SetShortName(base::UTF8ToUTF16(provider_name + "name"));
-  data->SetKeyword(base::UTF8ToUTF16(provider_name + "key"));
-  data->SetURL(std::string("http://") + provider_name + "foo/{searchTerms}");
-  data->suggestions_url = std::string("http://") + provider_name + "sugg";
-  data->alternate_urls.push_back(std::string("http://") + provider_name +
-                                 "foo/alt");
+  data->SetShortName(base::UTF8ToUTF16(keyword + "name"));
+  data->SetKeyword(base::UTF8ToUTF16(keyword));
+  data->SetURL(std::string("http://") + keyword + "foo/{searchTerms}");
+  data->suggestions_url = std::string("http://") + keyword + "sugg";
+  data->alternate_urls.push_back(std::string("http://") + keyword + "foo/alt");
   data->favicon_url = GURL("http://icon1");
   data->safe_for_autoreplace = true;
   data->input_encodings = {"UTF-8", "UTF-16"};

diff --git a/components/search_engines/search_engines_test_util.h b/components/search_engines/search_engines_test_util.h
index 7ddcd50d52..c04352a 100644
--- a/components/search_engines/search_engines_test_util.h
+++ b/components/search_engines/search_engines_test_util.h

@@ -17,7 +17,7 @@
 // Generates a TemplateURLData structure useful for tests filled with values
 // autogenerated from |provider_name|.
 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
-    const std::string& provider_name);
+    const std::string& keyword);
 
 // Checks that the two TemplateURLs are similar. Does not check the id, the
 // date_created or the last_modified time.  Neither pointer should be null.

diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index be5527fc..8500480 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc

@@ -188,7 +188,7 @@
   return FindTemplateURL(template_urls, turl) != template_urls->end();
 }
 
-bool IsCreatedByExtension(TemplateURL* template_url) {
+bool IsCreatedByExtension(const TemplateURL* template_url) {
   return template_url->type() ==
              TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION ||
          template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
@@ -530,10 +530,11 @@
 }
 
 void TemplateURLService::RegisterOmniboxKeyword(
-     const std::string& extension_id,
-     const std::string& extension_name,
-     const std::string& keyword,
-     const std::string& template_url_string) {
+    const std::string& extension_id,
+    const std::string& extension_name,
+    const std::string& keyword,
+    const std::string& template_url_string,
+    const base::Time& extension_install_time) {
   DCHECK(loaded_);
 
   if (FindTemplateURLForExtension(extension_id,
@@ -546,6 +547,7 @@
   data.SetURL(template_url_string);
   std::unique_ptr<TemplateURL::AssociatedExtensionInfo> info(
       new TemplateURL::AssociatedExtensionInfo(extension_id));
+  info->install_time = extension_install_time;
   AddExtensionControlledTURL(
       base::MakeUnique<TemplateURL>(data, TemplateURL::OMNIBOX_API_EXTENSION),
       std::move(info));
@@ -1443,6 +1445,29 @@
   RequestGoogleURLTrackerServerCheckIfNecessary();
 }
 
+TemplateURL* TemplateURLService::BestEngineForKeyword(TemplateURL* engine1,
+                                                      TemplateURL* engine2) {
+  DCHECK(engine1);
+  DCHECK(engine2);
+  DCHECK_EQ(engine1->keyword(), engine2->keyword());
+  // We should only have overlapping keywords when at least one comes from
+  // an extension.
+  DCHECK(IsCreatedByExtension(engine1) || IsCreatedByExtension(engine2));
+
+  if (engine2->type() == engine1->type()) {
+    return engine1->extension_info_->install_time >
+                   engine2->extension_info_->install_time
+               ? engine1
+               : engine2;
+  }
+  if (engine2->type() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) {
+    return engine1->type() == TemplateURL::OMNIBOX_API_EXTENSION ? engine1
+                                                                 : engine2;
+  }
+  return engine2->type() == TemplateURL::OMNIBOX_API_EXTENSION ? engine2
+                                                               : engine1;
+}
+
 void TemplateURLService::RemoveFromMaps(TemplateURL* template_url) {
   const base::string16& keyword = template_url->keyword();
   DCHECK_NE(0U, keyword_to_turl_and_length_.count(keyword));
@@ -1455,14 +1480,12 @@
     // highest ID).
     TemplateURL* best_fallback = nullptr;
     for (const auto& turl : template_urls_) {
-      // This next statement relies on the fact that there can only be one
-      // non-Omnibox API TemplateURL with a given keyword.
-      if ((turl.get() != template_url) && (turl->keyword() == keyword) &&
-          (!best_fallback ||
-           (best_fallback->type() != TemplateURL::OMNIBOX_API_EXTENSION) ||
-           ((turl->type() == TemplateURL::OMNIBOX_API_EXTENSION) &&
-            (turl->id() > best_fallback->id()))))
-        best_fallback = turl.get();
+      if ((turl.get() != template_url) && (turl->keyword() == keyword)) {
+        if (best_fallback)
+          best_fallback = BestEngineForKeyword(best_fallback, turl.get());
+        else
+          best_fallback = turl.get();
+      }
     }
     RemoveFromDomainMap(template_url);
     if (best_fallback) {
@@ -1494,16 +1517,8 @@
     AddToMap(template_url);
     AddToDomainMap(template_url);
   } else {
-    const TemplateURL* existing_url = i->second.first;
-    // We should only have overlapping keywords when at least one comes from
-    // an extension.  In that case, the ranking order is:
-    //   Manually-modified keywords > extension keywords > replaceable keywords
-    // When there are multiple extensions, the last-added wins.
-    bool existing_url_is_omnibox_api =
-        existing_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
-    DCHECK(existing_url_is_omnibox_api || template_url_is_omnibox_api);
-    if (existing_url_is_omnibox_api ?
-        !CanReplace(template_url) : CanReplace(existing_url)) {
+    TemplateURL* existing_url = i->second.first;
+    if (BestEngineForKeyword(existing_url, template_url) != existing_url) {
       RemoveFromDomainMap(existing_url);
       AddToMap(template_url);
       AddToDomainMap(template_url);
@@ -1651,7 +1666,7 @@
   if (!Contains(&template_urls_, existing_turl))
     return false;
 
-  DCHECK_NE(TemplateURL::OMNIBOX_API_EXTENSION, existing_turl->type());
+  DCHECK(!IsCreatedByExtension(existing_turl));
 
   base::string16 old_keyword(existing_turl->keyword());
   keyword_to_turl_and_length_.erase(old_keyword);
@@ -1962,8 +1977,7 @@
   if (!data) {
     default_search_provider_ = nullptr;
   } else if (source == DefaultSearchManager::FROM_EXTENSION) {
-    default_search_provider_ = FindMatchingExtensionTemplateURL(
-        *data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+    default_search_provider_ = FindMatchingDefaultExtensionTemplateURL(*data);
   } else if (source == DefaultSearchManager::FROM_FALLBACK) {
     default_search_provider_ =
         FindPrepopulatedTemplateURL(data->prepopulate_id);
@@ -2032,39 +2046,32 @@
   }
 
   template_url->ResetKeywordIfNecessary(search_terms_data(), false);
-  // Check whether |template_url|'s keyword conflicts with any already in the
-  // model.
-  TemplateURL* existing_keyword_turl =
-      GetTemplateURLForKeyword(template_url->keyword());
 
-  // Check whether |template_url|'s keyword conflicts with any already in the
-  // model.  Note that we can reach here during the loading phase while
-  // processing the template URLs from the web data service.  In this case,
-  // GetTemplateURLForKeyword() will look not only at what's already in the
-  // model, but at the |initial_default_search_provider_|.  Since this engine
-  // will presumably also be present in the web data, we need to double-check
-  // that any "pre-existing" entries we find are actually coming from
-  // |template_urls_|, lest we detect a "conflict" between the
-  // |initial_default_search_provider_| and the web data version of itself.
-  if (template_url->type() != TemplateURL::OMNIBOX_API_EXTENSION &&
-      existing_keyword_turl &&
-      existing_keyword_turl->type() != TemplateURL::OMNIBOX_API_EXTENSION &&
-      Contains(&template_urls_, existing_keyword_turl)) {
-    DCHECK_NE(existing_keyword_turl, template_url.get());
-    // Only replace one of the TemplateURLs if they are either both extensions,
-    // or both not extensions.
-    bool are_same_type = IsCreatedByExtension(existing_keyword_turl) ==
-                         IsCreatedByExtension(template_url.get());
-    if (CanReplace(existing_keyword_turl) && are_same_type) {
-      RemoveNoNotify(existing_keyword_turl);
-    } else if (CanReplace(template_url.get()) && are_same_type) {
-      return nullptr;
-    } else {
-      base::string16 new_keyword =
-          UniquifyKeyword(*existing_keyword_turl, false);
-      ResetTemplateURLNoNotify(existing_keyword_turl,
-                               existing_keyword_turl->short_name(), new_keyword,
-                               existing_keyword_turl->url());
+  // If |template_url| is not created by an extension, its keyword must not
+  // conflict with any already in the model.
+  if (!IsCreatedByExtension(template_url.get())) {
+    // Note that we can reach here during the loading phase while processing the
+    // template URLs from the web data service.  In this case,
+    // GetTemplateURLForKeyword() will look not only at what's already in the
+    // model, but at the |initial_default_search_provider_|.  Since this engine
+    // will presumably also be present in the web data, we need to double-check
+    // that any "pre-existing" entries we find are actually coming from
+    // |template_urls_|, lest we detect a "conflict" between the
+    // |initial_default_search_provider_| and the web data version of itself.
+    TemplateURL* existing_turl =
+        FindNonExtensionTemplateURLForKeyword(template_url->keyword());
+    if (existing_turl && Contains(&template_urls_, existing_turl)) {
+      DCHECK_NE(existing_turl, template_url.get());
+      if (CanReplace(existing_turl)) {
+        RemoveNoNotify(existing_turl);
+      } else if (CanReplace(template_url.get())) {
+        return nullptr;
+      } else {
+        // Neither engine can be replaced. Uniquify the existing keyword.
+        base::string16 new_keyword = UniquifyKeyword(*existing_turl, false);
+        ResetTemplateURLNoNotify(existing_turl, existing_turl->short_name(),
+                                 new_keyword, existing_turl->url());
+      }
     }
   }
   TemplateURL* template_url_ptr = template_url.get();
@@ -2208,6 +2215,7 @@
 
 base::string16 TemplateURLService::UniquifyKeyword(const TemplateURL& turl,
                                                    bool force) {
+  DCHECK(!IsCreatedByExtension(&turl));
   if (!force) {
     // Already unique.
     if (!GetTemplateURLForKeyword(turl.keyword()))
@@ -2216,8 +2224,7 @@
     // First, try to return the generated keyword for the TemplateURL (except
     // for extensions, as their keywords are not associated with their URLs).
     GURL gurl(turl.url());
-    if (gurl.is_valid() &&
-        (turl.type() != TemplateURL::OMNIBOX_API_EXTENSION)) {
+    if (gurl.is_valid()) {
       base::string16 keyword_candidate = TemplateURL::GenerateKeyword(gurl);
       if (!GetTemplateURLForKeyword(keyword_candidate))
         return keyword_candidate;
@@ -2470,12 +2477,11 @@
   return nullptr;
 }
 
-TemplateURL* TemplateURLService::FindMatchingExtensionTemplateURL(
-    const TemplateURLData& data,
-    TemplateURL::Type type) {
-  DCHECK_NE(TemplateURL::NORMAL, type);
+TemplateURL* TemplateURLService::FindMatchingDefaultExtensionTemplateURL(
+    const TemplateURLData& data) {
   for (const auto& turl : template_urls_) {
-    if (turl->type() == type &&
+    if (turl->type() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION &&
+        turl->extension_info_->wants_to_be_default_engine &&
         TemplateURL::MatchesData(turl.get(), &data, search_terms_data()))
       return turl.get();
   }

diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h
index a0368a31..facf076 100644
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h

@@ -227,7 +227,8 @@
   void RegisterOmniboxKeyword(const std::string& extension_id,
                               const std::string& extension_name,
                               const std::string& keyword,
-                              const std::string& template_url_string);
+                              const std::string& template_url_string,
+                              const base::Time& extension_install_time);
 
   // Returns the set of URLs describing the keywords. The elements are owned
   // by TemplateURLService and should not be deleted.
@@ -413,8 +414,13 @@
                            DontUpdateKeywordSearchForNonReplaceable);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ChangeGoogleBaseValue);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, MergeDeletesUnusedProviders);
-  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, AddExtensionKeyword);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, AddOmniboxExtensionKeyword);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, ExtensionsWithSameKeywords);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest,
+                           CheckEnginesWithSameKeywords);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest, LastVisitedTimeUpdate);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceTest,
+                           RepairPrepopulatedSearchEngines);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest, UniquifyKeyword);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            IsLocalTemplateURLBetter);
@@ -480,6 +486,15 @@
 
   void Init(const Initializer* initializers, int num_initializers);
 
+  // Given two engines with the same keyword, returns which should take
+  // precedence.  While normal engines must all have distinct keywords,
+  // extension-controlled and omnibox API engines may have the same keywords as
+  // each other or as normal engines.  In these cases, omnibox API engines
+  // override extension-controlled engines, which override normal engines; if
+  // there is still a conflict after this, the most recently-added extension
+  // wins.
+  TemplateURL* BestEngineForKeyword(TemplateURL* engine1, TemplateURL* engine2);
+
   // Removes |template_url| from various internal maps
   // (|keyword_to_turl_and_length_|, |keyword_domain_to_turl_and_length_|,
   // |guid_to_turl_|, |provider_map_|).
@@ -705,9 +720,10 @@
   TemplateURL* FindTemplateURLForExtension(const std::string& extension_id,
                                            TemplateURL::Type type);
 
-  // Finds the extension-supplied TemplateURL that matches |data|, if any.
-  TemplateURL* FindMatchingExtensionTemplateURL(const TemplateURLData& data,
-                                                TemplateURL::Type type);
+  // Finds any NORMAL_CONTROLLED_BY_EXTENSION engine that matches |data| and
+  // wants to be default. Returns nullptr if not found.
+  TemplateURL* FindMatchingDefaultExtensionTemplateURL(
+      const TemplateURLData& data);
 
   // Finds the most recently-installed NORMAL_CONTROLLED_BY_EXTENSION engine
   // that supports replacement and wants to be default, if any. Notifies the

diff --git a/components/spellcheck/browser/BUILD.gn b/components/spellcheck/browser/BUILD.gn
index 5a571da..90c0534 100644
--- a/components/spellcheck/browser/BUILD.gn
+++ b/components/spellcheck/browser/BUILD.gn

@@ -8,16 +8,8 @@
 
 source_set("browser") {
   sources = [
-    "feedback.cc",
-    "feedback.h",
-    "feedback_sender.cc",
-    "feedback_sender.h",
-    "misspelling.cc",
-    "misspelling.h",
     "pref_names.cc",
     "pref_names.h",
-    "spellcheck_action.cc",
-    "spellcheck_action.h",
     "spellcheck_dictionary.h",
     "spellcheck_host_metrics.cc",
     "spellcheck_host_metrics.h",
@@ -30,8 +22,6 @@
     "spellchecker_session_bridge_android.h",
     "spelling_service_client.cc",
     "spelling_service_client.h",
-    "word_trimmer.cc",
-    "word_trimmer.h",
   ]
 
   public_deps = [
@@ -61,13 +51,8 @@
 source_set("unit_tests") {
   testonly = true
   sources = [
-    "feedback_sender_unittest.cc",
-    "feedback_unittest.cc",
-    "misspelling_unittest.cc",
-    "spellcheck_action_unittest.cc",
     "spellcheck_host_metrics_unittest.cc",
     "spellcheck_platform_mac_unittest.cc",
-    "word_trimmer_unittest.cc",
   ]
 
   deps = [

diff --git a/components/spellcheck/browser/feedback.cc b/components/spellcheck/browser/feedback.cc
deleted file mode 100644
index 3f54ec2f0..0000000
--- a/components/spellcheck/browser/feedback.cc
+++ /dev/null

@@ -1,193 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// The |Feedback| object keeps track of each instance of user feedback in a map
-// |misspellings_|. This is a map from uint32_t hashes to |Misspelling| objects.
-//
-// Each misspelling should be present in only one renderer process. The
-// |Feedback| objects keeps track of misspelling-renderer relationship in the
-// |renderers_| map of renderer process identifiers to a set of hashes.
-//
-// When the user adds a misspelling to their custom dictionary, all of the
-// |Misspelling| objects with the same misspelled string are updated. The
-// |Feedback| object facilitates efficient access to these misspellings through
-// a |text_| map of misspelled strings to a set of hashes.
-
-#include "components/spellcheck/browser/feedback.h"
-
-#include <algorithm>
-#include <iterator>
-#include <limits>
-
-#include "base/logging.h"
-#include "base/stl_util.h"
-
-namespace spellcheck {
-
-Feedback::Feedback(size_t max_total_text_size)
-    : max_total_text_size_(max_total_text_size), total_text_size_(0) {
-  DCHECK_GE(max_total_text_size, 1024U);
-}
-
-Feedback::~Feedback() {}
-
-Misspelling* Feedback::GetMisspelling(uint32_t hash) {
-  HashMisspellingMap::iterator misspelling_it = misspellings_.find(hash);
-  if (misspelling_it == misspellings_.end())
-    return nullptr;
-  return &misspelling_it->second;
-}
-
-void Feedback::FinalizeRemovedMisspellings(
-    int renderer_process_id,
-    const std::vector<uint32_t>& remaining_markers) {
-  RendererHashesMap::iterator renderer_it =
-      renderers_.find(renderer_process_id);
-  if (renderer_it == renderers_.end() || renderer_it->second.empty())
-    return;
-  HashCollection& renderer_hashes = renderer_it->second;
-  HashCollection remaining_hashes(remaining_markers.begin(),
-                                  remaining_markers.end());
-  std::vector<HashCollection::value_type> removed_hashes =
-      base::STLSetDifference<std::vector<HashCollection::value_type>>(
-          renderer_hashes, remaining_hashes);
-  for (auto hash : removed_hashes) {
-    HashMisspellingMap::iterator misspelling_it = misspellings_.find(hash);
-    if (misspelling_it != misspellings_.end() &&
-        !misspelling_it->second.action.IsFinal()) {
-      misspelling_it->second.action.Finalize();
-    }
-  }
-}
-
-bool Feedback::RendererHasMisspellings(int renderer_process_id) const {
-  RendererHashesMap::const_iterator renderer_it =
-      renderers_.find(renderer_process_id);
-  return renderer_it != renderers_.end() && !renderer_it->second.empty();
-}
-
-std::vector<Misspelling> Feedback::GetMisspellingsInRenderer(
-    int renderer_process_id) const {
-  std::vector<Misspelling> misspellings_in_renderer;
-  RendererHashesMap::const_iterator renderer_it =
-      renderers_.find(renderer_process_id);
-  if (renderer_it == renderers_.end() || renderer_it->second.empty())
-    return misspellings_in_renderer;
-  const HashCollection& renderer_hashes = renderer_it->second;
-  for (HashCollection::const_iterator hash_it = renderer_hashes.begin();
-       hash_it != renderer_hashes.end(); ++hash_it) {
-    HashMisspellingMap::const_iterator misspelling_it =
-        misspellings_.find(*hash_it);
-    if (misspelling_it != misspellings_.end())
-      misspellings_in_renderer.push_back(misspelling_it->second);
-  }
-  return misspellings_in_renderer;
-}
-
-void Feedback::EraseFinalizedMisspellings(int renderer_process_id) {
-  RendererHashesMap::iterator renderer_it =
-      renderers_.find(renderer_process_id);
-  if (renderer_it == renderers_.end())
-    return;
-  HashCollection& renderer_hashes = renderer_it->second;
-  for (HashCollection::const_iterator hash_it = renderer_hashes.begin();
-       hash_it != renderer_hashes.end();) {
-    HashMisspellingMap::iterator misspelling_it = misspellings_.find(*hash_it);
-    HashCollection::iterator erasable_hash_it = hash_it;
-    ++hash_it;
-    if (misspelling_it == misspellings_.end())
-      continue;
-    const Misspelling& misspelling = misspelling_it->second;
-    if (!misspelling.action.IsFinal())
-      continue;
-    renderer_hashes.erase(erasable_hash_it);
-    text_[GetMisspelledString(misspelling)].erase(misspelling.hash);
-    size_t approximate_size = ApproximateSerializedSize(misspelling_it->second);
-    // Prevent underlfow.
-    if (total_text_size_ >= approximate_size)
-      total_text_size_ -= approximate_size;
-    else
-      total_text_size_ = 0;
-    misspellings_.erase(misspelling_it);
-  }
-  if (renderer_hashes.empty())
-    renderers_.erase(renderer_it);
-}
-
-bool Feedback::HasMisspelling(uint32_t hash) const {
-  return !!misspellings_.count(hash);
-}
-
-void Feedback::AddMisspelling(int renderer_process_id,
-                              const Misspelling& misspelling) {
-  HashMisspellingMap::iterator misspelling_it =
-      misspellings_.find(misspelling.hash);
-  if (misspelling_it != misspellings_.end()) {
-    const Misspelling& existing_misspelling = misspelling_it->second;
-    text_[GetMisspelledString(existing_misspelling)].erase(misspelling.hash);
-    for (RendererHashesMap::iterator renderer_it = renderers_.begin();
-         renderer_it != renderers_.end();) {
-      HashCollection& renderer_hashes = renderer_it->second;
-      RendererHashesMap::iterator erasable_renderer_it = renderer_it;
-      ++renderer_it;
-      renderer_hashes.erase(misspelling.hash);
-      if (renderer_hashes.empty())
-        renderers_.erase(erasable_renderer_it);
-    }
-  } else {
-    size_t approximate_size = ApproximateSerializedSize(misspelling);
-    // Prevent overflow.
-    if (total_text_size_ <=
-        std::numeric_limits<size_t>::max() - approximate_size) {
-      total_text_size_ += approximate_size;
-    }
-    if (total_text_size_ >= max_total_text_size_)
-      return;
-  }
-  misspellings_[misspelling.hash] = misspelling;
-  text_[GetMisspelledString(misspelling)].insert(misspelling.hash);
-  renderers_[renderer_process_id].insert(misspelling.hash);
-}
-
-bool Feedback::Empty() const {
-  return misspellings_.empty();
-}
-
-std::vector<int> Feedback::GetRendersWithMisspellings() const {
-  std::vector<int> renderers_with_misspellings;
-  for (const auto& renderer : renderers_) {
-    if (!renderer.second.empty())
-      renderers_with_misspellings.push_back(renderer.first);
-  }
-  return renderers_with_misspellings;
-}
-
-void Feedback::FinalizeAllMisspellings() {
-  for (auto& misspelling : misspellings_) {
-    if (!misspelling.second.action.IsFinal())
-      misspelling.second.action.Finalize();
-  }
-}
-
-std::vector<Misspelling> Feedback::GetAllMisspellings() const {
-  std::vector<Misspelling> all_misspellings;
-  for (const auto& misspelling : misspellings_)
-    all_misspellings.push_back(misspelling.second);
-  return all_misspellings;
-}
-
-void Feedback::Clear() {
-  total_text_size_ = 0;
-  misspellings_.clear();
-  text_.clear();
-  renderers_.clear();
-}
-
-const std::set<uint32_t>& Feedback::FindMisspellings(
-    const base::string16& misspelled_text) const {
-  const TextHashesMap::const_iterator text_it = text_.find(misspelled_text);
-  return text_it == text_.end() ? empty_hash_collection_ : text_it->second;
-}
-
-}  // namespace spellcheck

diff --git a/components/spellcheck/browser/feedback.h b/components/spellcheck/browser/feedback.h
deleted file mode 100644
index 76f71e78..0000000
--- a/components/spellcheck/browser/feedback.h
+++ /dev/null

@@ -1,123 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// An object to store user feedback to spellcheck suggestions from spelling
-// service.
-//
-// Stores feedback for the spelling service in |Misspelling| objects. Each
-// |Misspelling| object is identified by a |hash| and corresponds to a document
-// marker with the same |hash| identifier in the renderer.
-
-#ifndef COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_H_
-#define COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <map>
-#include <set>
-#include <vector>
-
-#include "base/macros.h"
-#include "components/spellcheck/browser/misspelling.h"
-
-namespace spellcheck {
-
-// Stores user feedback to spellcheck suggestions. Sample usage:
-//    Feedback feedback;
-//    feedback.AddMisspelling(renderer_process_id, Misspelling(
-//        base::ASCIIToUTF16("Helllo world"), 0, 6,
-//        std::vector<base::string16>(), GenerateRandomHash()));
-//    feedback.FinalizeRemovedMisspellings(renderer_process_id,
-//                                         std::vector<uint32_t>());
-//    ProcessFeedback(feedback.GetMisspellingsInRenderer(renderer_process_id));
-//    feedback.EraseFinalizedMisspellings(renderer_process_id);
-class Feedback {
- public:
-  explicit Feedback(size_t max_total_text_size);
-  ~Feedback();
-
-  // Returns the misspelling identified by |hash|. Returns NULL if there's no
-  // misspelling identified by |hash|. Retains the ownership of the result. The
-  // caller should not modify the hash in the returned misspelling.
-  Misspelling* GetMisspelling(uint32_t hash);
-
-  // Finalizes the user actions on misspellings that are removed from the
-  // renderer process with ID |renderer_process_id|.
-  void FinalizeRemovedMisspellings(
-      int renderer_process_id,
-      const std::vector<uint32_t>& remaining_markers);
-
-  // Returns true if the renderer with process ID |renderer_process_id| has
-  // misspellings.
-  bool RendererHasMisspellings(int renderer_process_id) const;
-
-  // Returns a copy of the misspellings in renderer with process ID
-  // |renderer_process_id|.
-  std::vector<Misspelling> GetMisspellingsInRenderer(
-      int renderer_process_id) const;
-
-  // Erases the misspellings with final user actions in the renderer with
-  // process ID |renderer_process_id|.
-  void EraseFinalizedMisspellings(int renderer_process_id);
-
-  // Returns true if there's a misspelling with |hash| identifier.
-  bool HasMisspelling(uint32_t hash) const;
-
-  // Adds the |misspelling| to feedback data. If the |misspelling| has a
-  // duplicate hash, then replaces the existing misspelling with the same hash.
-  void AddMisspelling(int renderer_process_id, const Misspelling& misspelling);
-
-  // Returns true if there're no misspellings.
-  bool Empty() const;
-
-  // Returns a list of process identifiers for renderers that have misspellings.
-  std::vector<int> GetRendersWithMisspellings() const;
-
-  // Finalizes all misspellings.
-  void FinalizeAllMisspellings();
-
-  // Returns a copy of all misspellings.
-  std::vector<Misspelling> GetAllMisspellings() const;
-
-  // Removes all misspellings.
-  void Clear();
-
-  // Returns a list of all misspelling identifiers for |misspelled_text|.
-  const std::set<uint32_t>& FindMisspellings(
-      const base::string16& misspelled_text) const;
-
- private:
-  typedef std::map<uint32_t, Misspelling> HashMisspellingMap;
-  typedef std::set<uint32_t> HashCollection;
-  typedef std::map<int, HashCollection> RendererHashesMap;
-  typedef std::map<base::string16, HashCollection> TextHashesMap;
-
-  // An empty hash collection to return when FindMisspellings() does not find
-  // misspellings.
-  const HashCollection empty_hash_collection_;
-
-  // The limit on the amount of data to send to the server at once.
-  const size_t max_total_text_size_;
-
-  // Size of all feedback text, used to limit the estimated amount of data sent
-  // to the server at once.
-  size_t total_text_size_;
-
-  // A map of hashes that identify document markers to feedback data to be sent
-  // to spelling service.
-  HashMisspellingMap misspellings_;
-
-  // A map of renderer process ID to hashes that identify misspellings.
-  RendererHashesMap renderers_;
-
-  // A map of misspelled text to hashes that identify misspellings.
-  TextHashesMap text_;
-
-  DISALLOW_COPY_AND_ASSIGN(Feedback);
-};
-
-}  // namespace spellcheck
-
-#endif  // COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_H_

diff --git a/components/spellcheck/browser/feedback_sender.cc b/components/spellcheck/browser/feedback_sender.cc
deleted file mode 100644
index 80d3f58..0000000
--- a/components/spellcheck/browser/feedback_sender.cc
+++ /dev/null

@@ -1,461 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// The |FeedbackSender| object stores the user feedback to spellcheck
-// suggestions in a |Feedback| object.
-//
-// When spelling service returns spellcheck results, these results first arrive
-// in |FeedbackSender| to assign hash identifiers for each
-// misspelling-suggestion pair. If the spelling service identifies the same
-// misspelling as already displayed to the user, then |FeedbackSender| reuses
-// the same hash identifiers to avoid duplication. It detects the duplicates by
-// comparing misspelling offsets in text. Spelling service can return duplicates
-// because we request spellcheck for whole paragraphs, as context around a
-// misspelled word is important to the spellcheck algorithm.
-//
-// All feedback is initially pending. When a user acts upon a misspelling such
-// that the misspelling is no longer displayed (red squiggly line goes away),
-// then the feedback for this misspelling is finalized. All finalized feedback
-// is erased after being sent to the spelling service. Pending feedback is kept
-// around for |kSessionHours| hours and then finalized even if user did not act
-// on the misspellings.
-//
-// |FeedbackSender| periodically requests a list of hashes of all remaining
-// misspellings in renderers. When a renderer responds with a list of hashes,
-// |FeedbackSender| uses the list to determine which misspellings are no longer
-// displayed to the user and sends the current state of user feedback to the
-// spelling service.
-
-#include "components/spellcheck/browser/feedback_sender.h"
-
-#include <algorithm>
-#include <iterator>
-#include <utility>
-
-#include "base/command_line.h"
-#include "base/hash.h"
-#include "base/json/json_writer.h"
-#include "base/location.h"
-#include "base/memory/ptr_util.h"
-#include "base/metrics/field_trial.h"
-#include "base/single_thread_task_runner.h"
-#include "base/stl_util.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/stringprintf.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "base/values.h"
-#include "components/data_use_measurement/core/data_use_user_data.h"
-#include "components/spellcheck/browser/word_trimmer.h"
-#include "components/spellcheck/common/spellcheck_common.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
-#include "components/spellcheck/common/spellcheck_messages.h"
-#include "components/spellcheck/common/spellcheck_switches.h"
-#include "content/public/browser/render_process_host.h"
-#include "crypto/random.h"
-#include "crypto/secure_hash.h"
-#include "crypto/sha2.h"
-#include "google_apis/google_api_keys.h"
-#include "net/base/load_flags.h"
-#include "net/url_request/url_fetcher.h"
-#include "net/url_request/url_request_context_getter.h"
-
-namespace spellcheck {
-
-namespace {
-
-const size_t kMaxFeedbackSizeBytes = 10 * 1024 * 1024;  // 10 MB
-
-// The default URL where feedback data is sent.
-const char kFeedbackServiceURL[] = "https://www.googleapis.com/rpc";
-
-// The minimum number of seconds between sending batches of feedback.
-const int kMinIntervalSeconds = 5;
-
-// Returns a hash of |session_start|, the current timestamp, and
-// |suggestion_index|.
-uint32_t BuildHash(const base::Time& session_start, size_t suggestion_index) {
-  return base::Hash(
-      base::StringPrintf("%" PRId64 "%" PRId64 "%" PRIuS,
-                         session_start.ToInternalValue(),
-                         base::Time::Now().ToInternalValue(),
-                         suggestion_index));
-}
-
-uint64_t BuildAnonymousHash(const FeedbackSender::RandSalt& r,
-                            const base::string16& s) {
-  std::unique_ptr<crypto::SecureHash> hash(
-      crypto::SecureHash::Create(crypto::SecureHash::SHA256));
-
-  hash->Update(s.data(), s.size() * sizeof(s[0]));
-  hash->Update(&r, sizeof(r));
-
-  uint64_t result;
-  hash->Finish(&result, sizeof(result));
-  return result;
-}
-
-// Returns a pending feedback data structure for the spellcheck |result| and
-// |text|.
-Misspelling BuildFeedback(const SpellCheckResult& result,
-                          const base::string16& text) {
-  size_t start = result.location;
-  base::string16 context = TrimWords(&start, start + result.length, text,
-                                     spellcheck::kContextWordCount);
-  return Misspelling(context,
-                     start,
-                     result.length,
-                     std::vector<base::string16>(1, result.replacement),
-                     result.hash);
-}
-
-// Builds suggestion info from |suggestions|.
-std::unique_ptr<base::ListValue> BuildSuggestionInfo(
-    const std::vector<Misspelling>& misspellings,
-    bool is_first_feedback_batch,
-    const FeedbackSender::RandSalt& salt) {
-  std::unique_ptr<base::ListValue> list(new base::ListValue);
-  for (const auto& raw_misspelling : misspellings) {
-    std::unique_ptr<base::DictionaryValue> misspelling(
-        SerializeMisspelling(raw_misspelling));
-    misspelling->SetBoolean("isFirstInSession", is_first_feedback_batch);
-    misspelling->SetBoolean("isAutoCorrection", false);
-    // hash(R) fields come from red_underline_extensions.proto
-    // fixed64 user_misspelling_id = ...
-    misspelling->SetString(
-        "userMisspellingId",
-        base::Uint64ToString(BuildAnonymousHash(
-            salt, raw_misspelling.context.substr(raw_misspelling.location,
-                                                 raw_misspelling.length))));
-    // repeated fixed64 user_suggestion_id = ...
-    std::unique_ptr<base::ListValue> suggestion_list(new base::ListValue());
-    for (const auto& suggestion : raw_misspelling.suggestions) {
-      suggestion_list->AppendString(
-          base::Uint64ToString(BuildAnonymousHash(salt, suggestion)));
-    }
-    misspelling->Set("userSuggestionId", suggestion_list.release());
-    list->Append(std::move(misspelling));
-  }
-  return list;
-}
-
-// Builds feedback parameters from |suggestion_info|, |language|, and |country|.
-// Takes ownership of |suggestion_list|.
-std::unique_ptr<base::DictionaryValue> BuildParams(
-    std::unique_ptr<base::ListValue> suggestion_info,
-    const std::string& language,
-    const std::string& country) {
-  std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue);
-  params->Set("suggestionInfo", suggestion_info.release());
-  params->SetString("key", google_apis::GetAPIKey());
-  params->SetString("language", language);
-  params->SetString("originCountry", country);
-  params->SetString("clientName", "Chrome");
-  return params;
-}
-
-// Builds feedback data from |params|. Takes ownership of |params|.
-std::unique_ptr<base::Value> BuildFeedbackValue(
-    std::unique_ptr<base::DictionaryValue> params,
-    const std::string& api_version) {
-  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
-  result->Set("params", params.release());
-  result->SetString("method", "spelling.feedback");
-  result->SetString("apiVersion", api_version);
-  return std::move(result);
-}
-
-// Returns true if the misspelling location is within text bounds.
-bool IsInBounds(int misspelling_location,
-                int misspelling_length,
-                size_t text_length) {
-  return misspelling_location >= 0 && misspelling_length > 0 &&
-         static_cast<size_t>(misspelling_location) < text_length &&
-         static_cast<size_t>(misspelling_location + misspelling_length) <=
-             text_length;
-}
-
-// Returns the feedback API version.
-std::string GetApiVersion() {
-  // This guard is temporary.
-  // TODO(rouslan): Remove the guard. http://crbug.com/247726
-  if (base::FieldTrialList::FindFullName(kFeedbackFieldTrialName) ==
-          kFeedbackFieldTrialEnabledGroupName &&
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          spellcheck::switches::kEnableSpellingFeedbackFieldTrial)) {
-    return "v2-internal";
-  }
-  return "v2";
-}
-
-}  // namespace
-
-FeedbackSender::FeedbackSender(net::URLRequestContextGetter* request_context,
-                               const std::string& language,
-                               const std::string& country)
-    : request_context_(request_context),
-      api_version_(GetApiVersion()),
-      language_(language),
-      country_(country),
-      misspelling_counter_(0),
-      feedback_(kMaxFeedbackSizeBytes),
-      session_start_(base::Time::Now()),
-      feedback_service_url_(kFeedbackServiceURL) {
-  // The command-line switch is for testing and temporary.
-  // TODO(rouslan): Remove the command-line switch when testing is complete.
-  // http://crbug.com/247726
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          spellcheck::switches::kSpellingServiceFeedbackUrl)) {
-    feedback_service_url_ =
-        GURL(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            spellcheck::switches::kSpellingServiceFeedbackUrl));
-  }
-}
-
-FeedbackSender::~FeedbackSender() {
-}
-
-void FeedbackSender::SelectedSuggestion(uint32_t hash, int suggestion_index) {
-  Misspelling* misspelling = feedback_.GetMisspelling(hash);
-  // GetMisspelling() returns null for flushed feedback. Feedback is flushed
-  // when the session expires every |kSessionHours| hours.
-  if (!misspelling)
-    return;
-  misspelling->action.set_type(SpellcheckAction::TYPE_SELECT);
-  misspelling->action.set_index(suggestion_index);
-  misspelling->timestamp = base::Time::Now();
-}
-
-void FeedbackSender::AddedToDictionary(uint32_t hash) {
-  Misspelling* misspelling = feedback_.GetMisspelling(hash);
-  // GetMisspelling() returns null for flushed feedback. Feedback is flushed
-  // when the session expires every |kSessionHours| hours.
-  if (!misspelling)
-    return;
-  misspelling->action.set_type(SpellcheckAction::TYPE_ADD_TO_DICT);
-  misspelling->timestamp = base::Time::Now();
-  const std::set<uint32_t>& hashes =
-      feedback_.FindMisspellings(GetMisspelledString(*misspelling));
-  for (uint32_t hash : hashes) {
-    Misspelling* duplicate_misspelling = feedback_.GetMisspelling(hash);
-    if (!duplicate_misspelling || duplicate_misspelling->action.IsFinal())
-      continue;
-    duplicate_misspelling->action.set_type(SpellcheckAction::TYPE_ADD_TO_DICT);
-    duplicate_misspelling->timestamp = misspelling->timestamp;
-  }
-}
-
-void FeedbackSender::RecordInDictionary(uint32_t hash) {
-  Misspelling* misspelling = feedback_.GetMisspelling(hash);
-  // GetMisspelling() returns null for flushed feedback. Feedback is flushed
-  // when the session expires every |kSessionHours| hours.
-  if (!misspelling)
-    return;
-  misspelling->action.set_type(SpellcheckAction::TYPE_IN_DICTIONARY);
-}
-
-void FeedbackSender::IgnoredSuggestions(uint32_t hash) {
-  Misspelling* misspelling = feedback_.GetMisspelling(hash);
-  // GetMisspelling() returns null for flushed feedback. Feedback is flushed
-  // when the session expires every |kSessionHours| hours.
-  if (!misspelling)
-    return;
-  misspelling->action.set_type(SpellcheckAction::TYPE_PENDING_IGNORE);
-  misspelling->timestamp = base::Time::Now();
-}
-
-void FeedbackSender::ManuallyCorrected(uint32_t hash,
-                                       const base::string16& correction) {
-  Misspelling* misspelling = feedback_.GetMisspelling(hash);
-  // GetMisspelling() returns null for flushed feedback. Feedback is flushed
-  // when the session expires every |kSessionHours| hours.
-  if (!misspelling)
-    return;
-  misspelling->action.set_type(SpellcheckAction::TYPE_MANUALLY_CORRECTED);
-  misspelling->action.set_value(correction);
-  misspelling->timestamp = base::Time::Now();
-}
-
-void FeedbackSender::OnReceiveDocumentMarkers(
-    int renderer_process_id,
-    const std::vector<uint32_t>& markers) {
-  if ((base::Time::Now() - session_start_).InHours() >=
-      spellcheck::kSessionHours) {
-    FlushFeedback();
-    return;
-  }
-
-  if (!feedback_.RendererHasMisspellings(renderer_process_id))
-    return;
-
-  feedback_.FinalizeRemovedMisspellings(renderer_process_id, markers);
-  SendFeedback(feedback_.GetMisspellingsInRenderer(renderer_process_id),
-               !renderers_sent_feedback_.count(renderer_process_id));
-  renderers_sent_feedback_.insert(renderer_process_id);
-  feedback_.EraseFinalizedMisspellings(renderer_process_id);
-}
-
-void FeedbackSender::OnSpellcheckResults(
-    int renderer_process_id,
-    const base::string16& text,
-    const std::vector<SpellCheckMarker>& markers,
-    std::vector<SpellCheckResult>* results) {
-  // Don't collect feedback if not going to send it.
-  if (!timer_.IsRunning())
-    return;
-
-  // Generate a map of marker offsets to marker hashes. This map helps to
-  // efficiently lookup feedback data based on the position of the misspelling
-  // in text.
-  typedef std::map<size_t, uint32_t> MarkerMap;
-  MarkerMap marker_map;
-  for (size_t i = 0; i < markers.size(); ++i)
-    marker_map[markers[i].offset] = markers[i].hash;
-
-  for (auto& result : *results) {
-    if (!IsInBounds(result.location, result.length, text.length()))
-      continue;
-    MarkerMap::const_iterator marker_it = marker_map.find(result.location);
-    if (marker_it != marker_map.end() &&
-        feedback_.HasMisspelling(marker_it->second)) {
-      // If the renderer already has a marker for this spellcheck result, then
-      // set the hash of the spellcheck result to be the same as the marker.
-      result.hash = marker_it->second;
-    } else {
-      // If the renderer does not yet have a marker for this spellcheck result,
-      // then generate a new hash for the spellcheck result.
-      result.hash = BuildHash(session_start_, ++misspelling_counter_);
-    }
-    // Save the feedback data for the spellcheck result.
-    feedback_.AddMisspelling(renderer_process_id, BuildFeedback(result, text));
-  }
-}
-
-void FeedbackSender::OnLanguageCountryChange(const std::string& language,
-                                             const std::string& country) {
-  FlushFeedback();
-  language_ = language;
-  country_ = country;
-}
-
-void FeedbackSender::StartFeedbackCollection() {
-  if (timer_.IsRunning())
-    return;
-
-  int interval_seconds = spellcheck::kFeedbackIntervalSeconds;
-  // This command-line switch is for testing and temporary.
-  // TODO(rouslan): Remove the command-line switch when testing is complete.
-  // http://crbug.com/247726
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          spellcheck::switches::kSpellingServiceFeedbackIntervalSeconds)) {
-    base::StringToInt(
-        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            spellcheck::switches::kSpellingServiceFeedbackIntervalSeconds),
-        &interval_seconds);
-    if (interval_seconds < kMinIntervalSeconds)
-      interval_seconds = kMinIntervalSeconds;
-    static const int kSessionSeconds = spellcheck::kSessionHours * 60 * 60;
-    if (interval_seconds >  kSessionSeconds)
-      interval_seconds = kSessionSeconds;
-  }
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromSeconds(interval_seconds),
-               this,
-               &FeedbackSender::RequestDocumentMarkers);
-}
-
-void FeedbackSender::StopFeedbackCollection() {
-  if (!timer_.IsRunning())
-    return;
-
-  FlushFeedback();
-  timer_.Stop();
-}
-
-void FeedbackSender::RandBytes(void* p, size_t len) {
-  crypto::RandBytes(p, len);
-}
-
-void FeedbackSender::OnURLFetchComplete(const net::URLFetcher* source) {
-  for (auto sender_it = senders_.begin(); sender_it != senders_.end();
-       ++sender_it) {
-    if ((*sender_it).get() == source) {
-      senders_.erase(sender_it);
-      return;
-    }
-  }
-  delete source;
-}
-
-void FeedbackSender::RequestDocumentMarkers() {
-  // Request document markers from all the renderers that are still alive.
-  std::set<int> alive_renderers;
-  for (content::RenderProcessHost::iterator it(
-           content::RenderProcessHost::AllHostsIterator());
-       !it.IsAtEnd();
-       it.Advance()) {
-    alive_renderers.insert(it.GetCurrentValue()->GetID());
-    it.GetCurrentValue()->Send(new SpellCheckMsg_RequestDocumentMarkers());
-  }
-
-  // Asynchronously send out the feedback for all the renderers that are no
-  // longer alive.
-  std::vector<int> known_renderers = feedback_.GetRendersWithMisspellings();
-  std::sort(known_renderers.begin(), known_renderers.end());
-  std::vector<int> dead_renderers =
-      base::STLSetDifference<std::vector<int>>(known_renderers,
-                                               alive_renderers);
-  for (int renderer_process_id : dead_renderers) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&FeedbackSender::OnReceiveDocumentMarkers, AsWeakPtr(),
-                   renderer_process_id, std::vector<uint32_t>()));
-  }
-}
-
-void FeedbackSender::FlushFeedback() {
-  if (feedback_.Empty())
-    return;
-  feedback_.FinalizeAllMisspellings();
-  SendFeedback(feedback_.GetAllMisspellings(),
-               renderers_sent_feedback_.empty());
-  feedback_.Clear();
-  renderers_sent_feedback_.clear();
-  session_start_ = base::Time::Now();
-  timer_.Reset();
-}
-
-void FeedbackSender::SendFeedback(const std::vector<Misspelling>& feedback_data,
-                                  bool is_first_feedback_batch) {
-  if (base::Time::Now() - last_salt_update_ > base::TimeDelta::FromHours(24)) {
-    RandBytes(&salt_, sizeof(salt_));
-    last_salt_update_ = base::Time::Now();
-  }
-  std::unique_ptr<base::Value> feedback_value(BuildFeedbackValue(
-      BuildParams(
-          BuildSuggestionInfo(feedback_data, is_first_feedback_batch, salt_),
-          language_, country_),
-      api_version_));
-  std::string feedback;
-  base::JSONWriter::Write(*feedback_value, &feedback);
-
-  // The tests use this identifier to mock the URL fetcher.
-  static const int kUrlFetcherId = 0;
-  net::URLFetcher* sender =
-      net::URLFetcher::Create(kUrlFetcherId, feedback_service_url_,
-                              net::URLFetcher::POST, this).release();
-  data_use_measurement::DataUseUserData::AttachToFetcher(
-      sender, data_use_measurement::DataUseUserData::SPELL_CHECKER);
-  sender->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
-                       net::LOAD_DO_NOT_SAVE_COOKIES);
-  sender->SetUploadData("application/json", feedback);
-  senders_.push_back(base::WrapUnique<net::URLFetcher>(sender));
-
-  // Request context is nullptr in testing.
-  if (request_context_.get()) {
-    sender->SetRequestContext(request_context_.get());
-    sender->Start();
-  }
-}
-
-}  // namespace spellcheck

diff --git a/components/spellcheck/browser/feedback_sender.h b/components/spellcheck/browser/feedback_sender.h
deleted file mode 100644
index fa36c8a..0000000
--- a/components/spellcheck/browser/feedback_sender.h
+++ /dev/null

@@ -1,195 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// An object to record and send user feedback to spelling service. The spelling
-// service uses the feedback to improve its suggestions.
-//
-// Assigns uint32_t hash identifiers to spelling suggestions from spelling
-// service and stores these suggestions. Records user's actions on these
-// suggestions. Periodically sends batches of user feedback to the spelling
-// service.
-
-#ifndef COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_SENDER_H_
-#define COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_SENDER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <array>
-#include <climits>
-#include <map>
-#include <set>
-#include <vector>
-
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/timer/timer.h"
-#include "components/spellcheck/browser/feedback.h"
-#include "components/spellcheck/browser/misspelling.h"
-#include "net/url_request/url_fetcher_delegate.h"
-#include "url/gurl.h"
-
-class SpellCheckMarker;
-struct SpellCheckResult;
-
-namespace net {
-class URLFetcher;
-class URLRequestContextGetter;
-}
-
-namespace spellcheck {
-
-namespace {
-
-// Constants for the feedback field trial.
-const char kFeedbackFieldTrialName[] = "SpellingServiceFeedback";
-const char kFeedbackFieldTrialEnabledGroupName[] = "Enabled";
-
-}  // namespace
-
-// Stores and sends user feedback to the spelling service. Sample usage:
-//    FeedbackSender sender(profile.GetRequestContext(), language, country);
-//    sender.OnSpellcheckResults(spellcheck_results_from_spelling_service,
-//                               renderer_process_id,
-//                               spellchecked_text,
-//                               existing_hashes);
-//    sender.SelectedSuggestion(hash, suggestion_index);
-class FeedbackSender : public base::SupportsWeakPtr<FeedbackSender>,
-                       public net::URLFetcherDelegate {
- public:
-  // Constructs a feedback sender. Keeps |request_context| in a scoped_refptr,
-  // because URLRequestContextGetter implements RefcountedThreadSafe.
-  FeedbackSender(net::URLRequestContextGetter* request_context,
-                 const std::string& language,
-                 const std::string& country);
-  ~FeedbackSender() override;
-
-  // Records that user selected suggestion |suggestion_index| for the
-  // misspelling identified by |hash|.
-  void SelectedSuggestion(uint32_t hash, int suggestion_index);
-
-  // Records that user added the misspelling identified by |hash| to the
-  // dictionary.
-  void AddedToDictionary(uint32_t hash);
-
-  // Records that user right-clicked on the misspelling identified by |hash|,
-  // but did not select any suggestion.
-  void IgnoredSuggestions(uint32_t hash);
-
-  // Records that user did not choose any suggestion but manually corrected the
-  // misspelling identified by |hash| to string |correction|, which is not in
-  // the list of suggestions.
-  void ManuallyCorrected(uint32_t hash, const base::string16& correction);
-
-  // Records that user has the misspelling in the custom dictionary. The user
-  // will never see the spellcheck suggestions for the misspelling.
-  void RecordInDictionary(uint32_t hash);
-
-  // Receives document markers for renderer with process ID |render_process_id|
-  // when the renderer responds to a RequestDocumentMarkers() call. Finalizes
-  // feedback for the markers that are gone from the renderer. Sends feedback
-  // data for the renderer with process ID |renderer_process_id| to the spelling
-  // service. If the current session has expired, then refreshes the session
-  // start timestamp and sends out all of the feedback data.
-  void OnReceiveDocumentMarkers(int renderer_process_id,
-                                const std::vector<uint32_t>& markers);
-
-  // Generates feedback data based on spellcheck results. The new feedback data
-  // is pending. Sets hash identifiers for |results|. Called when spelling
-  // service client receives results from the spelling service. Does not take
-  // ownership of |results|.
-  void OnSpellcheckResults(int renderer_process_id,
-                           const base::string16& text,
-                           const std::vector<SpellCheckMarker>& markers,
-                           std::vector<SpellCheckResult>* results);
-
-  // Receives updated language and country code for feedback. Finalizes and
-  // sends out all of the feedback data.
-  void OnLanguageCountryChange(const std::string& language,
-                               const std::string& country);
-
-  // Starts collecting feedback, if it's not already being collected.
-  void StartFeedbackCollection();
-
-  // Sends out all previously collected data and stops collecting feedback, if
-  // it was being collected.
-  void StopFeedbackCollection();
-
-  // 256 bits
-  typedef std::array<char, 256 / CHAR_BIT> RandSalt;
-
- private:
-  friend class FeedbackSenderTest;
-
-  // Allow unit tests to override RNG.
-  virtual void RandBytes(void* p, size_t len);
-
-  // net::URLFetcherDelegate implementation. Takes ownership of |source|.
-  void OnURLFetchComplete(const net::URLFetcher* source) override;
-
-  // Requests the document markers from all of the renderers to determine which
-  // feedback can be finalized. Finalizes feedback for renderers that are gone.
-  // Called periodically when |timer_| fires.
-  void RequestDocumentMarkers();
-
-  // Sends out all feedback data. Resets the session-start timestamp to now.
-  // Restarts the timer that requests markers from the renderers.
-  void FlushFeedback();
-
-  // Sends out the |feedback_data|.
-  void SendFeedback(const std::vector<Misspelling>& feedback_data,
-                    bool is_first_feedback_batch);
-
-  // URL request context for the feedback senders.
-  scoped_refptr<net::URLRequestContextGetter> request_context_;
-
-  // The feedback API version.
-  const std::string api_version_;
-
-  // The language of text. The string is a BCP 47 language tag.
-  std::string language_;
-
-  // The country of origin. The string is the ISO 3166-1 alpha-3 code.
-  std::string country_;
-
-  // Misspelling counter used to generate unique hash identifier for each
-  // misspelling.
-  size_t misspelling_counter_;
-
-  // Feedback data.
-  Feedback feedback_;
-
-  // A set of renderer process IDs for renderers that have sent out feedback in
-  // this session.
-  std::set<int> renderers_sent_feedback_;
-
-  // When the session started.
-  base::Time session_start_;
-
-  // The last time that we updated |salt_|.
-  base::Time last_salt_update_;
-
-  // A random number updated once a day.
-  RandSalt salt_;
-
-  // The URL where the feedback data should be sent.
-  GURL feedback_service_url_;
-
-  // A timer to periodically request a list of document spelling markers from
-  // all of the renderers. The timer starts in StartFeedbackCollection() and
-  // stops in StopFeedbackCollection(). The timer stops and abandons its tasks
-  // on destruction.
-  base::RepeatingTimer timer_;
-
-  // Feedback senders that need to stay alive for the duration of sending data.
-  // If a sender is destroyed before it finishes, then sending feedback will be
-  // canceled.
-  std::vector<std::unique_ptr<net::URLFetcher>> senders_;
-
-  DISALLOW_COPY_AND_ASSIGN(FeedbackSender);
-};
-
-}  // namespace spellcheck
-
-#endif  // COMPONENTS_SPELLCHECK_BROWSER_FEEDBACK_SENDER_H_

diff --git a/components/spellcheck/browser/feedback_sender_unittest.cc b/components/spellcheck/browser/feedback_sender_unittest.cc
deleted file mode 100644
index e4c8146..0000000
--- a/components/spellcheck/browser/feedback_sender_unittest.cc
+++ /dev/null

@@ -1,729 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// Unit tests for |FeedbackSender| object.
-
-#include "components/spellcheck/browser/feedback_sender.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "base/bind.h"
-#include "base/command_line.h"
-#include "base/json/json_reader.h"
-#include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
-#include "base/metrics/field_trial.h"
-#include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
-#include "components/spellcheck/common/spellcheck_common.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
-#include "components/spellcheck/common/spellcheck_result.h"
-#include "components/spellcheck/common/spellcheck_switches.h"
-#include "components/variations/entropy_provider.h"
-#include "content/public/test/test_browser_thread.h"
-#include "net/url_request/test_url_fetcher_factory.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace spellcheck {
-
-namespace {
-
-const char kCountry[] = "USA";
-const char kLanguage[] = "en";
-const char kText[] = "Helllo world.";
-const int kMisspellingLength = 6;
-const int kMisspellingStart = 0;
-const int kRendererProcessId = 0;
-const int kUrlFetcherId = 0;
-
-// Builds a simple spellcheck result.
-SpellCheckResult BuildSpellCheckResult() {
-  return SpellCheckResult(SpellCheckResult::SPELLING,
-                          kMisspellingStart,
-                          kMisspellingLength,
-                          base::UTF8ToUTF16("Hello"));
-}
-
-// Returns the number of times that |needle| appears in |haystack| without
-// overlaps. For example, CountOccurences("bananana", "nana") returns 1.
-int CountOccurences(const std::string& haystack, const std::string& needle) {
-  int number_of_occurrences = 0;
-  for (size_t pos = haystack.find(needle);
-       pos != std::string::npos;
-       pos = haystack.find(needle, pos + needle.length())) {
-    ++number_of_occurrences;
-  }
-  return number_of_occurrences;
-}
-
-class MockFeedbackSender : public spellcheck::FeedbackSender {
- public:
-  MockFeedbackSender(net::URLRequestContextGetter* request_context,
-                     const std::string& language,
-                     const std::string& country)
-      : FeedbackSender(request_context, language, country), random_(0) {}
-
-  void RandBytes(void* p, size_t len) override {
-    memset(p, 0, len);
-    if (len >= sizeof(random_))
-      *(unsigned*)p = ++random_;
-  }
-
- private:
-  // For returning a different value from each call to RandUint64().
-  unsigned random_;
-};
-
-std::string GetMisspellingId(const std::string& raw_data) {
-  std::unique_ptr<base::Value> parsed_data(
-      base::JSONReader::Read(raw_data).release());
-  EXPECT_TRUE(parsed_data.get());
-  base::DictionaryValue* actual_data;
-  EXPECT_TRUE(parsed_data->GetAsDictionary(&actual_data));
-  base::ListValue* suggestions = NULL;
-  EXPECT_TRUE(actual_data->GetList("params.suggestionInfo", &suggestions));
-  base::DictionaryValue* suggestion = NULL;
-  EXPECT_TRUE(suggestions->GetDictionary(0, &suggestion));
-  std::string value;
-  EXPECT_TRUE(suggestion->GetString("userMisspellingId", &value));
-  return value;
-}
-
-}  // namespace
-
-// A test fixture to help keep tests simple.
-class FeedbackSenderTest : public testing::Test {
- public:
-  FeedbackSenderTest() : ui_thread_(content::BrowserThread::UI, &loop_) {
-    feedback_.reset(new MockFeedbackSender(NULL, kLanguage, kCountry));
-    feedback_->StartFeedbackCollection();
-  }
-
-  ~FeedbackSenderTest() override {}
-
- protected:
-  // Appends the "--enable-spelling-service-feedback" switch to the
-  // command-line.
-  void AppendCommandLineSwitch() {
-    // The command-line switch is temporary.
-    // TODO(rouslan): Remove the command-line switch. http://crbug.com/247726
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        spellcheck::switches::kEnableSpellingFeedbackFieldTrial);
-    feedback_.reset(new MockFeedbackSender(NULL, kLanguage, kCountry));
-    feedback_->StartFeedbackCollection();
-  }
-
-  // Enables the "SpellingServiceFeedback.Enabled" field trial.
-  void EnableFieldTrial() {
-    // The field trial is temporary.
-    // TODO(rouslan): Remove the field trial. http://crbug.com/247726
-    field_trial_list_.reset(
-        new base::FieldTrialList(
-            base::MakeUnique<metrics::SHA1EntropyProvider>("foo")));
-    field_trial_ = base::FieldTrialList::CreateFieldTrial(
-        kFeedbackFieldTrialName, kFeedbackFieldTrialEnabledGroupName);
-    field_trial_->group();
-    feedback_.reset(new MockFeedbackSender(NULL, kLanguage, kCountry));
-    feedback_->StartFeedbackCollection();
-  }
-
-  uint32_t AddPendingFeedback() {
-    std::vector<SpellCheckResult> results(1, BuildSpellCheckResult());
-    feedback_->OnSpellcheckResults(kRendererProcessId,
-                                   base::UTF8ToUTF16(kText),
-                                   std::vector<SpellCheckMarker>(),
-                                   &results);
-    return results[0].hash;
-  }
-
-  void ExpireSession() {
-    feedback_->session_start_ =
-        base::Time::Now() -
-        base::TimeDelta::FromHours(spellcheck::kSessionHours);
-  }
-
-  bool UploadDataContains(const std::string& data) const {
-    const net::TestURLFetcher* fetcher =
-        fetchers_.GetFetcherByID(kUrlFetcherId);
-    return fetcher && CountOccurences(fetcher->upload_data(), data) > 0;
-  }
-
-  bool UploadDataContains(const std::string& data,
-                          int number_of_occurrences) const {
-    const net::TestURLFetcher* fetcher =
-        fetchers_.GetFetcherByID(kUrlFetcherId);
-    return fetcher && CountOccurences(fetcher->upload_data(), data) ==
-                          number_of_occurrences;
-  }
-
-  // Returns true if the feedback sender would be uploading data now. The test
-  // does not open network connections.
-  bool IsUploadingData() const {
-    return !!fetchers_.GetFetcherByID(kUrlFetcherId);
-  }
-
-  void ClearUploadData() {
-    fetchers_.RemoveFetcherFromMap(kUrlFetcherId);
-  }
-
-  std::string GetUploadData() const {
-    const net::TestURLFetcher* fetcher =
-        fetchers_.GetFetcherByID(kUrlFetcherId);
-    return fetcher ? fetcher->upload_data() : std::string();
-  }
-
-  void AdjustUpdateTime(base::TimeDelta offset) {
-    feedback_->last_salt_update_ += offset;
-  }
-
-  std::unique_ptr<MockFeedbackSender> feedback_;
-
- private:
-  base::MessageLoop loop_;
-  content::TestBrowserThread ui_thread_;
-  std::unique_ptr<base::FieldTrialList> field_trial_list_;
-  scoped_refptr<base::FieldTrial> field_trial_;
-  net::TestURLFetcherFactory fetchers_;
-};
-
-// Do not send data if there's no feedback.
-TEST_F(FeedbackSenderTest, NoFeedback) {
-  EXPECT_FALSE(IsUploadingData());
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// Do not send data if not aware of which markers are still in the document.
-TEST_F(FeedbackSenderTest, NoDocumentMarkersReceived) {
-  EXPECT_FALSE(IsUploadingData());
-  uint32_t hash = AddPendingFeedback();
-  EXPECT_FALSE(IsUploadingData());
-  static const int kSuggestionIndex = 1;
-  feedback_->SelectedSuggestion(hash, kSuggestionIndex);
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// Send PENDING feedback message if the marker is still in the document, and the
-// user has not performed any action on it.
-TEST_F(FeedbackSenderTest, PendingFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>(1, hash));
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-}
-
-TEST_F(FeedbackSenderTest, IdenticalFeedback) {
-  std::vector<uint32_t> hashes;
-  hashes.push_back(AddPendingFeedback());
-  hashes.push_back(AddPendingFeedback());
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, hashes);
-  std::string actual_data = GetUploadData();
-  std::unique_ptr<base::DictionaryValue> actual(
-      static_cast<base::DictionaryValue*>(
-          base::JSONReader::Read(GetUploadData()).release()));
-  base::ListValue* suggestions = NULL;
-  ASSERT_TRUE(actual->GetList("params.suggestionInfo", &suggestions));
-  base::DictionaryValue* suggestion0 = NULL;
-  ASSERT_TRUE(suggestions->GetDictionary(0, &suggestion0));
-  base::DictionaryValue* suggestion1 = NULL;
-  ASSERT_TRUE(suggestions->GetDictionary(0, &suggestion1));
-  std::string value0, value1;
-  ASSERT_TRUE(suggestion0->GetString("userMisspellingId", &value0));
-  ASSERT_TRUE(suggestion1->GetString("userMisspellingId", &value1));
-  EXPECT_EQ(value0, value1);
-  base::ListValue* suggestion_ids = NULL;
-  ASSERT_TRUE(suggestion0->GetList("userSuggestionId", &suggestion_ids));
-  ASSERT_TRUE(suggestion_ids->GetString(0, &value0));
-  ASSERT_TRUE(suggestion1->GetList("userSuggestionId", &suggestion_ids));
-  ASSERT_TRUE(suggestion_ids->GetString(0, &value1));
-  EXPECT_EQ(value0, value1);
-}
-
-TEST_F(FeedbackSenderTest, NonidenticalFeedback) {
-  std::vector<uint32_t> hashes;
-  hashes.push_back(AddPendingFeedback());
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, hashes);
-  std::string raw_data0 = GetUploadData();
-  hashes.clear();
-  hashes.push_back(AddPendingFeedback());
-  AdjustUpdateTime(-base::TimeDelta::FromHours(25));
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, hashes);
-  std::string raw_data1 = GetUploadData();
-
-  std::string value0(GetMisspellingId(raw_data0));
-  std::string value1(GetMisspellingId(raw_data1));
-  EXPECT_NE(value0, value1);
-}
-
-// Send NO_ACTION feedback message if the marker has been removed from the
-// document.
-TEST_F(FeedbackSenderTest, NoActionFeedback) {
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"NO_ACTION\""));
-}
-
-// Send SELECT feedback message if the user has selected a spelling suggestion.
-TEST_F(FeedbackSenderTest, SelectFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  static const int kSuggestionIndex = 0;
-  feedback_->SelectedSuggestion(hash, kSuggestionIndex);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"SELECT\""));
-  EXPECT_TRUE(UploadDataContains("\"actionTargetIndex\":" +
-                                 base::StringPrintf("%d", kSuggestionIndex)));
-}
-
-// Send ADD_TO_DICT feedback message if the user has added the misspelled word
-// to the custom dictionary.
-TEST_F(FeedbackSenderTest, AddToDictFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  feedback_->AddedToDictionary(hash);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"ADD_TO_DICT\""));
-}
-
-// Send IN_DICTIONARY feedback message if the user has the misspelled word in
-// the custom dictionary.
-TEST_F(FeedbackSenderTest, InDictionaryFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  feedback_->RecordInDictionary(hash);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"IN_DICTIONARY\""));
-}
-
-// Send PENDING feedback message if the user saw the spelling suggestion, but
-// decided to not select it, and the marker is still in the document.
-TEST_F(FeedbackSenderTest, IgnoreFeedbackMarkerInDocument) {
-  uint32_t hash = AddPendingFeedback();
-  feedback_->IgnoredSuggestions(hash);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>(1, hash));
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-}
-
-// Send IGNORE feedback message if the user saw the spelling suggestion, but
-// decided to not select it, and the marker is no longer in the document.
-TEST_F(FeedbackSenderTest, IgnoreFeedbackMarkerNotInDocument) {
-  uint32_t hash = AddPendingFeedback();
-  feedback_->IgnoredSuggestions(hash);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"IGNORE\""));
-}
-
-// Send MANUALLY_CORRECTED feedback message if the user manually corrected the
-// misspelled word.
-TEST_F(FeedbackSenderTest, ManuallyCorrectedFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  static const std::string kManualCorrection = "Howdy";
-  feedback_->ManuallyCorrected(hash, base::ASCIIToUTF16(kManualCorrection));
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"MANUALLY_CORRECTED\""));
-  EXPECT_TRUE(UploadDataContains("\"actionTargetValue\":\"" +
-                                 kManualCorrection + "\""));
-}
-
-// Send feedback messages in batch.
-TEST_F(FeedbackSenderTest, BatchFeedback) {
-  std::vector<SpellCheckResult> results;
-  results.push_back(SpellCheckResult(SpellCheckResult::SPELLING,
-                                     kMisspellingStart,
-                                     kMisspellingLength,
-                                     base::ASCIIToUTF16("Hello")));
-  static const int kSecondMisspellingStart = 7;
-  static const int kSecondMisspellingLength = 5;
-  results.push_back(SpellCheckResult(SpellCheckResult::SPELLING,
-                                     kSecondMisspellingStart,
-                                     kSecondMisspellingLength,
-                                     base::ASCIIToUTF16("world")));
-  feedback_->OnSpellcheckResults(kRendererProcessId,
-                                 base::UTF8ToUTF16(kText),
-                                 std::vector<SpellCheckMarker>(),
-                                 &results);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"NO_ACTION\"", 2));
-}
-
-// Send a series of PENDING feedback messages and one final NO_ACTION feedback
-// message with the same hash identifier for a single misspelling.
-TEST_F(FeedbackSenderTest, SameHashFeedback) {
-  uint32_t hash = AddPendingFeedback();
-  std::vector<uint32_t> remaining_markers(1, hash);
-
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-  std::string hash_string = base::StringPrintf("\"suggestionId\":\"%u\"", hash);
-  EXPECT_TRUE(UploadDataContains(hash_string));
-  ClearUploadData();
-
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-  EXPECT_TRUE(UploadDataContains(hash_string));
-  ClearUploadData();
-
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"NO_ACTION\""));
-  EXPECT_TRUE(UploadDataContains(hash_string));
-  ClearUploadData();
-
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// When a session expires:
-// 1) Pending feedback is finalized and sent to the server in the last message
-//    batch in the session.
-// 2) No feedback is sent until a spellcheck request happens.
-// 3) Existing markers get new hash identifiers.
-TEST_F(FeedbackSenderTest, SessionExpirationFeedback) {
-  std::vector<SpellCheckResult> results(
-      1,
-      SpellCheckResult(SpellCheckResult::SPELLING,
-                       kMisspellingStart,
-                       kMisspellingLength,
-                       base::ASCIIToUTF16("Hello")));
-  feedback_->OnSpellcheckResults(kRendererProcessId,
-                                 base::UTF8ToUTF16(kText),
-                                 std::vector<SpellCheckMarker>(),
-                                 &results);
-  uint32_t original_hash = results[0].hash;
-  std::vector<uint32_t> remaining_markers(1, original_hash);
-
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_FALSE(UploadDataContains("\"actionType\":\"NO_ACTION\""));
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-  std::string original_hash_string =
-      base::StringPrintf("\"suggestionId\":\"%u\"", original_hash);
-  EXPECT_TRUE(UploadDataContains(original_hash_string));
-  ClearUploadData();
-
-  ExpireSession();
-
-  // Last message batch in the current session has only finalized messages.
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"NO_ACTION\""));
-  EXPECT_FALSE(UploadDataContains("\"actionType\":\"PENDING\""));
-  EXPECT_TRUE(UploadDataContains(original_hash_string));
-  ClearUploadData();
-
-  // The next session starts on the next spellchecker request. Until then,
-  // there's no more feedback sent.
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_FALSE(IsUploadingData());
-
-  // The first spellcheck request after session expiration creates different
-  // document marker hash identifiers.
-  std::vector<SpellCheckMarker> original_markers(
-      1, SpellCheckMarker(results[0].hash, results[0].location));
-  results[0] = SpellCheckResult(SpellCheckResult::SPELLING,
-                                kMisspellingStart,
-                                kMisspellingLength,
-                                base::ASCIIToUTF16("Hello"));
-  feedback_->OnSpellcheckResults(
-      kRendererProcessId, base::UTF8ToUTF16(kText), original_markers, &results);
-  uint32_t updated_hash = results[0].hash;
-  EXPECT_NE(updated_hash, original_hash);
-  remaining_markers[0] = updated_hash;
-
-  // The first feedback message batch in session |i + 1| has the new document
-  // marker hash identifiers.
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId, remaining_markers);
-  EXPECT_FALSE(UploadDataContains("\"actionType\":\"NO_ACTION\""));
-  EXPECT_TRUE(UploadDataContains("\"actionType\":\"PENDING\""));
-  EXPECT_FALSE(UploadDataContains(original_hash_string));
-  std::string updated_hash_string =
-      base::StringPrintf("\"suggestionId\":\"%u\"", updated_hash);
-  EXPECT_TRUE(UploadDataContains(updated_hash_string));
-}
-
-// First message in session has an indicator.
-TEST_F(FeedbackSenderTest, FirstMessageInSessionIndicator) {
-  // Session 1, message 1
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"isFirstInSession\":true"));
-
-  // Session 1, message 2
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"isFirstInSession\":false"));
-
-  ExpireSession();
-
-  // Session 1, message 3 (last)
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"isFirstInSession\":false"));
-
-  // Session 2, message 1
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"isFirstInSession\":true"));
-
-  // Session 2, message 2
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"isFirstInSession\":false"));
-}
-
-// Flush all feedback when the spellcheck language and country change.
-TEST_F(FeedbackSenderTest, OnLanguageCountryChange) {
-  AddPendingFeedback();
-  feedback_->OnLanguageCountryChange("pt", "BR");
-  EXPECT_TRUE(UploadDataContains("\"language\":\"en\""));
-  AddPendingFeedback();
-  feedback_->OnLanguageCountryChange("en", "US");
-  EXPECT_TRUE(UploadDataContains("\"language\":\"pt\""));
-}
-
-// The field names and types should correspond to the API.
-TEST_F(FeedbackSenderTest, FeedbackAPI) {
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  std::string actual_data = GetUploadData();
-  std::unique_ptr<base::DictionaryValue> actual(
-      static_cast<base::DictionaryValue*>(
-          base::JSONReader::Read(actual_data).release()));
-  actual->SetString("params.key", "TestDummyKey");
-  base::ListValue* suggestions = nullptr;
-  actual->GetList("params.suggestionInfo", &suggestions);
-  base::DictionaryValue* suggestion = nullptr;
-  suggestions->GetDictionary(0, &suggestion);
-  suggestion->SetString("suggestionId", "42");
-  suggestion->SetString("timestamp", "9001");
-  static const std::string expected_data =
-      "{\"apiVersion\":\"v2\","
-      "\"method\":\"spelling.feedback\","
-      "\"params\":"
-      "{\"clientName\":\"Chrome\","
-      "\"originCountry\":\"USA\","
-      "\"key\":\"TestDummyKey\","
-      "\"language\":\"en\","
-      "\"suggestionInfo\":[{"
-      "\"isAutoCorrection\":false,"
-      "\"isFirstInSession\":true,"
-      "\"misspelledLength\":6,"
-      "\"misspelledStart\":0,"
-      "\"originalText\":\"Helllo world\","
-      "\"suggestionId\":\"42\","
-      "\"suggestions\":[\"Hello\"],"
-      "\"timestamp\":\"9001\","
-      "\"userActions\":[{\"actionType\":\"NO_ACTION\"}],"
-      "\"userMisspellingId\":\"14573599553589145012\","
-      "\"userSuggestionId\":[\"14761077877524043800\"]}]}}";
-  std::unique_ptr<base::Value> expected = base::JSONReader::Read(expected_data);
-  EXPECT_TRUE(expected->Equals(actual.get()))
-      << "Expected data: " << expected_data
-      << "\nActual data:   " << actual_data;
-}
-
-// The default API version is "v2".
-TEST_F(FeedbackSenderTest, DefaultApiVersion) {
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("\"apiVersion\":\"v2\""));
-  EXPECT_FALSE(UploadDataContains("\"apiVersion\":\"v2-internal\""));
-}
-
-// The API version should not change for field-trial participants that do not
-// append the command-line switch.
-TEST_F(FeedbackSenderTest, FieldTrialAloneHasSameApiVersion) {
-  EnableFieldTrial();
-
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-
-  EXPECT_TRUE(UploadDataContains("\"apiVersion\":\"v2\""));
-  EXPECT_FALSE(UploadDataContains("\"apiVersion\":\"v2-internal\""));
-}
-
-// The API version should not change if the command-line switch is appended, but
-// the user is not participating in the field-trial.
-TEST_F(FeedbackSenderTest, CommandLineSwitchAloneHasSameApiVersion) {
-  AppendCommandLineSwitch();
-
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-
-  EXPECT_TRUE(UploadDataContains("\"apiVersion\":\"v2\""));
-  EXPECT_FALSE(UploadDataContains("\"apiVersion\":\"v2-internal\""));
-}
-
-// The API version should be different for field-trial participants that also
-// append the command-line switch.
-TEST_F(FeedbackSenderTest, InternalApiVersion) {
-  AppendCommandLineSwitch();
-  EnableFieldTrial();
-
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-
-  EXPECT_FALSE(UploadDataContains("\"apiVersion\":\"v2\""));
-  EXPECT_TRUE(UploadDataContains("\"apiVersion\":\"v2-internal\""));
-}
-
-// Duplicate spellcheck results should be matched to the existing markers.
-TEST_F(FeedbackSenderTest, MatchDupliateResultsWithExistingMarkers) {
-  uint32_t hash = AddPendingFeedback();
-  std::vector<SpellCheckResult> results(
-      1,
-      SpellCheckResult(SpellCheckResult::SPELLING,
-                       kMisspellingStart,
-                       kMisspellingLength,
-                       base::ASCIIToUTF16("Hello")));
-  std::vector<SpellCheckMarker> markers(
-      1, SpellCheckMarker(hash, results[0].location));
-  EXPECT_EQ(static_cast<uint32_t>(0), results[0].hash);
-  feedback_->OnSpellcheckResults(
-      kRendererProcessId, base::UTF8ToUTF16(kText), markers, &results);
-  EXPECT_EQ(hash, results[0].hash);
-}
-
-// Adding a word to dictionary should trigger ADD_TO_DICT feedback for every
-// occurrence of that word.
-TEST_F(FeedbackSenderTest, MultipleAddToDictFeedback) {
-  std::vector<SpellCheckResult> results;
-  static const int kSentenceLength = 14;
-  static const int kNumberOfSentences = 2;
-  static const base::string16 kTextWithDuplicates =
-      base::ASCIIToUTF16("Helllo world. Helllo world.");
-  for (int i = 0; i < kNumberOfSentences; ++i) {
-    results.push_back(SpellCheckResult(SpellCheckResult::SPELLING,
-                                       kMisspellingStart + i * kSentenceLength,
-                                       kMisspellingLength,
-                                       base::ASCIIToUTF16("Hello")));
-  }
-  static const int kNumberOfRenderers = 2;
-  int last_renderer_process_id = -1;
-  for (int i = 0; i < kNumberOfRenderers; ++i) {
-    feedback_->OnSpellcheckResults(kRendererProcessId + i,
-                                   kTextWithDuplicates,
-                                   std::vector<SpellCheckMarker>(),
-                                   &results);
-    last_renderer_process_id = kRendererProcessId + i;
-  }
-  std::vector<uint32_t> remaining_markers;
-  for (size_t i = 0; i < results.size(); ++i)
-    remaining_markers.push_back(results[i].hash);
-  feedback_->OnReceiveDocumentMarkers(last_renderer_process_id,
-                                      remaining_markers);
-  EXPECT_TRUE(UploadDataContains("PENDING", 2));
-  EXPECT_FALSE(UploadDataContains("ADD_TO_DICT"));
-
-  feedback_->AddedToDictionary(results[0].hash);
-  feedback_->OnReceiveDocumentMarkers(last_renderer_process_id,
-                                      remaining_markers);
-  EXPECT_FALSE(UploadDataContains("PENDING"));
-  EXPECT_TRUE(UploadDataContains("ADD_TO_DICT", 2));
-}
-
-// ADD_TO_DICT feedback for multiple occurrences of a word should trigger only
-// for pending feedback.
-TEST_F(FeedbackSenderTest, AddToDictOnlyPending) {
-  AddPendingFeedback();
-  uint32_t add_to_dict_hash = AddPendingFeedback();
-  uint32_t select_hash = AddPendingFeedback();
-  feedback_->SelectedSuggestion(select_hash, 0);
-  feedback_->AddedToDictionary(add_to_dict_hash);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(UploadDataContains("SELECT", 1));
-  EXPECT_TRUE(UploadDataContains("ADD_TO_DICT", 2));
-}
-
-// Spellcheck results that are out-of-bounds are not added to feedback.
-TEST_F(FeedbackSenderTest, IgnoreOutOfBounds) {
-  std::vector<SpellCheckResult> results;
-  results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 0, 100, base::UTF8ToUTF16("Hello")));
-  results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 100, 3, base::UTF8ToUTF16("world")));
-  results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, -1, 3, base::UTF8ToUTF16("how")));
-  results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 0, 0, base::UTF8ToUTF16("are")));
-  results.push_back(SpellCheckResult(
-      SpellCheckResult::SPELLING, 2, -1, base::UTF8ToUTF16("you")));
-  feedback_->OnSpellcheckResults(kRendererProcessId,
-                                 base::UTF8ToUTF16(kText),
-                                 std::vector<SpellCheckMarker>(),
-                                 &results);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// FeedbackSender does not collect and upload feedback when instructed to stop.
-TEST_F(FeedbackSenderTest, CanStopFeedbackCollection) {
-  feedback_->StopFeedbackCollection();
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// FeedbackSender resumes collecting and uploading feedback when instructed to
-// start after stopping.
-TEST_F(FeedbackSenderTest, CanResumeFeedbackCollection) {
-  feedback_->StopFeedbackCollection();
-  feedback_->StartFeedbackCollection();
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(IsUploadingData());
-}
-
-// FeedbackSender does not collect data while being stopped and upload it later.
-TEST_F(FeedbackSenderTest, NoFeedbackCollectionWhenStopped) {
-  feedback_->StopFeedbackCollection();
-  AddPendingFeedback();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  feedback_->StartFeedbackCollection();
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_FALSE(IsUploadingData());
-}
-
-// The feedback context is trimmed to 2 words on the left and 2 words on the
-// right side of the misspelling.
-TEST_F(FeedbackSenderTest, TrimFeedback) {
-  std::vector<SpellCheckResult> results(
-      1, SpellCheckResult(SpellCheckResult::SPELLING, 13, 3,
-                          base::UTF8ToUTF16("the")));
-  feedback_->OnSpellcheckResults(
-      kRendererProcessId,
-      base::UTF8ToUTF16("Far and away teh best prize that life has to offer is "
-                        "the chance to work hard at work worth doing."),
-      std::vector<SpellCheckMarker>(), &results);
-  feedback_->OnReceiveDocumentMarkers(kRendererProcessId,
-                                      std::vector<uint32_t>());
-  EXPECT_TRUE(
-      UploadDataContains(",\"originalText\":\"and away teh best prize\","));
-  EXPECT_TRUE(UploadDataContains(",\"misspelledStart\":9,"));
-}
-
-}  // namespace spellcheck

diff --git a/components/spellcheck/browser/feedback_unittest.cc b/components/spellcheck/browser/feedback_unittest.cc
deleted file mode 100644
index 5c68747..0000000
--- a/components/spellcheck/browser/feedback_unittest.cc
+++ /dev/null

@@ -1,302 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// Unit tests for |Feedback| object.
-
-#include "components/spellcheck/browser/feedback.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include "base/strings/utf_string_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using base::ASCIIToUTF16;
-
-namespace spellcheck {
-
-namespace {
-
-// Maximum number of bytes of feedback that would be sent to the server at once.
-const size_t kMaxFeedbackSize = 1024;
-
-// Identifier for a renderer process.
-const int kRendererProcessId = 7;
-
-// Hash identifier for a misspelling.
-const uint32_t kMisspellingHash = 42;
-
-}  // namespace
-
-// A test fixture to help keep the tests simple.
-class FeedbackTest : public testing::Test {
- public:
-  FeedbackTest() : feedback_(kMaxFeedbackSize) {}
-  ~FeedbackTest() override {}
-
- protected:
-  void AddMisspelling(int renderer_process_id, uint32_t hash) {
-    feedback_.AddMisspelling(renderer_process_id,
-                             Misspelling(base::string16(), 0, 0,
-                                         std::vector<base::string16>(), hash));
-  }
-
-  spellcheck::Feedback feedback_;
-};
-
-TEST_F(FeedbackTest, LimitFeedbackSize) {
-  // Adding too much feedback data should prevent adding more feedback.
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(
-          base::ASCIIToUTF16("0123456789"), 0, 1,
-          std::vector<base::string16>(50, base::ASCIIToUTF16("9876543210")),
-          0));
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(
-          base::ASCIIToUTF16("0123456789"), 0, 1,
-          std::vector<base::string16>(50, base::ASCIIToUTF16("9876543210")),
-          kMisspellingHash));
-  EXPECT_EQ(nullptr, feedback_.GetMisspelling(kMisspellingHash));
-
-  // Clearing the existing feedback data should allow adding feedback again.
-  feedback_.Clear();
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(
-          base::ASCIIToUTF16("0123456789"), 0, 1,
-          std::vector<base::string16>(50, base::ASCIIToUTF16("9876543210")),
-          kMisspellingHash));
-  EXPECT_NE(nullptr, feedback_.GetMisspelling(kMisspellingHash));
-  feedback_.Clear();
-
-  // Erasing finalized misspellings should allow adding feedback again.
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(
-          base::ASCIIToUTF16("0123456789"), 0, 1,
-          std::vector<base::string16>(50, base::ASCIIToUTF16("9876543210")),
-          0));
-  feedback_.FinalizeRemovedMisspellings(kRendererProcessId,
-                                        std::vector<uint32_t>());
-  feedback_.EraseFinalizedMisspellings(kRendererProcessId);
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(
-          base::ASCIIToUTF16("0123456789"), 0, 1,
-          std::vector<base::string16>(50, base::ASCIIToUTF16("9876543210")),
-          kMisspellingHash));
-  EXPECT_NE(nullptr, feedback_.GetMisspelling(kMisspellingHash));
-}
-
-// Should be able to retrieve misspelling after it's added.
-TEST_F(FeedbackTest, RetreiveMisspelling) {
-  EXPECT_EQ(nullptr, feedback_.GetMisspelling(kMisspellingHash));
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  Misspelling* result = feedback_.GetMisspelling(kMisspellingHash);
-  EXPECT_NE(nullptr, result);
-  EXPECT_EQ(kMisspellingHash, result->hash);
-}
-
-// Removed misspellings should be finalized.
-TEST_F(FeedbackTest, FinalizeRemovedMisspellings) {
-  static const int kRemovedMisspellingHash = 1;
-  static const int kRemainingMisspellingHash = 2;
-  AddMisspelling(kRendererProcessId, kRemovedMisspellingHash);
-  AddMisspelling(kRendererProcessId, kRemainingMisspellingHash);
-  std::vector<uint32_t> remaining_markers(1, kRemainingMisspellingHash);
-  feedback_.FinalizeRemovedMisspellings(kRendererProcessId, remaining_markers);
-  Misspelling* removed_misspelling =
-      feedback_.GetMisspelling(kRemovedMisspellingHash);
-  EXPECT_NE(nullptr, removed_misspelling);
-  EXPECT_TRUE(removed_misspelling->action.IsFinal());
-  Misspelling* remaining_misspelling =
-      feedback_.GetMisspelling(kRemainingMisspellingHash);
-  EXPECT_NE(nullptr, remaining_misspelling);
-  EXPECT_FALSE(remaining_misspelling->action.IsFinal());
-}
-
-// Duplicate misspellings should not be finalized.
-TEST_F(FeedbackTest, DuplicateMisspellingFinalization) {
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  std::vector<uint32_t> remaining_markers(1, kMisspellingHash);
-  feedback_.FinalizeRemovedMisspellings(kRendererProcessId, remaining_markers);
-  std::vector<Misspelling> misspellings = feedback_.GetAllMisspellings();
-  EXPECT_EQ(static_cast<size_t>(1), misspellings.size());
-  EXPECT_FALSE(misspellings[0].action.IsFinal());
-}
-
-// Misspellings should be associated with a renderer.
-TEST_F(FeedbackTest, RendererHasMisspellings) {
-  EXPECT_FALSE(feedback_.RendererHasMisspellings(kRendererProcessId));
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  EXPECT_TRUE(feedback_.RendererHasMisspellings(kRendererProcessId));
-}
-
-// Should be able to retrieve misspellings in renderer.
-TEST_F(FeedbackTest, GetMisspellingsInRenderer) {
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  const std::vector<Misspelling>& renderer_with_misspellings =
-      feedback_.GetMisspellingsInRenderer(kRendererProcessId);
-  EXPECT_EQ(static_cast<size_t>(1), renderer_with_misspellings.size());
-  EXPECT_EQ(kMisspellingHash, renderer_with_misspellings[0].hash);
-  const std::vector<Misspelling>& renderer_without_misspellings =
-      feedback_.GetMisspellingsInRenderer(kRendererProcessId + 1);
-  EXPECT_EQ(static_cast<size_t>(0), renderer_without_misspellings.size());
-}
-
-// Finalized misspellings should be erased.
-TEST_F(FeedbackTest, EraseFinalizedMisspellings) {
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  feedback_.FinalizeRemovedMisspellings(kRendererProcessId,
-                                        std::vector<uint32_t>());
-  EXPECT_TRUE(feedback_.RendererHasMisspellings(kRendererProcessId));
-  feedback_.EraseFinalizedMisspellings(kRendererProcessId);
-  EXPECT_FALSE(feedback_.RendererHasMisspellings(kRendererProcessId));
-  EXPECT_TRUE(feedback_.GetMisspellingsInRenderer(kRendererProcessId).empty());
-}
-
-// Should be able to check for misspelling existence.
-TEST_F(FeedbackTest, HasMisspelling) {
-  EXPECT_FALSE(feedback_.HasMisspelling(kMisspellingHash));
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  EXPECT_TRUE(feedback_.HasMisspelling(kMisspellingHash));
-}
-
-// Should be able to check for feedback data presence.
-TEST_F(FeedbackTest, EmptyFeedback) {
-  EXPECT_TRUE(feedback_.Empty());
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  EXPECT_FALSE(feedback_.Empty());
-}
-
-// Should be able to retrieve a list of all renderers with misspellings.
-TEST_F(FeedbackTest, GetRendersWithMisspellings) {
-  EXPECT_TRUE(feedback_.GetRendersWithMisspellings().empty());
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  AddMisspelling(kRendererProcessId + 1, kMisspellingHash + 1);
-  std::vector<int> result = feedback_.GetRendersWithMisspellings();
-  EXPECT_EQ(static_cast<size_t>(2), result.size());
-  EXPECT_NE(result[0], result[1]);
-  EXPECT_TRUE(result[0] == kRendererProcessId ||
-              result[0] == kRendererProcessId + 1);
-  EXPECT_TRUE(result[1] == kRendererProcessId ||
-              result[1] == kRendererProcessId + 1);
-}
-
-// Should be able to finalize all misspellings.
-TEST_F(FeedbackTest, FinalizeAllMisspellings) {
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  AddMisspelling(kRendererProcessId + 1, kMisspellingHash + 1);
-  {
-    std::vector<Misspelling> pending = feedback_.GetAllMisspellings();
-    for (std::vector<Misspelling>::const_iterator it = pending.begin();
-         it != pending.end(); ++it) {
-      EXPECT_FALSE(it->action.IsFinal());
-    }
-  }
-  feedback_.FinalizeAllMisspellings();
-  {
-    std::vector<Misspelling> final = feedback_.GetAllMisspellings();
-    for (std::vector<Misspelling>::const_iterator it = final.begin();
-         it != final.end(); ++it) {
-      EXPECT_TRUE(it->action.IsFinal());
-    }
-  }
-}
-
-// Should be able to retrieve a copy of all misspellings.
-TEST_F(FeedbackTest, GetAllMisspellings) {
-  EXPECT_TRUE(feedback_.GetAllMisspellings().empty());
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  AddMisspelling(kRendererProcessId + 1, kMisspellingHash + 1);
-  const std::vector<Misspelling>& result = feedback_.GetAllMisspellings();
-  EXPECT_EQ(static_cast<size_t>(2), result.size());
-  EXPECT_NE(result[0].hash, result[1].hash);
-  EXPECT_TRUE(result[0].hash == kMisspellingHash ||
-              result[0].hash == kMisspellingHash + 1);
-  EXPECT_TRUE(result[1].hash == kMisspellingHash ||
-              result[1].hash == kMisspellingHash + 1);
-}
-
-// Should be able to clear all misspellings.
-TEST_F(FeedbackTest, ClearFeedback) {
-  AddMisspelling(kRendererProcessId, kMisspellingHash);
-  AddMisspelling(kRendererProcessId + 1, kMisspellingHash + 1);
-  EXPECT_FALSE(feedback_.Empty());
-  feedback_.Clear();
-  EXPECT_TRUE(feedback_.Empty());
-}
-
-// Should be able to find misspellings by misspelled word.
-TEST_F(FeedbackTest, FindMisspellingsByText) {
-  static const base::string16 kMisspelledText =
-      ASCIIToUTF16("Helllo world. Helllo world");
-  static const base::string16 kSuggestion = ASCIIToUTF16("Hello");
-  static const int kMisspellingStart = 0;
-  static const int kMisspellingLength = 6;
-  static const int kSentenceLength = 14;
-  static const int kNumberOfSentences = 2;
-  static const int kNumberOfRenderers = 2;
-  uint32_t hash = kMisspellingHash;
-  for (int renderer_process_id = kRendererProcessId;
-       renderer_process_id < kRendererProcessId + kNumberOfRenderers;
-       ++renderer_process_id) {
-    for (int j = 0; j < kNumberOfSentences; ++j) {
-      feedback_.AddMisspelling(
-          renderer_process_id,
-          Misspelling(kMisspelledText, kMisspellingStart + j * kSentenceLength,
-                      kMisspellingLength,
-                      std::vector<base::string16>(1, kSuggestion), ++hash));
-    }
-  }
-
-  static const base::string16 kOtherMisspelledText =
-      ASCIIToUTF16("Somethign else");
-  static const base::string16 kOtherSuggestion = ASCIIToUTF16("Something");
-  static const int kOtherMisspellingStart = 0;
-  static const int kOtherMisspellingLength = 9;
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(kOtherMisspelledText, kOtherMisspellingStart,
-                  kOtherMisspellingLength,
-                  std::vector<base::string16>(1, kOtherSuggestion), hash + 1));
-
-  static const base::string16 kMisspelledWord = ASCIIToUTF16("Helllo");
-  const std::set<uint32_t>& misspellings =
-      feedback_.FindMisspellings(kMisspelledWord);
-  EXPECT_EQ(static_cast<size_t>(kNumberOfSentences * kNumberOfRenderers),
-            misspellings.size());
-
-  for (std::set<uint32_t>::const_iterator it = misspellings.begin();
-       it != misspellings.end(); ++it) {
-    Misspelling* misspelling = feedback_.GetMisspelling(*it);
-    EXPECT_NE(nullptr, misspelling);
-    EXPECT_TRUE(misspelling->hash >= kMisspellingHash &&
-                misspelling->hash <= hash);
-    EXPECT_EQ(kMisspelledWord, GetMisspelledString(*misspelling));
-  }
-}
-
-// Should not be able to find misspellings by misspelled word after they have
-// been removed.
-TEST_F(FeedbackTest, CannotFindMisspellingsByTextAfterErased) {
-  static const base::string16 kMisspelledText = ASCIIToUTF16("Helllo world");
-  static const base::string16 kMisspelledWord = ASCIIToUTF16("Helllo");
-  static const base::string16 kSuggestion = ASCIIToUTF16("Hello");
-  static const int kMisspellingStart = 0;
-  static const int kMisspellingLength = 6;
-  feedback_.AddMisspelling(
-      kRendererProcessId,
-      Misspelling(kMisspelledText, kMisspellingStart, kMisspellingLength,
-                  std::vector<base::string16>(1, kSuggestion),
-                  kMisspellingHash));
-  feedback_.GetMisspelling(kMisspellingHash)->action.Finalize();
-  feedback_.EraseFinalizedMisspellings(kRendererProcessId);
-  EXPECT_TRUE(feedback_.FindMisspellings(kMisspelledWord).empty());
-}
-
-}  // namespace spellcheck

diff --git a/components/spellcheck/browser/misspelling.cc b/components/spellcheck/browser/misspelling.cc
deleted file mode 100644
index 9268a946..0000000
--- a/components/spellcheck/browser/misspelling.cc
+++ /dev/null

@@ -1,86 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// The |Misspelling| object stores the misspelling, a spellcheck suggestion for
-// it, and user's action on it. The misspelling is stored as |context|,
-// |location|, and |length| instead of only misspelled text, because the
-// spellcheck algorithm uses the context.
-
-#include "components/spellcheck/browser/misspelling.h"
-
-#include "base/strings/string_number_conversions.h"
-#include "base/values.h"
-
-namespace {
-
-// Builds a value from a list of spellcheck suggestions.
-std::unique_ptr<base::Value> BuildSuggestionsValue(
-    const std::vector<base::string16>& list) {
-  std::unique_ptr<base::ListValue> result(new base::ListValue);
-  result->AppendStrings(list);
-  return std::move(result);
-}
-
-// Builds a value from a spellcheck action.
-std::unique_ptr<base::Value> BuildUserActionValue(
-    const SpellcheckAction& action) {
-  std::unique_ptr<base::ListValue> result(new base::ListValue);
-  result->Append(action.Serialize());
-  return std::move(result);
-}
-
-}  // namespace
-
-Misspelling::Misspelling()
-    : location(0), length(0), hash(0), timestamp(base::Time::Now()) {}
-
-Misspelling::Misspelling(const base::string16& context,
-                         size_t location,
-                         size_t length,
-                         const std::vector<base::string16>& suggestions,
-                         uint32_t hash)
-    : context(context),
-      location(location),
-      length(length),
-      suggestions(suggestions),
-      hash(hash),
-      timestamp(base::Time::Now()) {}
-
-Misspelling::Misspelling(const Misspelling& other) = default;
-
-Misspelling::~Misspelling() {}
-
-std::unique_ptr<base::DictionaryValue> SerializeMisspelling(
-    const Misspelling& misspelling) {
-  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
-  result->SetString(
-      "timestamp",
-      base::Int64ToString(static_cast<long>(misspelling.timestamp.ToJsTime())));
-  result->SetInteger("misspelledLength", misspelling.length);
-  result->SetInteger("misspelledStart", misspelling.location);
-  result->SetString("originalText", misspelling.context);
-  result->SetString("suggestionId", base::UintToString(misspelling.hash));
-  result->Set("suggestions",
-              BuildSuggestionsValue(misspelling.suggestions).release());
-  result->Set("userActions",
-              BuildUserActionValue(misspelling.action).release());
-  return result;
-}
-
-base::string16 GetMisspelledString(const Misspelling& misspelling) {
-  // Feedback sender does not create Misspelling objects for spellcheck results
-  // that are out-of-bounds of checked text length.
-  if (misspelling.location > misspelling.context.length())
-    return base::string16();
-  return misspelling.context.substr(misspelling.location, misspelling.length);
-}
-
-size_t ApproximateSerializedSize(const Misspelling& misspelling) {
-  // Estimated by eyeballing JSON overhead.
-  const size_t kNumberOfOverheadBytes = 180;
-  size_t result = misspelling.context.length() + kNumberOfOverheadBytes;
-  for (const base::string16& suggestion : misspelling.suggestions)
-    result += suggestion.size();
-  return result;
-}

diff --git a/components/spellcheck/browser/misspelling.h b/components/spellcheck/browser/misspelling.h
deleted file mode 100644
index 3ce5a63..0000000
--- a/components/spellcheck/browser/misspelling.h
+++ /dev/null

@@ -1,79 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// An object to store user feedback to a single spellcheck suggestion.
-//
-// Stores the spellcheck suggestion, its uint32_t hash identifier, and user's
-// feedback. The feedback is indirect, in the sense that we record user's
-// |action| instead of asking them how they feel about a spellcheck suggestion.
-// The object can serialize itself.
-
-#ifndef COMPONENTS_SPELLCHECK_BROWSER_MISSPELLING_H_
-#define COMPONENTS_SPELLCHECK_BROWSER_MISSPELLING_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <memory>
-#include <vector>
-
-#include "base/time/time.h"
-#include "components/spellcheck/browser/spellcheck_action.h"
-
-// Stores user feedback to a spellcheck suggestion. Sample usage:
-//    Misspelling misspelling.
-//    misspelling.context = base::ASCIIToUTF16("Helllo world");
-//    misspelling.location = 0;
-//    misspelling.length = 6;
-//    misspelling.suggestions =
-//        std::vector<base::string16>(1, base::ASCIIToUTF16("Hello"));
-//    misspelling.hash = GenerateRandomHash();
-//    misspelling.action.set_type(SpellcheckAction::TYPE_SELECT);
-//    misspelling.action.set_index(0);
-//    Process(SerializeMisspelling(misspelling));
-struct Misspelling {
-  Misspelling();
-  Misspelling(const base::string16& context,
-              size_t location,
-              size_t length,
-              const std::vector<base::string16>& suggestions,
-              uint32_t hash);
-  Misspelling(const Misspelling& other);
-  ~Misspelling();
-
-  // A several-word text snippet that immediately surrounds the misspelling.
-  base::string16 context;
-
-  // The number of characters between the beginning of |context| and the first
-  // misspelled character.
-  size_t location;
-
-  // The number of characters in the misspelling.
-  size_t length;
-
-  // Spelling suggestions.
-  std::vector<base::string16> suggestions;
-
-  // The hash that identifies the misspelling.
-  uint32_t hash;
-
-  // User action.
-  SpellcheckAction action;
-
-  // The time when the user applied the action.
-  base::Time timestamp;
-};
-
-// Serializes the data in this object into a dictionary value.
-std::unique_ptr<base::DictionaryValue> SerializeMisspelling(
-    const Misspelling& misspelling);
-
-// Returns the substring of |context| that begins at |location| and contains
-// |length| characters.
-base::string16 GetMisspelledString(const Misspelling& misspelling);
-
-// Returns the approximate size of the misspelling when serialized.
-size_t ApproximateSerializedSize(const Misspelling& misspelling);
-
-#endif  // COMPONENTS_SPELLCHECK_BROWSER_MISSPELLING_H_

diff --git a/components/spellcheck/browser/misspelling_unittest.cc b/components/spellcheck/browser/misspelling_unittest.cc
deleted file mode 100644
index ec0b8c2..0000000
--- a/components/spellcheck/browser/misspelling_unittest.cc
+++ /dev/null

@@ -1,53 +0,0 @@
-// Copyright (c) 2013 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.
-//
-// Unit tests for |Misspelling| object.
-
-#include "components/spellcheck/browser/misspelling.h"
-
-#include "base/json/json_reader.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-TEST(MisspellingTest, SerializeTest) {
-  Misspelling misspelling;
-  misspelling.context = base::ASCIIToUTF16("How doe sit know");
-  misspelling.location = 4;
-  misspelling.length = 7;
-  misspelling.timestamp = base::Time::FromJsTime(42);
-  misspelling.hash = 9001;
-  misspelling.suggestions.push_back(base::ASCIIToUTF16("does it"));
-
-  std::unique_ptr<base::Value> expected = base::JSONReader::Read(
-      "{\"originalText\": \"How doe sit know\","
-      "\"misspelledStart\": 4,"
-      "\"misspelledLength\": 7,"
-      "\"timestamp\": \"42\","
-      "\"suggestionId\":\"9001\","
-      "\"suggestions\": [\"does it\"],"
-      "\"userActions\": [{\"actionType\": \"PENDING\"}]}");
-
-  std::unique_ptr<base::DictionaryValue> serialized(
-      SerializeMisspelling(misspelling));
-  EXPECT_TRUE(serialized->Equals(expected.get()));
-}
-
-TEST(MisspellingTest, GetMisspelledStringTest) {
-  Misspelling misspelling;
-  misspelling.context = base::ASCIIToUTF16("How doe sit know");
-  misspelling.location = 4;
-  misspelling.length = 7;
-  EXPECT_EQ(base::ASCIIToUTF16("doe sit"), GetMisspelledString(misspelling));
-
-  misspelling.length = 0;
-  EXPECT_EQ(base::string16(), GetMisspelledString(misspelling));
-
-  misspelling.location = misspelling.context.length();
-  misspelling.length = 7;
-  EXPECT_EQ(base::string16(), GetMisspelledString(misspelling));
-
-  misspelling.location = misspelling.context.length() + 1;
-  EXPECT_EQ(base::string16(), GetMisspelledString(misspelling));
-}

diff --git a/components/spellcheck/browser/spellcheck_action.cc b/components/spellcheck/browser/spellcheck_action.cc
deleted file mode 100644
index f34001b8..0000000
--- a/components/spellcheck/browser/spellcheck_action.cc
+++ /dev/null

@@ -1,74 +0,0 @@
-// Copyright (c) 2013 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/spellcheck/browser/spellcheck_action.h"
-
-#include "base/logging.h"
-#include "base/values.h"
-
-SpellcheckAction::SpellcheckAction() : type_(TYPE_PENDING), index_(-1) {}
-
-SpellcheckAction::SpellcheckAction(SpellcheckActionType type,
-                                   int index,
-                                   base::string16 value)
-    : type_(type), index_(index), value_(value) {}
-
-SpellcheckAction::~SpellcheckAction() {}
-
-bool SpellcheckAction::IsFinal() const {
-  return type_ == TYPE_ADD_TO_DICT ||
-         type_ == TYPE_IGNORE ||
-         type_ == TYPE_IN_DICTIONARY ||
-         type_ == TYPE_MANUALLY_CORRECTED ||
-         type_ == TYPE_NO_ACTION ||
-         type_ == TYPE_SELECT;
-}
-
-void SpellcheckAction::Finalize() {
-  switch (type_) {
-    case TYPE_PENDING:
-      type_ = TYPE_NO_ACTION;
-      break;
-    case TYPE_PENDING_IGNORE:
-      type_ = TYPE_IGNORE;
-      break;
-    default:
-      DCHECK(IsFinal());
-      break;
-  }
-}
-
-std::unique_ptr<base::DictionaryValue> SpellcheckAction::Serialize() const {
-  std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
-  switch (type_) {
-    case TYPE_SELECT:
-      result->SetString("actionType", "SELECT");
-      result->SetInteger("actionTargetIndex", index_);
-      break;
-    case TYPE_ADD_TO_DICT:
-      result->SetString("actionType", "ADD_TO_DICT");
-      break;
-    case TYPE_IGNORE:
-      result->SetString("actionType", "IGNORE");
-      break;
-    case TYPE_IN_DICTIONARY:
-      result->SetString("actionType", "IN_DICTIONARY");
-      break;
-    case TYPE_NO_ACTION:
-      result->SetString("actionType", "NO_ACTION");
-      break;
-    case TYPE_MANUALLY_CORRECTED:
-      result->SetString("actionType", "MANUALLY_CORRECTED");
-      result->SetString("actionTargetValue", value_);
-      break;
-    case TYPE_PENDING:
-    case TYPE_PENDING_IGNORE:
-      result->SetString("actionType", "PENDING");
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  return result;
-}

diff --git a/components/spellcheck/browser/spellcheck_action.h b/components/spellcheck/browser/spellcheck_action.h
deleted file mode 100644
index 2320da6..0000000
--- a/components/spellcheck/browser/spellcheck_action.h
+++ /dev/null

@@ -1,83 +0,0 @@
-// Copyright (c) 2013 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_SPELLCHECK_BROWSER_SPELLCHECK_ACTION_H_
-#define COMPONENTS_SPELLCHECK_BROWSER_SPELLCHECK_ACTION_H_
-
-#include <memory>
-
-#include "base/strings/string16.h"
-
-namespace base {
-class DictionaryValue;
-}
-
-// User's action on a misspelled word.
-class SpellcheckAction {
- public:
-  // Type of spellcheck action.
-  enum SpellcheckActionType {
-    // User added the word to the dictionary and cannot take more actions on
-    // this misspelling.
-    TYPE_ADD_TO_DICT,
-    // User took a look at the suggestions in the context menu, but did not
-    // select any suggestions. The user cannot take any more actions on the
-    // misspelling, because it has been deleted from the web page.
-    TYPE_IGNORE,
-    // The misspelling is in user's custom spellcheck dictionary. The user will
-    // not see spellcheck suggestions for this misspelling.
-    TYPE_IN_DICTIONARY,
-    // The user manually corrected the word to |value|. The user cannot take
-    // more actions on this misspelling.
-    TYPE_MANUALLY_CORRECTED,
-    // The user has taken no action on the misspelling and will not take any
-    // more actions, because the misspelled text has been removed from the web
-    // page.
-    TYPE_NO_ACTION,
-    // The user has taken no action on the misspelled yet, but might take an
-    // action in the future, because the misspelling is still on the web page.
-    TYPE_PENDING,
-    // User took a look at the suggestions in the context menu, but did not
-    // select any suggestions. The user still can take further actions on the
-    // misspelling.
-    TYPE_PENDING_IGNORE,
-    // The user has selected the suggestion at |index| and cannot take more
-    // actions on this misspelling.
-    TYPE_SELECT,
-  };
-
-  SpellcheckAction();
-  SpellcheckAction(SpellcheckActionType type, int index, base::string16 value);
-  ~SpellcheckAction();
-
-  // Returns true if the action is final and should be sent to the feedback
-  // server. Otherwise returns false.
-  bool IsFinal() const;
-
-  // Makes this action final and ready to be sent to the feedback server. The
-  // method is idempotent. Finalizing an action that is already final does
-  // nothing.
-  void Finalize();
-
-  // Serializes the data in this object into a dictionary value.
-  std::unique_ptr<base::DictionaryValue> Serialize() const;
-
-  void set_type(SpellcheckActionType type) { type_ = type; }
-  void set_index(int index) { index_ = index; }
-  void set_value(const base::string16& value) { value_ = value; }
-
-  SpellcheckActionType type() const { return type_; }
-
- private:
-  // User action.
-  SpellcheckActionType type_;
-
-  // The index for the user action, if applicable.
-  int index_;
-
-  // The value for the user action, if applicable.
-  base::string16 value_;
-};
-
-#endif  // COMPONENTS_SPELLCHECK_BROWSER_SPELLCHECK_ACTION_H_

diff --git a/components/spellcheck/browser/spellcheck_action_unittest.cc b/components/spellcheck/browser/spellcheck_action_unittest.cc
deleted file mode 100644
index b5e031a..0000000
--- a/components/spellcheck/browser/spellcheck_action_unittest.cc
+++ /dev/null

@@ -1,100 +0,0 @@
-// Copyright (c) 2013 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/spellcheck/browser/spellcheck_action.h"
-
-#include <stddef.h>
-
-#include <memory>
-#include <string>
-
-#include "base/json/json_reader.h"
-#include "base/macros.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-TEST(SpellcheckActionTest, FinalActionsTest) {
-  static const SpellcheckAction::SpellcheckActionType kFinalActions[] = {
-    SpellcheckAction::TYPE_ADD_TO_DICT,
-    SpellcheckAction::TYPE_IGNORE,
-    SpellcheckAction::TYPE_IN_DICTIONARY,
-    SpellcheckAction::TYPE_MANUALLY_CORRECTED,
-    SpellcheckAction::TYPE_NO_ACTION,
-    SpellcheckAction::TYPE_SELECT,
-  };
-  SpellcheckAction action;
-  for (size_t i = 0; i < arraysize(kFinalActions); ++i) {
-    action.set_type(kFinalActions[i]);
-    ASSERT_TRUE(action.IsFinal());
-  }
-}
-
-TEST(SpellcheckActionTest, PendingActionsTest) {
-  static const SpellcheckAction::SpellcheckActionType kPendingActions[] = {
-    SpellcheckAction::TYPE_PENDING,
-    SpellcheckAction::TYPE_PENDING_IGNORE,
-  };
-  SpellcheckAction action;
-  for (size_t i = 0; i < arraysize(kPendingActions); ++i) {
-    action.set_type(kPendingActions[i]);
-    ASSERT_FALSE(action.IsFinal());
-  }
-}
-
-TEST(SpellcheckActionTest, FinalizeTest) {
-  SpellcheckAction action;
-  action.set_type(SpellcheckAction::TYPE_PENDING);
-  action.Finalize();
-  ASSERT_EQ(SpellcheckAction::TYPE_NO_ACTION, action.type());
-
-  action.set_type(SpellcheckAction::TYPE_PENDING_IGNORE);
-  action.Finalize();
-  ASSERT_EQ(SpellcheckAction::TYPE_IGNORE, action.type());
-}
-
-TEST(SpellcheckActionTest, SerializeTest) {
-  static const size_t kNumTestCases = 7;
-  static const struct {
-    SpellcheckAction action;
-    std::string expected;
-  } kTestCases[] = {
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_ADD_TO_DICT, -1,
-          base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"ADD_TO_DICT\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_IGNORE, -1, base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"IGNORE\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_IN_DICTIONARY, -1,
-          base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"IN_DICTIONARY\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_MANUALLY_CORRECTED, -1,
-          base::ASCIIToUTF16("hello")),
-      "{\"actionTargetValue\": \"hello\","
-      "\"actionType\": \"MANUALLY_CORRECTED\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_NO_ACTION, -1, base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"NO_ACTION\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_PENDING, -1, base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"PENDING\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_PENDING_IGNORE, -1,
-          base::ASCIIToUTF16("nothing")),
-      "{\"actionType\": \"PENDING\"}" },
-    { SpellcheckAction(
-          SpellcheckAction::TYPE_SELECT, 42, base::ASCIIToUTF16("nothing")),
-      "{\"actionTargetIndex\": 42, \"actionType\": \"SELECT\"}" },
-  };
-  for (size_t i = 0; i < kNumTestCases; ++i) {
-    std::unique_ptr<base::DictionaryValue> serialized(
-        kTestCases[i].action.Serialize());
-    std::unique_ptr<base::Value> expected =
-        base::JSONReader::Read(kTestCases[i].expected);
-    EXPECT_TRUE(serialized->Equals(expected.get()));
-  }
-}

diff --git a/components/spellcheck/browser/spellcheck_message_filter_platform.h b/components/spellcheck/browser/spellcheck_message_filter_platform.h
index 3acdcf05..ce4a28d 100644
--- a/components/spellcheck/browser/spellcheck_message_filter_platform.h
+++ b/components/spellcheck/browser/spellcheck_message_filter_platform.h

@@ -10,7 +10,6 @@
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "components/spellcheck/browser/spelling_service_client.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "content/public/browser/browser_message_filter.h"
 
@@ -47,8 +46,7 @@
   void OnUpdateSpellingPanelWithMisspelledWord(const base::string16& word);
   void OnRequestTextCheck(int route_id,
                           int identifier,
-                          const base::string16& text,
-                          std::vector<SpellCheckMarker> markers);
+                          const base::string16& text);
 
   int ToDocumentTag(int route_id);
   void RetireDocumentTag(int route_id);

diff --git a/components/spellcheck/browser/spellcheck_message_filter_platform_android.cc b/components/spellcheck/browser/spellcheck_message_filter_platform_android.cc
index ed3c41e..483bb7d 100644
--- a/components/spellcheck/browser/spellcheck_message_filter_platform_android.cc
+++ b/components/spellcheck/browser/spellcheck_message_filter_platform_android.cc

@@ -74,8 +74,7 @@
 void SpellCheckMessageFilterPlatform::OnRequestTextCheck(
     int route_id,
     int identifier,
-    const base::string16& text,
-    std::vector<SpellCheckMarker> markers) {
+    const base::string16& text) {
   DCHECK(!text.empty());
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 

diff --git a/components/spellcheck/browser/word_trimmer.cc b/components/spellcheck/browser/word_trimmer.cc
deleted file mode 100644
index 6e4da33..0000000
--- a/components/spellcheck/browser/word_trimmer.cc
+++ /dev/null

@@ -1,50 +0,0 @@
-// Copyright (c) 2011 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/spellcheck/browser/word_trimmer.h"
-
-#include <algorithm>
-#include <vector>
-
-#include "base/i18n/break_iterator.h"
-
-base::string16 TrimWords(size_t* start,
-                         size_t end,
-                         const base::string16& text,
-                         size_t keep) {
-  if (*start > text.length() || *start > end)
-    return text;
-  base::i18n::BreakIterator iter(text, base::i18n::BreakIterator::BREAK_WORD);
-  if (!iter.Init())
-    return text;
-  // A circular buffer of the last |keep + 1| words seen before position |start|
-  // in |text|.
-  std::vector<size_t> word_offset(keep + 1, 0);
-  size_t first = std::string::npos;
-  size_t last = std::string::npos;
-  while (iter.Advance()) {
-    if (iter.IsWord()) {
-      word_offset[keep] = iter.prev();
-      if ((*start >= iter.prev() && *start < iter.pos()) ||
-          (end > iter.prev() && end <= iter.pos())) {
-        if (first == std::string::npos)
-          first = word_offset[0];
-        last = iter.pos();
-      }
-      if (first == std::string::npos) {
-        std::rotate(word_offset.begin(),
-                    word_offset.begin() + 1,
-                    word_offset.end());
-      }
-      if (iter.prev() > end && keep) {
-        last = iter.pos();
-        keep--;
-      }
-    }
-  }
-  if (first == std::string::npos)
-    return text;
-  *start -= first;
-  return text.substr(first, last - first);
-}

diff --git a/components/spellcheck/browser/word_trimmer.h b/components/spellcheck/browser/word_trimmer.h
deleted file mode 100644
index 686034d..0000000
--- a/components/spellcheck/browser/word_trimmer.h
+++ /dev/null

@@ -1,34 +0,0 @@
-// Copyright (c) 2011 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_SPELLCHECK_BROWSER_WORD_TRIMMER_H_
-#define COMPONENTS_SPELLCHECK_BROWSER_WORD_TRIMMER_H_
-
-#include <stddef.h>
-
-#include "base/strings/string16.h"
-
-// Trims |text| to contain only the range from |start| to |end| and |keep| words
-// on either side of the range. The |start| and |end| parameters are character
-// indexes into |text|. The |keep| parameter is the number of words to keep on
-// either side of the |start|-|end| range. The function updates |start| in
-// accordance with the trimming.
-//
-// Example:
-//
-//  size_t start = 14;
-//  size_t end = 23;
-//  base::string16 text =
-//      base::ASCIIToUTF16("one two three four five six seven eight");
-//  int keep = 2;
-//  base::string16 trimmed = TrimWords(&start, end, text, keep);
-//  DCHECK(trimmed == base::ASCIIToUTF16("two three four five six seven"));
-//  DCHECK(start == 10);
-//
-base::string16 TrimWords(size_t* start,
-                         size_t end,
-                         const base::string16& text,
-                         size_t keep);
-
-#endif  // COMPONENTS_SPELLCHECK_BROWSER_WORD_TRIMMER_H_

diff --git a/components/spellcheck/browser/word_trimmer_unittest.cc b/components/spellcheck/browser/word_trimmer_unittest.cc
deleted file mode 100644
index 3930dd2..0000000
--- a/components/spellcheck/browser/word_trimmer_unittest.cc
+++ /dev/null

@@ -1,67 +0,0 @@
-// Copyright (c) 2011 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/spellcheck/browser/word_trimmer.h"
-
-#include <stddef.h>
-
-#include "base/strings/utf_string_conversions.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using base::ASCIIToUTF16;
-
-TEST(WordTrimmerTest, TrimWordsEmptyText) {
-  size_t start = 0;
-  size_t end = 0;
-  EXPECT_EQ(base::string16(), TrimWords(&start, end, base::string16(), 0));
-  EXPECT_EQ(0UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsStart) {
-  size_t start = 0;
-  size_t end = 3;
-  EXPECT_EQ(ASCIIToUTF16("one two three"),
-            TrimWords(&start, end, ASCIIToUTF16("one two three four"), 2));
-  EXPECT_EQ(0UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsEnd) {
-  size_t start = 14;
-  size_t end = 18;
-  EXPECT_EQ(ASCIIToUTF16("two three four"),
-            TrimWords(&start, end, ASCIIToUTF16("one two three four"), 2));
-  EXPECT_EQ(10UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsMiddle) {
-  size_t start = 14;
-  size_t end = 23;
-  EXPECT_EQ(ASCIIToUTF16("two three four five six seven"), TrimWords(
-      &start, end, ASCIIToUTF16("one two three four five six seven eight"), 2));
-  EXPECT_EQ(10UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsEmptyKeep) {
-  size_t start = 18;
-  size_t end = 18;
-  EXPECT_EQ(ASCIIToUTF16("two three four five six"), TrimWords(
-      &start, end, ASCIIToUTF16("one two three four five six seven eight"), 2));
-  EXPECT_EQ(14UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsOutOfBounds) {
-  size_t start = 4;
-  size_t end = 5;
-  EXPECT_EQ(ASCIIToUTF16("one"), TrimWords(
-      &start, end, ASCIIToUTF16("one"), 2));
-  EXPECT_EQ(4UL, start);
-}
-
-TEST(WordTrimmerTest, TrimWordsInvalid) {
-  size_t start = 23;
-  size_t end = 14;
-  EXPECT_EQ(ASCIIToUTF16("one two three four five six seven eight"), TrimWords(
-      &start, end, ASCIIToUTF16("one two three four five six seven eight"), 2));
-  EXPECT_EQ(23UL, start);
-}

diff --git a/components/spellcheck/common/BUILD.gn b/components/spellcheck/common/BUILD.gn
index 9062ff8..69d4d0c 100644
--- a/components/spellcheck/common/BUILD.gn
+++ b/components/spellcheck/common/BUILD.gn

@@ -9,7 +9,6 @@
     "spellcheck_common.h",
     "spellcheck_features.cc",
     "spellcheck_features.h",
-    "spellcheck_marker.h",
     "spellcheck_message_generator.cc",
     "spellcheck_message_generator.h",
     "spellcheck_messages.h",

diff --git a/components/spellcheck/common/spellcheck_common.h b/components/spellcheck/common/spellcheck_common.h
index 5b7e93f0..6c6f75c 100644
--- a/components/spellcheck/common/spellcheck_common.h
+++ b/components/spellcheck/common/spellcheck_common.h

@@ -16,17 +16,6 @@
 
 namespace spellcheck {
 
-// The number of hours that a session of feedback for spelling service lasts.
-// After this number of hours passes, all feedback.
-static const int kSessionHours = 6;
-
-// The number of context words to keep on either side of a misspelling for
-// spelling service feedback.
-static const int kContextWordCount = 2;
-
-// The number of seconds between sending feedback to spelling service.
-static const int kFeedbackIntervalSeconds = 1800;  // 30 minutes
-
 // Max number of dictionary suggestions.
 static const int kMaxSuggestions = 5;
 

diff --git a/components/spellcheck/common/spellcheck_marker.h b/components/spellcheck/common/spellcheck_marker.h
deleted file mode 100644
index c30803ee..0000000
--- a/components/spellcheck/common/spellcheck_marker.h
+++ /dev/null

@@ -1,39 +0,0 @@
-// Copyright (c) 2013 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_SPELLCHECK_COMMON_SPELLCHECK_MARKER_H_
-#define COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_MARKER_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-class SpellCheckMarker {
- public:
-  // A predicate to test spellcheck marker validity.
-  class IsValidPredicate {
-   public:
-    typedef SpellCheckMarker argument_type;
-    explicit IsValidPredicate(size_t text_length) : text_length_(text_length) {}
-    bool operator()(const SpellCheckMarker& marker) const {
-      return marker.offset < text_length_;
-    }
-
-   private:
-    size_t text_length_;
-  };
-
-  // IPC requires a default constructor.
-  SpellCheckMarker() : hash(0xFFFFFFFF), offset(UINT32_MAX) {}
-
-  SpellCheckMarker(uint32_t hash, uint32_t offset)
-      : hash(hash), offset(offset) {}
-
-  uint32_t hash;
-  // Note: we use uint32_t instead of size_t because this struct is sent over
-  // IPC which could span 32 & 64 bit processes. This is fine since the offset
-  // shouldn't exceed UINT32_MAX even on 64 bit builds.
-  uint32_t offset;
-};
-
-#endif  // COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_MARKER_H_

diff --git a/components/spellcheck/common/spellcheck_messages.h b/components/spellcheck/common/spellcheck_messages.h
index 60caa60..b31cf56 100644
--- a/components/spellcheck/common/spellcheck_messages.h
+++ b/components/spellcheck/common/spellcheck_messages.h

@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include "components/spellcheck/common/spellcheck_bdict_language.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "ipc/ipc_message_macros.h"
@@ -27,12 +26,6 @@
   IPC_STRUCT_TRAITS_MEMBER(location)
   IPC_STRUCT_TRAITS_MEMBER(length)
   IPC_STRUCT_TRAITS_MEMBER(replacement)
-  IPC_STRUCT_TRAITS_MEMBER(hash)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(SpellCheckMarker)
-  IPC_STRUCT_TRAITS_MEMBER(hash)
-  IPC_STRUCT_TRAITS_MEMBER(offset)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(SpellCheckBDictLanguage)
@@ -57,15 +50,6 @@
                      std::set<std::string> /* words_added */,
                      std::set<std::string> /* words_removed */)
 
-// Request a list of all document markers in the renderer for spelling service
-// feedback.
-IPC_MESSAGE_CONTROL0(SpellCheckMsg_RequestDocumentMarkers)
-
-// Send a list of document markers in the renderer to the spelling service
-// feedback sender.
-IPC_MESSAGE_CONTROL1(SpellCheckHostMsg_RespondDocumentMarkers,
-                     std::vector<uint32_t> /* document marker identifiers */)
-
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
 // Sends text-check results from the Spelling service when the service finishes
 // checking text received by a SpellCheckHostMsg_CallSpellingService message.
@@ -109,11 +93,10 @@
 // Asks the Spelling service to check text. When the service finishes checking
 // the input text, it sends a SpellingCheckMsg_RespondSpellingService with
 // text-check results.
-IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_CallSpellingService,
+IPC_MESSAGE_CONTROL3(SpellCheckHostMsg_CallSpellingService,
                      int /* route_id for response */,
                      int /* request identifier given by WebKit */,
-                     base::string16 /* sentence */,
-                     std::vector<SpellCheckMarker> /* markers */)
+                     base::string16 /* sentence */)
 #endif
 
 #if BUILDFLAG(USE_BROWSER_SPELLCHECKER)
@@ -135,11 +118,10 @@
                             base::string16 /* word */,
                             std::vector<base::string16> /* suggestions */)
 
-IPC_MESSAGE_CONTROL4(SpellCheckHostMsg_RequestTextCheck,
+IPC_MESSAGE_CONTROL3(SpellCheckHostMsg_RequestTextCheck,
                      int /* route_id for response */,
                      int /* request identifier given by WebKit */,
-                     base::string16 /* sentence */,
-                     std::vector<SpellCheckMarker> /* markers */)
+                     base::string16 /* sentence */)
 
 IPC_MESSAGE_ROUTED2(SpellCheckHostMsg_ToggleSpellCheck,
                     bool /* enabled */,

diff --git a/components/spellcheck/common/spellcheck_result.h b/components/spellcheck/common/spellcheck_result.h
index 61d193b..0c4fb45 100644
--- a/components/spellcheck/common/spellcheck_result.h
+++ b/components/spellcheck/common/spellcheck_result.h

@@ -20,24 +20,18 @@
     // Gray underline for correctly spelled words that are incorrectly used in
     // their context.
     GRAMMAR = 1 << 2,
-
-    // No underline for words that spellcheck needs to track. For example, a
-    // word in the custom spellcheck dictionary.
-    INVISIBLE = 1 << 3,
   };
 
   explicit SpellCheckResult(Decoration d = SPELLING,
                             int loc = 0,
                             int len = 0,
-                            const base::string16& rep = base::string16(),
-                            uint32_t h = 0)
-      : decoration(d), location(loc), length(len), replacement(rep), hash(h) {}
+                            const base::string16& rep = base::string16())
+      : decoration(d), location(loc), length(len), replacement(rep) {}
 
   Decoration decoration;
   int location;
   int length;
   base::string16 replacement;
-  uint32_t hash;
 };
 
 #endif  // COMPONENTS_SPELLCHECK_COMMON_SPELLCHECK_RESULT_H_

diff --git a/components/spellcheck/renderer/spellcheck.cc b/components/spellcheck/renderer/spellcheck.cc
index 2e3eed58..db53a8c 100644
--- a/components/spellcheck/renderer/spellcheck.cc
+++ b/components/spellcheck/renderer/spellcheck.cc

@@ -63,29 +63,6 @@
   return true;
 }
 
-class DocumentMarkersCollector : public content::RenderViewVisitor {
- public:
-  DocumentMarkersCollector() {}
-  ~DocumentMarkersCollector() override {}
-  const std::vector<uint32_t>& markers() const { return markers_; }
-  bool Visit(content::RenderView* render_view) override;
-
- private:
-  std::vector<uint32_t> markers_;
-  DISALLOW_COPY_AND_ASSIGN(DocumentMarkersCollector);
-};
-
-bool DocumentMarkersCollector::Visit(content::RenderView* render_view) {
-  if (!render_view || !render_view->GetWebView())
-    return true;
-  WebVector<uint32_t> markers;
-  render_view->GetWebView()->spellingMarkers(&markers);
-  for (size_t i = 0; i < markers.size(); ++i)
-    markers_.push_back(markers[i]);
-  // Visit all render views.
-  return true;
-}
-
 class DocumentMarkersRemover : public content::RenderViewVisitor {
  public:
   explicit DocumentMarkersRemover(const std::set<std::string>& words);
@@ -212,8 +189,6 @@
     IPC_MESSAGE_HANDLER(SpellCheckMsg_CustomDictionaryChanged,
                         OnCustomDictionaryChanged)
     IPC_MESSAGE_HANDLER(SpellCheckMsg_EnableSpellCheck, OnEnableSpellCheck)
-    IPC_MESSAGE_HANDLER(SpellCheckMsg_RequestDocumentMarkers,
-                        OnRequestDocumentMarkers)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -252,13 +227,6 @@
   content::RenderView::ForEach(&updater);
 }
 
-void SpellCheck::OnRequestDocumentMarkers() {
-  DocumentMarkersCollector collector;
-  content::RenderView::ForEach(&collector);
-  content::RenderThread::Get()->Send(
-      new SpellCheckHostMsg_RespondDocumentMarkers(collector.markers()));
-}
-
 // TODO(groby): Make sure we always have a spelling engine, even before
 // AddSpellcheckLanguage() is called.
 void SpellCheck::AddSpellcheckLanguage(base::File file,
@@ -526,7 +494,7 @@
     results.push_back(WebTextCheckingResult(
         static_cast<WebTextDecorationType>(decoration),
         line_offset + spellcheck_result.location, spellcheck_result.length,
-        blink::WebString::fromUTF16(replacement), spellcheck_result.hash));
+        blink::WebString::fromUTF16(replacement)));
   }
 
   textcheck_results->assign(results);

diff --git a/components/spellcheck/renderer/spellcheck.h b/components/spellcheck/renderer/spellcheck.h
index ad3ab17..4e85825 100644
--- a/components/spellcheck/renderer/spellcheck.h
+++ b/components/spellcheck/renderer/spellcheck.h

@@ -130,7 +130,6 @@
    void OnCustomDictionaryChanged(const std::set<std::string>& words_added,
                                   const std::set<std::string>& words_removed);
   void OnEnableSpellCheck(bool enable);
-  void OnRequestDocumentMarkers();
 
 #if !BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   // Posts delayed spellcheck task and clear it if any.

diff --git a/components/spellcheck/renderer/spellcheck_provider.cc b/components/spellcheck/renderer/spellcheck_provider.cc
index 8e7758bf..bddbfaa 100644
--- a/components/spellcheck/renderer/spellcheck_provider.cc
+++ b/components/spellcheck/renderer/spellcheck_provider.cc

@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "components/spellcheck/renderer/spellcheck.h"
@@ -34,8 +33,6 @@
               int(SpellCheckResult::SPELLING), "mismatching enums");
 static_assert(int(blink::WebTextDecorationTypeGrammar) ==
               int(SpellCheckResult::GRAMMAR), "mismatching enums");
-static_assert(int(blink::WebTextDecorationTypeInvisibleSpellcheck) ==
-              int(SpellCheckResult::INVISIBLE), "mismatching enums");
 
 SpellCheckProvider::SpellCheckProvider(
     content::RenderView* render_view,
@@ -56,8 +53,7 @@
 
 void SpellCheckProvider::RequestTextChecking(
     const base::string16& text,
-    WebTextCheckingCompletion* completion,
-    const std::vector<SpellCheckMarker>& markers) {
+    WebTextCheckingCompletion* completion) {
   // Ignore invalid requests.
   if (text.empty() || !HasWordCharacters(text, 0)) {
     completion->didCancelCheckingText();
@@ -79,16 +75,11 @@
   // over IPC or return an empty result if the checker is not
   // available.
   Send(new SpellCheckHostMsg_RequestTextCheck(
-      routing_id(),
-      text_check_completions_.Add(completion),
-      text,
-      markers));
+      routing_id(), text_check_completions_.Add(completion), text));
 #else
   Send(new SpellCheckHostMsg_CallSpellingService(
-      routing_id(),
-      text_check_completions_.Add(completion),
-      base::string16(text),
-      markers));
+      routing_id(), text_check_completions_.Add(completion),
+      base::string16(text)));
 #endif  // !USE_BROWSER_SPELLCHECKER
 }
 
@@ -150,15 +141,8 @@
 
 void SpellCheckProvider::requestCheckingOfText(
     const WebString& text,
-    const WebVector<uint32_t>& markers,
-    const WebVector<unsigned>& marker_offsets,
     WebTextCheckingCompletion* completion) {
-  std::vector<SpellCheckMarker> spellcheck_markers;
-  for (size_t i = 0; i < markers.size(); ++i) {
-    spellcheck_markers.push_back(
-        SpellCheckMarker(markers[i], marker_offsets[i]));
-  }
-  RequestTextChecking(text.utf16(), completion, spellcheck_markers);
+  RequestTextChecking(text.utf16(), completion);
   UMA_HISTOGRAM_COUNTS("SpellCheck.api.async", text.length());
 }
 
@@ -300,6 +284,8 @@
     const base::string16& text,
     WebTextCheckingCompletion* completion) {
   size_t last_length = last_request_.length();
+  if (!last_length)
+    return false;
 
   // Send back the |last_results_| if the |last_request_| is a substring of
   // |text| and |text| does not have more words to check. Provider cannot cancel
@@ -314,15 +300,8 @@
       completion->didFinishCheckingText(last_results_);
       return true;
     }
-    int code = 0;
-    int length = static_cast<int>(text_length);
-    U16_PREV(text.data(), 0, length, code);
-    UErrorCode error = U_ZERO_ERROR;
-    if (uscript_getScript(code, &error) != USCRIPT_COMMON) {
-      completion->didCancelCheckingText();
-      return true;
-    }
   }
+
   // Create a subset of the cached results and return it if the given text is a
   // substring of the cached text.
   if (text_length < last_length &&

diff --git a/components/spellcheck/renderer/spellcheck_provider.h b/components/spellcheck/renderer/spellcheck_provider.h
index fd849f4..24fa0219 100644
--- a/components/spellcheck/renderer/spellcheck_provider.h
+++ b/components/spellcheck/renderer/spellcheck_provider.h

@@ -19,7 +19,6 @@
 
 class RenderView;
 class SpellCheck;
-class SpellCheckMarker;
 struct SpellCheckResult;
 
 namespace blink {
@@ -42,11 +41,11 @@
   ~SpellCheckProvider() override;
 
   // Requests async spell and grammar checker to the platform text
-  // checker, which is available on the browser process.
-  void RequestTextChecking(
-      const base::string16& text,
-      blink::WebTextCheckingCompletion* completion,
-      const std::vector<SpellCheckMarker>& markers);
+  // checker, which is available on the browser process. The function does not
+  // have special handling for partial words, as Blink guarantees that no
+  // request is made when typing in the middle of a word.
+  void RequestTextChecking(const base::string16& text,
+                           blink::WebTextCheckingCompletion* completion);
 
   // The number of ongoing IPC requests.
   size_t pending_text_request_size() const {
@@ -84,8 +83,6 @@
 
   void requestCheckingOfText(
       const blink::WebString& text,
-      const blink::WebVector<uint32_t>& markers,
-      const blink::WebVector<unsigned>& marker_offsets,
       blink::WebTextCheckingCompletion* completion) override;
 
   void cancelAllPendingRequests() override;

diff --git a/components/spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc b/components/spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc
index 3ada8e9..34ab0a6 100644
--- a/components/spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc
+++ b/components/spellcheck/renderer/spellcheck_provider_hunspell_unittest.cc

@@ -6,7 +6,6 @@
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/renderer/spellcheck_provider_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -20,8 +19,7 @@
 
 TEST_F(SpellCheckProviderTest, UsingHunspell) {
   FakeTextCheckingCompletion completion;
-  provider_.RequestTextChecking(ASCIIToUTF16("hello"), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(ASCIIToUTF16("hello"), &completion);
   EXPECT_EQ(completion.completion_count_, 1U);
   EXPECT_EQ(provider_.messages_.size(), 0U);
   EXPECT_EQ(provider_.pending_text_request_size(), 0U);
@@ -35,50 +33,40 @@
 
   // Verify that the SpellCheckProvider class does not spellcheck empty text.
   provider_.ResetResult();
-  provider_.RequestTextChecking(base::string16(), &completion,
-                                std::vector<SpellCheckMarker>());
-  EXPECT_TRUE(provider_.text_.empty());
-
-  // Verify that the SpellCheckProvider class does not spellcheck text while we
-  // are typing a word.
-  provider_.ResetResult();
-  provider_.RequestTextChecking(ASCIIToUTF16("First"), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(base::string16(), &completion);
   EXPECT_TRUE(provider_.text_.empty());
 
   // Verify that the SpellCheckProvider class spellcheck the first word when we
-  // type a space key, i.e. when we finish typing a word.
+  // stop typing after finishing the first word.
   provider_.ResetResult();
-  provider_.RequestTextChecking(ASCIIToUTF16("First "), &completion,
-                                std::vector<SpellCheckMarker>());
-  EXPECT_EQ(ASCIIToUTF16("First "), provider_.text_);
+  provider_.RequestTextChecking(ASCIIToUTF16("First"), &completion);
+  EXPECT_EQ(ASCIIToUTF16("First"), provider_.text_);
 
   // Verify that the SpellCheckProvider class spellcheck the first line when we
   // type a return key, i.e. when we finish typing a line.
   provider_.ResetResult();
-  provider_.RequestTextChecking(ASCIIToUTF16("First Second\n"), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(ASCIIToUTF16("First Second\n"), &completion);
   EXPECT_EQ(ASCIIToUTF16("First Second\n"), provider_.text_);
 
   // Verify that the SpellCheckProvider class spellcheck the lines when we
   // finish typing a word "Third" to the second line.
   provider_.ResetResult();
   provider_.RequestTextChecking(ASCIIToUTF16("First Second\nThird "),
-                                &completion, std::vector<SpellCheckMarker>());
+                                &completion);
   EXPECT_EQ(ASCIIToUTF16("First Second\nThird "), provider_.text_);
 
   // Verify that the SpellCheckProvider class does not send a spellcheck request
   // when a user inserts whitespace characters.
   provider_.ResetResult();
   provider_.RequestTextChecking(ASCIIToUTF16("First Second\nThird   "),
-                                &completion, std::vector<SpellCheckMarker>());
+                                &completion);
   EXPECT_TRUE(provider_.text_.empty());
 
   // Verify that the SpellCheckProvider class spellcheck the lines when we type
   // a period.
   provider_.ResetResult();
   provider_.RequestTextChecking(ASCIIToUTF16("First Second\nThird   Fourth."),
-                                &completion, std::vector<SpellCheckMarker>());
+                                &completion);
   EXPECT_EQ(ASCIIToUTF16("First Second\nThird   Fourth."), provider_.text_);
 }
 
@@ -86,24 +74,21 @@
 // spelling service when not necessary.
 TEST_F(SpellCheckProviderTest, CancelUnnecessaryRequests) {
   FakeTextCheckingCompletion completion;
-  provider_.RequestTextChecking(ASCIIToUTF16("hello."), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(ASCIIToUTF16("hello."), &completion);
   EXPECT_EQ(completion.completion_count_, 1U);
   EXPECT_EQ(completion.cancellation_count_, 0U);
   EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
 
   // Test that the SpellCheckProvider does not send a request with the same text
   // as above.
-  provider_.RequestTextChecking(ASCIIToUTF16("hello."), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(ASCIIToUTF16("hello."), &completion);
   EXPECT_EQ(completion.completion_count_, 2U);
   EXPECT_EQ(completion.cancellation_count_, 0U);
   EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
 
   // Test that the SpellCheckProvider class cancels an incoming request that
   // does not include any words.
-  provider_.RequestTextChecking(ASCIIToUTF16(":-)"), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(ASCIIToUTF16(":-)"), &completion);
   EXPECT_EQ(completion.completion_count_, 3U);
   EXPECT_EQ(completion.cancellation_count_, 1U);
   EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
@@ -111,8 +96,7 @@
   // Test that the SpellCheckProvider class sends a request when it receives a
   // Russian word.
   const wchar_t kRussianWord[] = L"\x0431\x0451\x0434\x0440\x0430";
-  provider_.RequestTextChecking(WideToUTF16(kRussianWord), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(WideToUTF16(kRussianWord), &completion);
   EXPECT_EQ(completion.completion_count_, 4U);
   EXPECT_EQ(completion.cancellation_count_, 1U);
   EXPECT_EQ(provider_.spelling_service_call_count_, 2U);
@@ -124,45 +108,19 @@
   FakeTextCheckingCompletion completion;
 
   base::string16 text = ASCIIToUTF16("Icland is an icland ");
-  provider_.RequestTextChecking(text, &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(text, &completion);
   EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
                                                 << text << "\"";
 
   const int kSubstringLength = 18;
   base::string16 substring = text.substr(0, kSubstringLength);
-  provider_.RequestTextChecking(substring, &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(substring, &completion);
   EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
                                                 << substring << "\"";
 
-  provider_.RequestTextChecking(text, &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(text, &completion);
   EXPECT_EQ(0U, completion.cancellation_count_) << "Should finish checking \""
                                                 << text << "\"";
 }
 
-// Tests that the SpellCheckProvider cancels spelling requests in the middle of
-// a word.
-TEST_F(SpellCheckProviderTest, CancelMidWordRequests) {
-  FakeTextCheckingCompletion completion;
-  provider_.RequestTextChecking(ASCIIToUTF16("hello "), &completion,
-                                std::vector<SpellCheckMarker>());
-  EXPECT_EQ(completion.completion_count_, 1U);
-  EXPECT_EQ(completion.cancellation_count_, 0U);
-  EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
-
-  provider_.RequestTextChecking(ASCIIToUTF16("hello world"), &completion,
-                                std::vector<SpellCheckMarker>());
-  EXPECT_EQ(completion.completion_count_, 2U);
-  EXPECT_EQ(completion.cancellation_count_, 1U);
-  EXPECT_EQ(provider_.spelling_service_call_count_, 1U);
-
-  provider_.RequestTextChecking(ASCIIToUTF16("hello world."), &completion,
-                                std::vector<SpellCheckMarker>());
-  EXPECT_EQ(completion.completion_count_, 3U);
-  EXPECT_EQ(completion.cancellation_count_, 1U);
-  EXPECT_EQ(provider_.spelling_service_call_count_, 2U);
-}
-
 }  // namespace

diff --git a/components/spellcheck/renderer/spellcheck_provider_mac_unittest.cc b/components/spellcheck/renderer/spellcheck_provider_mac_unittest.cc
index 221c182..44d0f11 100644
--- a/components/spellcheck/renderer/spellcheck_provider_mac_unittest.cc
+++ b/components/spellcheck/renderer/spellcheck_provider_mac_unittest.cc

@@ -6,7 +6,6 @@
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/common/spellcheck_result.h"
 #include "components/spellcheck/renderer/spellcheck_provider_test.h"
@@ -32,8 +31,7 @@
 TEST_F(SpellCheckProviderMacTest, SingleRoundtripSuccess) {
   FakeTextCheckingCompletion completion;
 
-  provider_.RequestTextChecking(base::ASCIIToUTF16("hello "), &completion,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(base::ASCIIToUTF16("hello "), &completion);
   EXPECT_EQ(completion.completion_count_, 0U);
   EXPECT_EQ(provider_.messages_.size(), 1U);
   EXPECT_EQ(provider_.pending_text_request_size(), 1U);
@@ -51,11 +49,9 @@
 
 TEST_F(SpellCheckProviderMacTest, TwoRoundtripSuccess) {
   FakeTextCheckingCompletion completion1;
-  provider_.RequestTextChecking(base::ASCIIToUTF16("hello "), &completion1,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(base::ASCIIToUTF16("hello "), &completion1);
   FakeTextCheckingCompletion completion2;
-  provider_.RequestTextChecking(base::ASCIIToUTF16("bye "), &completion2,
-                                std::vector<SpellCheckMarker>());
+  provider_.RequestTextChecking(base::ASCIIToUTF16("bye "), &completion2);
 
   EXPECT_EQ(completion1.completion_count_, 0U);
   EXPECT_EQ(completion2.completion_count_, 0U);

diff --git a/components/spellcheck/renderer/spellcheck_provider_test.cc b/components/spellcheck/renderer/spellcheck_provider_test.cc
index c8b27ee3..963e112c 100644
--- a/components/spellcheck/renderer/spellcheck_provider_test.cc
+++ b/components/spellcheck/renderer/spellcheck_provider_test.cc

@@ -6,7 +6,6 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
-#include "components/spellcheck/common/spellcheck_marker.h"
 #include "components/spellcheck/common/spellcheck_messages.h"
 #include "components/spellcheck/renderer/spellcheck.h"
 #include "components/spellcheck/spellcheck_build_features.h"
@@ -67,10 +66,10 @@
   return true;
 }
 
-void TestingSpellCheckProvider::OnCallSpellingService(int route_id,
-                           int identifier,
-                           const base::string16& text,
-                           const std::vector<SpellCheckMarker>& markers) {
+void TestingSpellCheckProvider::OnCallSpellingService(
+    int route_id,
+    int identifier,
+    const base::string16& text) {
 #if BUILDFLAG(USE_BROWSER_SPELLCHECKER)
   NOTREACHED();
 #else
@@ -112,4 +111,3 @@
 
 SpellCheckProviderTest::SpellCheckProviderTest() {}
 SpellCheckProviderTest::~SpellCheckProviderTest() {}
-

diff --git a/components/spellcheck/renderer/spellcheck_provider_test.h b/components/spellcheck/renderer/spellcheck_provider_test.h
index 9cb2a76..43d73db 100644
--- a/components/spellcheck/renderer/spellcheck_provider_test.h
+++ b/components/spellcheck/renderer/spellcheck_provider_test.h

@@ -45,8 +45,7 @@
   bool Send(IPC::Message* message) override;
   void OnCallSpellingService(int route_id,
                              int identifier,
-                             const base::string16& text,
-                             const std::vector<SpellCheckMarker>& markers);
+                             const base::string16& text);
   void ResetResult();
 
   void SetLastResults(

diff --git a/components/sync/engine_impl/syncer.cc b/components/sync/engine_impl/syncer.cc
index 76b7da3..5d28f4a9 100644
--- a/components/sync/engine_impl/syncer.cc
+++ b/components/sync/engine_impl/syncer.cc

@@ -82,6 +82,14 @@
   VLOG(1) << "Configuring types " << ModelTypeSetToString(request_types);
   HandleCycleBegin(cycle);
   ConfigureGetUpdatesDelegate configure_delegate(source);
+
+  // It is possible during shutdown that datatypes get unregistered from
+  // ModelTypeRegistry before scheduled configure sync cycle gets executed.
+  // When it happens we should adjust set of types to download to only include
+  // registered types.
+  if (cancelation_signal_->IsSignalled())
+    request_types.RetainAll(cycle->context()->GetEnabledTypes());
+
   GetUpdatesProcessor get_updates_processor(
       cycle->context()->model_type_registry()->update_handler_map(),
       configure_delegate);

diff --git a/components/sync/engine_impl/syncer_unittest.cc b/components/sync/engine_impl/syncer_unittest.cc
index a66b784..ca131a0e 100644
--- a/components/sync/engine_impl/syncer_unittest.cc
+++ b/components/sync/engine_impl/syncer_unittest.cc

@@ -251,10 +251,13 @@
   }
 
   bool SyncShareConfigure() {
+    return SyncShareConfigureTypes(context_->GetEnabledTypes());
+  }
+
+  bool SyncShareConfigureTypes(ModelTypeSet types) {
     ResetCycle();
     return syncer_->ConfigureSyncShare(
-        context_->GetEnabledTypes(),
-        sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, cycle_.get());
+        types, sync_pb::GetUpdatesCallerInfo::RECONFIGURATION, cycle_.get());
   }
 
   void SetUp() override {
@@ -5019,6 +5022,19 @@
   mock_server_->ClearUpdatesQueue();
 }
 
+// Tests that, after shutdown initiated, if set of types to download includes
+// unregistered type, DCHECK doesn't get triggered.
+TEST_F(SyncerTest, ConfigureUnregisteredTypesDuringShutdown) {
+  // Signal that shutdown is initiated.
+  cancelation_signal_.Signal();
+
+  // Simulate type being unregistered before configuration by including type
+  // that isn't registered with ModelTypeRegistry.
+  SyncShareConfigureTypes(ModelTypeSet(APPS));
+
+  // No explicit verification, DCHECK shouldn't have been triggered.
+}
+
 TEST_F(SyncerTest, GetKeySuccess) {
   {
     syncable::ReadTransaction rtrans(FROM_HERE, directory());

diff --git a/components/tracing/common/process_metrics_memory_dump_provider.cc b/components/tracing/common/process_metrics_memory_dump_provider.cc
index 9bfe0a4..e181786 100644
--- a/components/tracing/common/process_metrics_memory_dump_provider.cc
+++ b/components/tracing/common/process_metrics_memory_dump_provider.cc

@@ -38,6 +38,15 @@
 #include "base/numerics/safe_math.h"
 #endif  // defined(OS_MACOSX)
 
+#if defined(OS_WIN)
+#include <psapi.h>
+#include <tchar.h>
+#include <windows.h>
+
+#include <base/strings/sys_string_conversions.h>
+#include <base/win/win_util.h>
+#endif  // defined(OS_WIN)
+
 namespace tracing {
 
 namespace {
@@ -233,6 +242,37 @@
 }
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
+#if defined(OS_WIN)
+bool ProcessMetricsMemoryDumpProvider::DumpProcessMemoryMaps(
+    const base::trace_event::MemoryDumpArgs& args,
+    base::trace_event::ProcessMemoryDump* pmd) {
+  std::vector<HMODULE> modules;
+  if (!base::win::GetLoadedModulesSnapshot(::GetCurrentProcess(), &modules))
+    return false;
+
+  // Query the base address for each module, and attach it to the dump.
+  for (size_t i = 0; i < modules.size(); ++i) {
+    wchar_t module_name[MAX_PATH];
+    if (!::GetModuleFileName(modules[i], module_name, MAX_PATH))
+      continue;
+
+    MODULEINFO module_info;
+    if (!::GetModuleInformation(::GetCurrentProcess(), modules[i],
+                                &module_info, sizeof(MODULEINFO))) {
+      continue;
+    }
+    base::trace_event::ProcessMemoryMaps::VMRegion region;
+    region.size_in_bytes = module_info.SizeOfImage;
+    region.mapped_file = base::SysWideToNativeMB(module_name);
+    region.start_address = reinterpret_cast<uint64_t>(module_info.lpBaseOfDll);
+    pmd->process_mmaps()->AddVMRegion(region);
+  }
+  if (!pmd->process_mmaps()->vm_regions().empty())
+    pmd->set_has_process_mmaps();
+  return true;
+}
+#endif  // defined(OS_WIN)
+
 #if defined(OS_MACOSX)
 
 namespace {
@@ -547,11 +587,9 @@
     base::trace_event::ProcessMemoryDump* pmd) {
   bool res = DumpProcessTotals(args, pmd);
 
-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
   if (args.level_of_detail ==
       base::trace_event::MemoryDumpLevelOfDetail::DETAILED)
     res &= DumpProcessMemoryMaps(args, pmd);
-#endif  // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
   return res;
 }
 

diff --git a/components/tracing/common/process_metrics_memory_dump_provider.h b/components/tracing/common/process_metrics_memory_dump_provider.h
index ec1a9d6..6534f18 100644
--- a/components/tracing/common/process_metrics_memory_dump_provider.h
+++ b/components/tracing/common/process_metrics_memory_dump_provider.h

@@ -48,7 +48,10 @@
                            TestMachOReading);
   FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
                            NoDuplicateRegions);
-#endif  // defined(OS_MACOSX)
+#elif defined(OS_WIN)
+  FRIEND_TEST_ALL_PREFIXES(ProcessMetricsMemoryDumpProviderTest,
+                           TestWinModuleReading);
+#endif
 
   ProcessMetricsMemoryDumpProvider(base::ProcessId process);
 

diff --git a/components/tracing/common/process_metrics_memory_dump_provider_unittest.cc b/components/tracing/common/process_metrics_memory_dump_provider_unittest.cc
index d05c3a7..95a565d 100644
--- a/components/tracing/common/process_metrics_memory_dump_provider_unittest.cc
+++ b/components/tracing/common/process_metrics_memory_dump_provider_unittest.cc

@@ -22,6 +22,10 @@
 #include <mach-o/dyld.h>
 #endif
 
+#if defined(OS_WIN)
+#include <base/strings/sys_string_conversions.h>
+#endif
+
 namespace tracing {
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
@@ -274,6 +278,56 @@
 #endif
 }
 
+#if defined(OS_WIN)
+
+void DummyFunction() {}
+
+TEST(ProcessMetricsMemoryDumpProviderTest, TestWinModuleReading) {
+  using VMRegion = base::trace_event::ProcessMemoryMaps::VMRegion;
+
+  ProcessMetricsMemoryDumpProvider mdp(base::kNullProcessId);
+  base::trace_event::MemoryDumpArgs args;
+  base::trace_event::ProcessMemoryDump dump(nullptr, args);
+  ASSERT_TRUE(mdp.DumpProcessMemoryMaps(args, &dump));
+  ASSERT_TRUE(dump.has_process_mmaps());
+
+  wchar_t module_name[MAX_PATH];
+  DWORD result = GetModuleFileName(nullptr, module_name, MAX_PATH);
+  ASSERT_TRUE(result);
+  std::string executable_name = base::SysWideToNativeMB(module_name);
+
+  HMODULE module_containing_dummy = nullptr;
+  uintptr_t dummy_function_address =
+      reinterpret_cast<uintptr_t>(&DummyFunction);
+  result = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
+                             reinterpret_cast<LPCWSTR>(dummy_function_address),
+                             &module_containing_dummy);
+  ASSERT_TRUE(result);
+  result = GetModuleFileName(nullptr, module_name, MAX_PATH);
+  ASSERT_TRUE(result);
+  std::string module_containing_dummy_name =
+      base::SysWideToNativeMB(module_name);
+
+  bool found_executable = false;
+  bool found_region_with_dummy = false;
+  for (const VMRegion& region : dump.process_mmaps()->vm_regions()) {
+    EXPECT_NE(0u, region.start_address);
+    EXPECT_NE(0u, region.size_in_bytes);
+
+    if (region.mapped_file.find(executable_name) != std::string::npos)
+      found_executable = true;
+
+    if (dummy_function_address >= region.start_address &&
+        dummy_function_address < region.start_address + region.size_in_bytes) {
+      found_region_with_dummy = true;
+      EXPECT_EQ(module_containing_dummy_name, region.mapped_file);
+    }
+  }
+  EXPECT_TRUE(found_executable);
+  EXPECT_TRUE(found_region_with_dummy);
+}
+#endif
+
 #if defined(OS_MACOSX)
 TEST(ProcessMetricsMemoryDumpProviderTest, TestMachOReading) {
   using VMRegion = base::trace_event::ProcessMemoryMaps::VMRegion;

diff --git a/components/wallpaper/BUILD.gn b/components/wallpaper/BUILD.gn
index cfb688a88..84f4d14 100644
--- a/components/wallpaper/BUILD.gn
+++ b/components/wallpaper/BUILD.gn

@@ -4,6 +4,9 @@
 
 component("wallpaper") {
   sources = [
+    "wallpaper_color_calculator.cc",
+    "wallpaper_color_calculator.h",
+    "wallpaper_color_calculator_observer.h",
     "wallpaper_files_id.cc",
     "wallpaper_files_id.h",
     "wallpaper_layout.h",
@@ -39,6 +42,7 @@
 source_set("unit_tests") {
   testonly = true
   sources = [
+    "wallpaper_color_calculator_unittest.cc",
     "wallpaper_resizer_unittest.cc",
   ]
 

diff --git a/components/wallpaper/wallpaper_color_calculator.cc b/components/wallpaper/wallpaper_color_calculator.cc
new file mode 100644
index 0000000..0096d5d
--- /dev/null
+++ b/components/wallpaper/wallpaper_color_calculator.cc

@@ -0,0 +1,77 @@
+// Copyright 2017 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/wallpaper/wallpaper_color_calculator.h"
+
+#include <string>
+#include <utility>
+
+#include "base/bind.h"
+#include "base/metrics/histogram_macros.h"
+#include "base/task_runner.h"
+#include "base/task_runner_util.h"
+
+namespace wallpaper {
+
+WallpaperColorCalculator::WallpaperColorCalculator(
+    const gfx::ImageSkia& image,
+    color_utils::LumaRange luma,
+    color_utils::SaturationRange saturation,
+    scoped_refptr<base::TaskRunner> task_runner)
+    : image_(image),
+      luma_(luma),
+      saturation_(saturation),
+      task_runner_(std::move(task_runner)),
+      weak_ptr_factory_(this) {}
+
+WallpaperColorCalculator::~WallpaperColorCalculator() {}
+
+void WallpaperColorCalculator::AddObserver(
+    WallpaperColorCalculatorObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void WallpaperColorCalculator::RemoveObserver(
+    WallpaperColorCalculatorObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+bool WallpaperColorCalculator::StartCalculation() {
+  start_calculation_time_ = base::Time::Now();
+
+  image_.MakeThreadSafe();
+  if (base::PostTaskAndReplyWithResult(
+          task_runner_.get(), FROM_HERE,
+          base::Bind(&color_utils::CalculateProminentColorOfBitmap,
+                     *image_.bitmap(), luma_, saturation_),
+          base::Bind(&WallpaperColorCalculator::NotifyCalculationComplete,
+                     weak_ptr_factory_.GetWeakPtr()))) {
+    return true;
+  }
+
+  LOG(WARNING) << "PostSequencedWorkerTask failed. "
+               << "Wallpaper promiment color may not be calculated.";
+
+  prominent_color_ = SK_ColorTRANSPARENT;
+  return false;
+}
+
+void WallpaperColorCalculator::SetTaskRunnerForTest(
+    scoped_refptr<base::TaskRunner> task_runner) {
+  task_runner_ = task_runner;
+}
+
+void WallpaperColorCalculator::NotifyCalculationComplete(
+    SkColor prominent_color) {
+  UMA_HISTOGRAM_MEDIUM_TIMES("Ash.Wallpaper.TimeSpentExtractingColors",
+                             base::Time::Now() - start_calculation_time_);
+
+  prominent_color_ = prominent_color;
+  for (auto& observer : observers_)
+    observer.OnColorCalculationComplete();
+
+  // This could be deleted!
+}
+
+}  // namespace wallpaper

diff --git a/components/wallpaper/wallpaper_color_calculator.h b/components/wallpaper/wallpaper_color_calculator.h
new file mode 100644
index 0000000..efad64b
--- /dev/null
+++ b/components/wallpaper/wallpaper_color_calculator.h

@@ -0,0 +1,87 @@
+// Copyright 2017 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_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_H_
+#define COMPONENTS_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_H_
+
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
+#include "base/time/time.h"
+#include "components/wallpaper/wallpaper_color_calculator_observer.h"
+#include "components/wallpaper/wallpaper_export.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/color_analysis.h"
+#include "ui/gfx/image/image_skia.h"
+
+namespace base {
+class TaskRunner;
+}
+
+namespace wallpaper {
+class WallpaperColorCalculatorObserver;
+
+// Asynchronously calculates colors based on a wallpaper image.
+class WALLPAPER_EXPORT WallpaperColorCalculator {
+ public:
+  // |image|, |luma| and |saturation| are the input parameters to the color
+  // calculation that is executed on the |task_runner|.
+  WallpaperColorCalculator(const gfx::ImageSkia& image,
+                           color_utils::LumaRange luma,
+                           color_utils::SaturationRange saturation,
+                           scoped_refptr<base::TaskRunner> task_runner);
+  ~WallpaperColorCalculator();
+
+  void AddObserver(WallpaperColorCalculatorObserver* observer);
+
+  void RemoveObserver(WallpaperColorCalculatorObserver* observer);
+
+  // Initiates the calculation and returns false if the calculation fails to be
+  // initiated.  Callers should be aware that this will make |image_| read-only.
+  bool StartCalculation() WARN_UNUSED_RESULT;
+
+  SkColor prominent_color() const { return prominent_color_; }
+
+  void set_prominent_color_for_test(SkColor prominent_color) {
+    prominent_color_ = prominent_color;
+  }
+
+  // Explicitly sets the |task_runner_| for testing.
+  void SetTaskRunnerForTest(scoped_refptr<base::TaskRunner> task_runner);
+
+ private:
+  // Notifies observers that a color calulation has completed. Called on the
+  // same thread that constructed |this|.
+  void NotifyCalculationComplete(SkColor prominent_color);
+
+  // The result of the color calculation.
+  SkColor prominent_color_ = SK_ColorTRANSPARENT;
+
+  // The image to calculate colors from.
+  gfx::ImageSkia image_;
+
+  // Input for the color calculation.
+  color_utils::LumaRange luma_;
+
+  // Input for the color calculation.
+  color_utils::SaturationRange saturation_;
+
+  // The task runner to run the calculation on.
+  scoped_refptr<base::TaskRunner> task_runner_;
+
+  // The time that StartCalculation() was last called. Used for recording
+  // timing metrics.
+  base::Time start_calculation_time_;
+
+  base::ObserverList<WallpaperColorCalculatorObserver> observers_;
+
+  base::WeakPtrFactory<WallpaperColorCalculator> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(WallpaperColorCalculator);
+};
+
+}  // namespace wallpaper
+
+#endif  // COMPONENTS_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_H_

diff --git a/components/wallpaper/wallpaper_color_calculator_observer.h b/components/wallpaper/wallpaper_color_calculator_observer.h
new file mode 100644
index 0000000..45a701d
--- /dev/null
+++ b/components/wallpaper/wallpaper_color_calculator_observer.h

@@ -0,0 +1,24 @@
+// Copyright 2017 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_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_OBSERVER_H_
+#define COMPONENTS_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_OBSERVER_H_
+
+#include "components/wallpaper/wallpaper_export.h"
+
+namespace wallpaper {
+
+// Observer for the WallpaperColorCalculator.
+class WALLPAPER_EXPORT WallpaperColorCalculatorObserver {
+ public:
+  // Notified when a color calculation completes.
+  virtual void OnColorCalculationComplete() = 0;
+
+ protected:
+  virtual ~WallpaperColorCalculatorObserver() {}
+};
+
+}  // namespace wallpaper
+
+#endif  // COMPONENTS_WALLPAPER_WALLPAPER_COLOR_CALCULATOR_OBSERVER_H_

diff --git a/components/wallpaper/wallpaper_color_calculator_unittest.cc b/components/wallpaper/wallpaper_color_calculator_unittest.cc
new file mode 100644
index 0000000..bc65acf
--- /dev/null
+++ b/components/wallpaper/wallpaper_color_calculator_unittest.cc

@@ -0,0 +1,147 @@
+// Copyright 2017 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/wallpaper/wallpaper_color_calculator.h"
+
+#include <memory>
+
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/test/null_task_runner.h"
+#include "base/test/test_mock_time_task_runner.h"
+#include "base/threading/sequenced_task_runner_handle.h"
+#include "components/wallpaper/wallpaper_color_calculator_observer.h"
+#include "skia/ext/platform_canvas.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_analysis.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gfx/image/image_skia.h"
+
+namespace wallpaper {
+namespace {
+
+const SkColor kDefaultColor = SK_ColorTRANSPARENT;
+
+class TestWallpaperColorCalculatorObserver
+    : public WallpaperColorCalculatorObserver {
+ public:
+  TestWallpaperColorCalculatorObserver() {}
+
+  ~TestWallpaperColorCalculatorObserver() override {}
+
+  bool WasNotified() const { return notified_; }
+
+  // WallpaperColorCalculatorObserver:
+  void OnColorCalculationComplete() override { notified_ = true; }
+
+ private:
+  bool notified_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(TestWallpaperColorCalculatorObserver);
+};
+
+}  // namespace
+
+class WallPaperColorCalculatorTest : public testing::Test {
+ public:
+  WallPaperColorCalculatorTest();
+  ~WallPaperColorCalculatorTest() override;
+
+ protected:
+  void InstallTaskRunner(scoped_refptr<base::SequencedTaskRunner> task_runner);
+
+  gfx::ImageSkia image_;
+
+  std::unique_ptr<WallpaperColorCalculator> calculator_;
+
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
+
+  TestWallpaperColorCalculatorObserver observer_;
+
+ private:
+  // Required by PostTaskAndReplyImpl.
+  std::unique_ptr<base::SequencedTaskRunnerHandle> task_runner_handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(WallPaperColorCalculatorTest);
+};
+
+WallPaperColorCalculatorTest::WallPaperColorCalculatorTest()
+    : task_runner_(new base::TestMockTimeTaskRunner()) {
+  // Creates an |image_| that will yield a non-default prominent color.
+  const gfx::Size kImageSize(300, 200);
+  const SkColor kGray = SkColorSetRGB(10, 10, 10);
+  const SkColor kVibrantGreen = SkColorSetRGB(25, 200, 25);
+
+  gfx::Canvas canvas(kImageSize, 1.0f, true);
+  canvas.FillRect(gfx::Rect(kImageSize), kGray);
+  canvas.FillRect(gfx::Rect(0, 1, 300, 1), kVibrantGreen);
+
+  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  image_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
+
+  calculator_ = base::MakeUnique<WallpaperColorCalculator>(
+      image_, color_utils::LumaRange::NORMAL,
+      color_utils::SaturationRange::VIBRANT, nullptr);
+  calculator_->AddObserver(&observer_);
+
+  InstallTaskRunner(task_runner_);
+}
+
+WallPaperColorCalculatorTest::~WallPaperColorCalculatorTest() {}
+
+void WallPaperColorCalculatorTest::InstallTaskRunner(
+    scoped_refptr<base::SequencedTaskRunner> task_runner) {
+  task_runner_handle_.reset();
+  task_runner_handle_ =
+      base::MakeUnique<base::SequencedTaskRunnerHandle>(task_runner);
+  calculator_->SetTaskRunnerForTest(task_runner);
+}
+
+TEST_F(WallPaperColorCalculatorTest,
+       StartCalculationReturnsFalseWhenPostingTaskFails) {
+  scoped_refptr<base::NullTaskRunner> task_runner = new base::NullTaskRunner();
+  InstallTaskRunner(task_runner);
+  calculator_->set_prominent_color_for_test(SK_ColorBLACK);
+
+  EXPECT_FALSE(calculator_->StartCalculation());
+  EXPECT_EQ(kDefaultColor, calculator_->prominent_color());
+}
+
+TEST_F(WallPaperColorCalculatorTest, ObserverNotifiedOnSuccessfulCalculation) {
+  EXPECT_FALSE(observer_.WasNotified());
+
+  EXPECT_TRUE(calculator_->StartCalculation());
+  EXPECT_FALSE(observer_.WasNotified());
+
+  task_runner_->RunUntilIdle();
+  EXPECT_TRUE(observer_.WasNotified());
+}
+
+TEST_F(WallPaperColorCalculatorTest, ColorUpdatedOnSuccessfulCalculation) {
+  calculator_->set_prominent_color_for_test(kDefaultColor);
+
+  EXPECT_TRUE(calculator_->StartCalculation());
+  EXPECT_EQ(kDefaultColor, calculator_->prominent_color());
+
+  task_runner_->RunUntilIdle();
+  EXPECT_NE(kDefaultColor, calculator_->prominent_color());
+}
+
+TEST_F(WallPaperColorCalculatorTest,
+       NoCrashWhenCalculatorDestroyedBeforeTaskProcessing) {
+  EXPECT_TRUE(calculator_->StartCalculation());
+  calculator_.reset();
+
+  EXPECT_TRUE(task_runner_->HasPendingTask());
+
+  task_runner_->RunUntilIdle();
+  EXPECT_FALSE(observer_.WasNotified());
+  EXPECT_FALSE(task_runner_->HasPendingTask());
+}
+
+}  // namespace wallpaper

diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
index 283fe19..a844a94 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm

@@ -143,6 +143,9 @@
 }
 
 NSArray* BuildAllAttributesArray() {
+  // Note: clang-format tries to put multiple attributes on one line,
+  // but we prefer to have one per line for readability.
+  // clang-format off
   NSArray* array = [NSArray arrayWithObjects:
       NSAccessibilityRoleDescriptionAttribute,
       NSAccessibilityTitleAttribute,
@@ -167,6 +170,7 @@
       @"AXARIASetSize",
       @"AXARIAPosInSet",
       NSAccessibilityColumnIndexRangeAttribute,
+      @"AXDOMIdentifier",
       @"AXDropEffects",
       NSAccessibilityEnabledAttribute,
       NSAccessibilityExpandedAttribute,
@@ -189,6 +193,8 @@
       @"AXVisited",
       @"AXLinkedUIElements",
       nil];
+  // clang-format off
+
   return [array retain];
 }
 

diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index a0579ca..cd38599 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm

@@ -60,6 +60,7 @@
 NSString* const NSAccessibilityARIARowIndexAttribute = @"AXARIARowIndex";
 NSString* const NSAccessibilityARIASetSizeAttribute = @"AXARIASetSize";
 NSString* const NSAccessibilityAccessKeyAttribute = @"AXAccessKey";
+NSString* const NSAccessibilityDOMIdentifierAttribute = @"AXDOMIdentifier";
 NSString* const NSAccessibilityDropEffectsAttribute = @"AXDropEffects";
 NSString* const NSAccessibilityGrabbedAttribute = @"AXGrabbed";
 NSString* const NSAccessibilityInvalidAttribute = @"AXInvalid";
@@ -552,6 +553,7 @@
       {NSAccessibilityDisclosureLevelAttribute, @"disclosureLevel"},
       {NSAccessibilityDisclosedRowsAttribute, @"disclosedRows"},
       {NSAccessibilityDropEffectsAttribute, @"dropEffects"},
+      {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
       {NSAccessibilityEnabledAttribute, @"enabled"},
       {NSAccessibilityEndTextMarkerAttribute, @"endTextMarker"},
       {NSAccessibilityExpandedAttribute, @"expanded"},
@@ -944,6 +946,17 @@
   return nil;
 }
 
+- (NSString*)domIdentifier {
+  if (![self instanceActive])
+    return nil;
+
+  std::string id;
+  if (browserAccessibility_->GetHtmlAttribute("id", &id))
+    return base::SysUTF8ToNSString(id);
+
+  return nil;
+}
+
 - (NSNumber*)enabled {
   if (![self instanceActive])
     return nil;
@@ -2553,6 +2566,7 @@
       arrayWithObjects:NSAccessibilityAccessKeyAttribute,
                        NSAccessibilityChildrenAttribute,
                        NSAccessibilityDescriptionAttribute,
+                       NSAccessibilityDOMIdentifierAttribute,
                        NSAccessibilityEnabledAttribute,
                        NSAccessibilityEndTextMarkerAttribute,
                        NSAccessibilityFocusedAttribute,

diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index 9f6e501..04b1be9 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -1183,6 +1183,10 @@
   RunHtmlTest(FILE_PATH_LITERAL("input-week.html"));
 }
 
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityId) {
+  RunHtmlTest(FILE_PATH_LITERAL("id.html"));
+}
+
 IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityIns) {
   RunHtmlTest(FILE_PATH_LITERAL("ins.html"));
 }

diff --git a/content/browser/android/string_message_codec.cc b/content/browser/android/string_message_codec.cc
index aa25887..b2bae5dd 100644
--- a/content/browser/android/string_message_codec.cc
+++ b/content/browser/android/string_message_codec.cc

@@ -114,19 +114,18 @@
 
   const uint8_t* ptr = reinterpret_cast<const uint8_t*>(&encoded_data[0]);
   const uint8_t* end = ptr + num_bytes;
-
   uint8_t tag;
-  if (!ReadUint8(&ptr, end, &tag) || tag != kVersionTag)
-    return false;
 
-  uint32_t version;
-  if (!ReadUint32(&ptr, end, &version))
-    return false;
-
+  // Discard any leading version and padding tags.
+  // There may be more than one version, due to Blink and V8 having separate
+  // version tags.
   do {
     if (!ReadUint8(&ptr, end, &tag))
       return false;
-  } while (tag == kPaddingTag);
+    uint32_t version;
+    if (tag == kVersionTag && !ReadUint32(&ptr, end, &version))
+      return false;
+  } while (tag == kVersionTag || tag == kPaddingTag);
 
   switch (tag) {
     case kOneByteStringTag: {

diff --git a/content/browser/child_process_launcher_helper_posix.cc b/content/browser/child_process_launcher_helper_posix.cc
index dca99b27..f245ef2f 100644
--- a/content/browser/child_process_launcher_helper_posix.cc
+++ b/content/browser/child_process_launcher_helper_posix.cc

@@ -27,12 +27,12 @@
     std::map<std::string, catalog::RequiredFileMap>;
 
 RequiredFilesByServiceMap& GetRequiredFilesByServiceMap() {
-  static auto required_files_by_service = new RequiredFilesByServiceMap();
+  static auto* required_files_by_service = new RequiredFilesByServiceMap();
   return *required_files_by_service;
 }
 
 std::map<std::string, std::string>& GetServiceNameByProcessTypeMap() {
-  static auto service_name_resolver = new std::map<std::string, std::string>(
+  static auto* service_name_resolver = new std::map<std::string, std::string>(
       {// The service names are defined in the JSON manifests, so we don't have
        // a constant accessible for them.
        // TODO(jcivelli): remove this map once the service name is accessible
@@ -49,9 +49,9 @@
 
 base::PlatformFile OpenFileIfNecessary(const base::FilePath& path,
                                        base::MemoryMappedFile::Region* region) {
-  static auto opened_files =
-      new std::map<base::FilePath, std::pair<base::PlatformFile,
-                                             base::MemoryMappedFile::Region>>;
+  static auto* opened_files = new std::map<
+      base::FilePath,
+      std::pair<base::PlatformFile, base::MemoryMappedFile::Region>>;
 
   const auto& iter = opened_files->find(path);
   if (iter != opened_files->end()) {

diff --git a/content/browser/download/OWNERS b/content/browser/download/OWNERS
index 367f6ec7..5d53ff8 100644
--- a/content/browser/download/OWNERS
+++ b/content/browser/download/OWNERS

@@ -1,3 +1,5 @@
 asanka@chromium.org
 dtrainor@chromium.org
 qinmin@chromium.org
+
+# COMPONENT: UI>Browser>Downloads

diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index 4b3bb5c..d842e1e 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc

@@ -1847,7 +1847,8 @@
       base::Time(), parameters.etag, std::string(), kIntermediateSize,
       parameters.size, std::string(), DownloadItem::INTERRUPTED,
       DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -1909,7 +1910,8 @@
       base::Time(), parameters.etag, std::string(), kIntermediateSize,
       parameters.size, std::string(), DownloadItem::INTERRUPTED,
       DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -1958,7 +1960,8 @@
       base::Time(), "fake-etag", std::string(), kIntermediateSize,
       parameters.size, std::string(), DownloadItem::INTERRUPTED,
       DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -2013,7 +2016,8 @@
       parameters.size,
       std::string(std::begin(kPartialHash), std::end(kPartialHash)),
       DownloadItem::INTERRUPTED, DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -2074,7 +2078,8 @@
       parameters.size,
       std::string(std::begin(kPartialHash), std::end(kPartialHash)),
       DownloadItem::INTERRUPTED, DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -2144,7 +2149,8 @@
       base::Time(), parameters.etag, std::string(), kIntermediateSize,
       parameters.size, std::string(), DownloadItem::INTERRUPTED,
       DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);
@@ -2212,7 +2218,8 @@
       base::Time(), parameters.etag, std::string(), kIntermediateSize,
       parameters.size, std::string(), DownloadItem::INTERRUPTED,
       DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
 
   download->Resume();
   WaitForCompletion(download);

diff --git a/content/browser/download/download_item_factory.h b/content/browser/download/download_item_factory.h
index ae069f3..dc6e9a9 100644
--- a/content/browser/download/download_item_factory.h
+++ b/content/browser/download/download_item_factory.h

@@ -63,6 +63,7 @@
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
       bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices,
       const net::NetLogWithSource& net_log) = 0;
 
   virtual DownloadItemImpl* CreateActiveItem(

diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc
index 47ad0ee..b1957ab6 100644
--- a/content/browser/download/download_item_impl.cc
+++ b/content/browser/download/download_item_impl.cc

@@ -121,30 +121,32 @@
 const int DownloadItemImpl::kMaxAutoResumeAttempts = 5;
 
 // Constructor for reading from the history service.
-DownloadItemImpl::DownloadItemImpl(DownloadItemImplDelegate* delegate,
-                                   const std::string& guid,
-                                   uint32_t download_id,
-                                   const base::FilePath& current_path,
-                                   const base::FilePath& target_path,
-                                   const std::vector<GURL>& url_chain,
-                                   const GURL& referrer_url,
-                                   const GURL& site_url,
-                                   const GURL& tab_url,
-                                   const GURL& tab_refererr_url,
-                                   const std::string& mime_type,
-                                   const std::string& original_mime_type,
-                                   const base::Time& start_time,
-                                   const base::Time& end_time,
-                                   const std::string& etag,
-                                   const std::string& last_modified,
-                                   int64_t received_bytes,
-                                   int64_t total_bytes,
-                                   const std::string& hash,
-                                   DownloadItem::DownloadState state,
-                                   DownloadDangerType danger_type,
-                                   DownloadInterruptReason interrupt_reason,
-                                   bool opened,
-                                   const net::NetLogWithSource& net_log)
+DownloadItemImpl::DownloadItemImpl(
+    DownloadItemImplDelegate* delegate,
+    const std::string& guid,
+    uint32_t download_id,
+    const base::FilePath& current_path,
+    const base::FilePath& target_path,
+    const std::vector<GURL>& url_chain,
+    const GURL& referrer_url,
+    const GURL& site_url,
+    const GURL& tab_url,
+    const GURL& tab_refererr_url,
+    const std::string& mime_type,
+    const std::string& original_mime_type,
+    const base::Time& start_time,
+    const base::Time& end_time,
+    const std::string& etag,
+    const std::string& last_modified,
+    int64_t received_bytes,
+    int64_t total_bytes,
+    const std::string& hash,
+    DownloadItem::DownloadState state,
+    DownloadDangerType danger_type,
+    DownloadInterruptReason interrupt_reason,
+    bool opened,
+    const std::vector<DownloadItem::ReceivedSlice>& received_slices,
+    const net::NetLogWithSource& net_log)
     : guid_(base::ToUpperASCII(guid)),
       download_id_(download_id),
       target_path_(target_path),
@@ -170,6 +172,7 @@
       hash_(hash),
       last_modified_time_(last_modified),
       etag_(etag),
+      received_slices_(received_slices),
       net_log_(net_log),
       weak_ptr_factory_(this) {
   delegate_->Attach();
@@ -724,6 +727,11 @@
   return received_bytes_;
 }
 
+const std::vector<DownloadItem::ReceivedSlice>&
+DownloadItemImpl::GetReceivedSlices() const {
+  return received_slices_;
+}
+
 base::Time DownloadItemImpl::GetStartTime() const {
   return start_time_;
 }

diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index c899f25..47a0b0b6 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h

@@ -51,30 +51,32 @@
 
   // Constructing from persistent store:
   // |net_log| is constructed externally for our use.
-  DownloadItemImpl(DownloadItemImplDelegate* delegate,
-                   const std::string& guid,
-                   uint32_t id,
-                   const base::FilePath& current_path,
-                   const base::FilePath& target_path,
-                   const std::vector<GURL>& url_chain,
-                   const GURL& referrer_url,
-                   const GURL& site_url,
-                   const GURL& tab_url,
-                   const GURL& tab_referrer_url,
-                   const std::string& mime_type,
-                   const std::string& original_mime_type,
-                   const base::Time& start_time,
-                   const base::Time& end_time,
-                   const std::string& etag,
-                   const std::string& last_modified,
-                   int64_t received_bytes,
-                   int64_t total_bytes,
-                   const std::string& hash,
-                   DownloadItem::DownloadState state,
-                   DownloadDangerType danger_type,
-                   DownloadInterruptReason interrupt_reason,
-                   bool opened,
-                   const net::NetLogWithSource& net_log);
+  DownloadItemImpl(
+      DownloadItemImplDelegate* delegate,
+      const std::string& guid,
+      uint32_t id,
+      const base::FilePath& current_path,
+      const base::FilePath& target_path,
+      const std::vector<GURL>& url_chain,
+      const GURL& referrer_url,
+      const GURL& site_url,
+      const GURL& tab_url,
+      const GURL& tab_referrer_url,
+      const std::string& mime_type,
+      const std::string& original_mime_type,
+      const base::Time& start_time,
+      const base::Time& end_time,
+      const std::string& etag,
+      const std::string& last_modified,
+      int64_t received_bytes,
+      int64_t total_bytes,
+      const std::string& hash,
+      DownloadItem::DownloadState state,
+      DownloadDangerType danger_type,
+      DownloadInterruptReason interrupt_reason,
+      bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices,
+      const net::NetLogWithSource& net_log);
 
   // Constructing for a regular download.
   // |net_log| is constructed externally for our use.
@@ -150,6 +152,8 @@
   bool AllDataSaved() const override;
   int64_t GetTotalBytes() const override;
   int64_t GetReceivedBytes() const override;
+  const std::vector<DownloadItem::ReceivedSlice>& GetReceivedSlices()
+      const override;
   base::Time GetStartTime() const override;
   base::Time GetEndTime() const override;
   bool CanShowInFolder() override;
@@ -674,6 +678,9 @@
   // Server's ETAG for the file.
   std::string etag_;
 
+  // The data slices that have been received so far.
+  std::vector<DownloadItem::ReceivedSlice> received_slices_;
+
   // Net log to use for this download.
   const net::NetLogWithSource net_log_;
 

diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index ccb9aaa..983e26ae 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc

@@ -141,13 +141,14 @@
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
       bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices,
       const net::NetLogWithSource& net_log) override {
     return new DownloadItemImpl(
         delegate, guid, download_id, current_path, target_path, url_chain,
         referrer_url, site_url, tab_url, tab_refererr_url, mime_type,
         original_mime_type, start_time, end_time, etag, last_modified,
         received_bytes, total_bytes, hash, state, danger_type, interrupt_reason,
-        opened, net_log);
+        opened, received_slices, net_log);
   }
 
   DownloadItemImpl* CreateActiveItem(
@@ -658,7 +659,8 @@
     DownloadItem::DownloadState state,
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
-    bool opened) {
+    bool opened,
+    const std::vector<DownloadItem::ReceivedSlice>& received_slices) {
   if (base::ContainsKey(downloads_, id)) {
     NOTREACHED();
     return nullptr;
@@ -668,7 +670,7 @@
       this, guid, id, current_path, target_path, url_chain, referrer_url,
       site_url, tab_url, tab_refererr_url, mime_type, original_mime_type,
       start_time, end_time, etag, last_modified, received_bytes, total_bytes,
-      hash, state, danger_type, interrupt_reason, opened,
+      hash, state, danger_type, interrupt_reason, opened, received_slices,
       net::NetLogWithSource::Make(net_log_, net::NetLogSourceType::DOWNLOAD));
   downloads_[id] = base::WrapUnique(item);
   downloads_by_guid_[guid] = item;

diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h
index 859fe17..edf17777 100644
--- a/content/browser/download/download_manager_impl.h
+++ b/content/browser/download/download_manager_impl.h

@@ -103,7 +103,8 @@
       content::DownloadItem::DownloadState state,
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
-      bool opened) override;
+      bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices) override;
   int InProgressCount() const override;
   int NonMaliciousInProgressCount() const override;
   BrowserContext* GetBrowserContext() const override;

diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 2012e4bd..c9a225cf 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc

@@ -102,6 +102,7 @@
                          DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
                          DOWNLOAD_INTERRUPT_REASON_NONE,
                          false,
+                         std::vector<DownloadItem::ReceivedSlice>(),
                          net::NetLogWithSource()) {}
   virtual ~MockDownloadItemImpl() {}
 
@@ -268,6 +269,7 @@
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
       bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices,
       const net::NetLogWithSource& net_log) override;
   DownloadItemImpl* CreateActiveItem(
       DownloadItemImplDelegate* delegate,
@@ -340,6 +342,7 @@
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
     bool opened,
+    const std::vector<DownloadItem::ReceivedSlice>& received_slices,
     const net::NetLogWithSource& net_log) {
   DCHECK(items_.find(download_id) == items_.end());
   MockDownloadItemImpl* result =
@@ -723,7 +726,8 @@
       "application/octet-stream", "application/octet-stream", base::Time::Now(),
       base::Time::Now(), std::string(), std::string(), 10, 10, std::string(),
       DownloadItem::INTERRUPTED, DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
-      DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED, false);
+      DOWNLOAD_INTERRUPT_REASON_SERVER_FAILED, false,
+      std::vector<DownloadItem::ReceivedSlice>());
   ASSERT_TRUE(persisted_item);
 
   ASSERT_EQ(persisted_item, download_manager_->GetDownloadByGuid(kGuid));

diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 704152e..eeaac957 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc

@@ -295,7 +295,8 @@
 
   host_->SetView(nullptr);
   host_ = nullptr;
-  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
+
+  delete this;
 }
 
 void RenderWidgetHostViewChildFrame::SetTooltipText(

diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc
index 93ea21f..2197f73a 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.cc
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc

@@ -239,10 +239,11 @@
 }
 
 void RenderWidgetHostViewGuest::Destroy() {
-  RenderWidgetHostViewChildFrame::Destroy();
-
   if (platform_view_)  // The platform view might have been destroyed already.
     platform_view_->Destroy();
+
+  // RenderWidgetHostViewChildFrame::Destroy destroys this object.
+  RenderWidgetHostViewChildFrame::Destroy();
 }
 
 gfx::Size RenderWidgetHostViewGuest::GetPhysicalBackingSize() const {

diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 4aabfd1..090fc9f 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc

@@ -168,7 +168,8 @@
     switches::kGpuTestingGLRenderer,
     switches::kGpuTestingGLVersion,
     switches::kDisableGpuDriverBugWorkarounds,
-    switches::kUsePassthroughCmdDecoder};
+    switches::kUsePassthroughCmdDecoder,
+    switches::kEnableHDROutput};
 
 enum GPUProcessLifetimeEvent {
   LAUNCHED,

diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 1503a16..decc3cb 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc

@@ -244,10 +244,7 @@
   TestConfigChange(ConfigChangeType::CLEAR_TO_CLEAR);
 }
 
-// TODO(xhwang): Support switching from clear to encrypted and enable this test.
-// See http://crbug.com/597443
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
-                       DISABLED_ConfigChangeVideo_ClearToEncrypted) {
+IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo_ClearToEncrypted) {
   TestConfigChange(ConfigChangeType::CLEAR_TO_ENCRYPTED);
 }
 

diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc
index a7f927742..9f2e46b 100644
--- a/content/browser/presentation/presentation_service_impl.cc
+++ b/content/browser/presentation/presentation_service_impl.cc

@@ -63,47 +63,6 @@
   return output;
 }
 
-std::unique_ptr<PresentationConnectionMessage> GetPresentationConnectionMessage(
-    blink::mojom::ConnectionMessagePtr input) {
-  std::unique_ptr<content::PresentationConnectionMessage> output;
-  if (input.is_null())
-    return output;
-
-  switch (input->type) {
-    case blink::mojom::PresentationMessageType::TEXT: {
-      // Return nullptr PresentationConnectionMessage if invalid (unset
-      // |message|,
-      // set |data|, or size too large).
-      if (input->data || !input->message ||
-          input->message->size() >
-              content::kMaxPresentationConnectionMessageSize)
-        return output;
-
-      output.reset(
-          new PresentationConnectionMessage(PresentationMessageType::TEXT));
-      output->message = std::move(input->message.value());
-      return output;
-    }
-    case blink::mojom::PresentationMessageType::BINARY: {
-      // Return nullptr PresentationConnectionMessage if invalid (unset |data|,
-      // set
-      // |message|, or size too large).
-      if (!input->data || input->message ||
-          input->data->size() > content::kMaxPresentationConnectionMessageSize)
-        return output;
-
-      output.reset(
-          new PresentationConnectionMessage(PresentationMessageType::BINARY));
-      output->data.reset(
-          new std::vector<uint8_t>(std::move(input->data.value())));
-      return output;
-    }
-  }
-
-  NOTREACHED() << "Invalid presentation message type " << input->type;
-  return output;
-}
-
 void InvokeNewSessionCallbackWithError(
     const PresentationServiceImpl::NewSessionCallback& callback) {
   callback.Run(base::nullopt,
@@ -374,36 +333,6 @@
                  weak_factory_.GetWeakPtr()));
 }
 
-void PresentationServiceImpl::SendConnectionMessage(
-    const PresentationSessionInfo& session_info,
-    blink::mojom::ConnectionMessagePtr connection_message,
-    const SendConnectionMessageCallback& callback) {
-  DVLOG(2) << "SendConnectionMessage [id]: " << session_info.presentation_id;
-  DCHECK(!connection_message.is_null());
-  // send_message_callback_ should be null by now, otherwise resetting of
-  // send_message_callback_ with new callback will drop the old callback.
-  if (!controller_delegate_ || send_message_callback_) {
-    callback.Run(false);
-    return;
-  }
-
-  send_message_callback_.reset(new SendConnectionMessageCallback(callback));
-  controller_delegate_->SendMessage(
-      render_process_id_, render_frame_id_, session_info,
-      GetPresentationConnectionMessage(std::move(connection_message)),
-      base::Bind(&PresentationServiceImpl::OnSendMessageCallback,
-                 weak_factory_.GetWeakPtr()));
-}
-
-void PresentationServiceImpl::OnSendMessageCallback(bool sent) {
-  // It is possible that Reset() is invoked before receiving this callback.
-  // So, always check send_message_callback_ for non-null.
-  if (send_message_callback_) {
-    send_message_callback_->Run(sent);
-    send_message_callback_.reset();
-  }
-}
-
 void PresentationServiceImpl::CloseConnection(
     const GURL& presentation_url,
     const std::string& presentation_id) {
@@ -565,19 +494,6 @@
   pending_start_session_cb_.reset();
 
   pending_join_session_cbs_.clear();
-
-  if (on_connection_messages_callback_.get()) {
-    on_connection_messages_callback_->Run(
-        std::vector<blink::mojom::ConnectionMessagePtr>());
-    on_connection_messages_callback_.reset();
-  }
-
-  if (send_message_callback_) {
-    // Run the callback with false, indicating the renderer to stop sending
-    // the requests and invalidate all pending requests.
-    send_message_callback_->Run(false);
-    send_message_callback_.reset();
-  }
 }
 
 void PresentationServiceImpl::OnDelegateDestroyed() {

diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h
index 240fbd7..5ba4c47 100644
--- a/content/browser/presentation/presentation_service_impl.h
+++ b/content/browser/presentation/presentation_service_impl.h

@@ -103,7 +103,6 @@
 
   using ConnectionMessagesCallback =
       base::Callback<void(std::vector<blink::mojom::ConnectionMessagePtr>)>;
-  using SendConnectionMessageCallback = base::Callback<void(bool)>;
 
   // Listener implementation owned by PresentationServiceImpl. An instance of
   // this is created when PresentationRequest.getAvailability() is resolved.
@@ -168,10 +167,6 @@
   void JoinSession(const std::vector<GURL>& presentation_urls,
                    const base::Optional<std::string>& presentation_id,
                    const NewSessionCallback& callback) override;
-  void SendConnectionMessage(
-      const PresentationSessionInfo& session_info,
-      blink::mojom::ConnectionMessagePtr connection_message,
-      const SendConnectionMessageCallback& callback) override;
   void CloseConnection(const GURL& presentation_url,
                        const std::string& presentation_id) override;
   void Terminate(const GURL& presentation_url,
@@ -229,7 +224,6 @@
   void OnJoinSessionError(
       int request_session_id,
       const PresentationError& error);
-  void OnSendMessageCallback(bool sent);
 
   // Calls to |delegate_| to start listening for state changes for |connection|.
   // State changes will be returned via |OnConnectionStateChanged|.
@@ -303,11 +297,6 @@
   // The binding is removed when binding_ is cleared or goes out of scope.
   std::unique_ptr<mojo::Binding<blink::mojom::PresentationService>> binding_;
 
-  // There can be only one send message request at a time.
-  std::unique_ptr<SendConnectionMessageCallback> send_message_callback_;
-
-  std::unique_ptr<ConnectionMessagesCallback> on_connection_messages_callback_;
-
   // ID of the RenderFrameHost this object is associated with.
   int render_process_id_;
   int render_frame_id_;

diff --git a/content/browser/presentation/presentation_service_impl_unittest.cc b/content/browser/presentation/presentation_service_impl_unittest.cc
index aa2339c..04a6ede 100644
--- a/content/browser/presentation/presentation_service_impl_unittest.cc
+++ b/content/browser/presentation/presentation_service_impl_unittest.cc

@@ -331,7 +331,6 @@
     EXPECT_EQ(
         service_impl_->screen_availability_listeners_.find(presentation_url1_),
         service_impl_->screen_availability_listeners_.end());
-    EXPECT_FALSE(service_impl_->on_connection_messages_callback_.get());
   }
 
   void ExpectNewSessionCallbackSuccess(
@@ -360,13 +359,6 @@
       EXPECT_TRUE(expected_msgs[i].Equals(actual_msgs[i]));
   }
 
-  void ExpectSendConnectionMessageCallback(bool success) {
-    EXPECT_TRUE(success);
-    EXPECT_FALSE(service_impl_->send_message_callback_);
-    if (!run_loop_quit_closure_.is_null())
-      run_loop_quit_closure_.Run();
-  }
-
   void RunListenForConnectionMessages(const std::string& text_msg,
                                       const std::vector<uint8_t>& binary_data,
                                       bool pass_ownership) {
@@ -751,153 +743,6 @@
   SaveQuitClosureAndRunLoop();
 }
 
-TEST_F(PresentationServiceImplTest, SendStringMessage) {
-  std::string message("Test presentation session message");
-
-  content::PresentationSessionInfo session(presentation_url1_, kPresentationId);
-  blink::mojom::ConnectionMessagePtr message_request(
-      blink::mojom::ConnectionMessage::New());
-  message_request->type = blink::mojom::PresentationMessageType::TEXT;
-  message_request->message = message;
-  service_ptr_->SendConnectionMessage(
-      session, std::move(message_request),
-      base::Bind(
-          &PresentationServiceImplTest::ExpectSendConnectionMessageCallback,
-          base::Unretained(this)));
-
-  base::RunLoop run_loop;
-  base::Callback<void(bool)> send_message_cb;
-  PresentationConnectionMessage* test_message = nullptr;
-  EXPECT_CALL(mock_delegate_, SendMessageRawPtr(_, _, _, _, _))
-      .WillOnce(DoAll(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-                      SaveArg<3>(&test_message), SaveArg<4>(&send_message_cb)));
-  run_loop.Run();
-
-  // Make sure |test_message| gets deleted.
-  std::unique_ptr<PresentationConnectionMessage> scoped_test_message(
-      test_message);
-  EXPECT_TRUE(test_message);
-  EXPECT_FALSE(test_message->is_binary());
-  EXPECT_LE(test_message->message.size(),
-            kMaxPresentationConnectionMessageSize);
-  EXPECT_EQ(message, test_message->message);
-  ASSERT_FALSE(test_message->data);
-  send_message_cb.Run(true);
-  SaveQuitClosureAndRunLoop();
-}
-
-TEST_F(PresentationServiceImplTest, SendArrayBuffer) {
-  // Test Array buffer data.
-  const uint8_t buffer[] = {0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48};
-  std::vector<uint8_t> data;
-  data.assign(buffer, buffer + sizeof(buffer));
-
-  content::PresentationSessionInfo session(presentation_url1_, kPresentationId);
-  blink::mojom::ConnectionMessagePtr message_request(
-      blink::mojom::ConnectionMessage::New());
-  message_request->type = blink::mojom::PresentationMessageType::BINARY;
-  message_request->data = data;
-  service_ptr_->SendConnectionMessage(
-      session, std::move(message_request),
-      base::Bind(
-          &PresentationServiceImplTest::ExpectSendConnectionMessageCallback,
-          base::Unretained(this)));
-
-  base::RunLoop run_loop;
-  base::Callback<void(bool)> send_message_cb;
-  PresentationConnectionMessage* test_message = nullptr;
-  EXPECT_CALL(mock_delegate_, SendMessageRawPtr(_, _, _, _, _))
-      .WillOnce(DoAll(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-                      SaveArg<3>(&test_message), SaveArg<4>(&send_message_cb)));
-  run_loop.Run();
-
-  // Make sure |test_message| gets deleted.
-  std::unique_ptr<PresentationConnectionMessage> scoped_test_message(
-      test_message);
-  EXPECT_TRUE(test_message);
-  EXPECT_TRUE(test_message->is_binary());
-  EXPECT_EQ(PresentationMessageType::BINARY, test_message->type);
-  EXPECT_TRUE(test_message->message.empty());
-  ASSERT_TRUE(test_message->data);
-  EXPECT_EQ(data.size(), test_message->data->size());
-  EXPECT_LE(test_message->data->size(), kMaxPresentationConnectionMessageSize);
-  EXPECT_EQ(0, memcmp(buffer, &(*test_message->data)[0], sizeof(buffer)));
-  send_message_cb.Run(true);
-  SaveQuitClosureAndRunLoop();
-}
-
-TEST_F(PresentationServiceImplTest, SendArrayBufferWithExceedingLimit) {
-  // Create buffer with size exceeding the limit.
-  // Use same size as in content::kMaxPresentationConnectionMessageSize.
-  const size_t kMaxBufferSizeInBytes = 64 * 1024;  // 64 KB.
-  uint8_t buffer[kMaxBufferSizeInBytes + 1];
-  memset(buffer, 0, kMaxBufferSizeInBytes+1);
-  std::vector<uint8_t> data;
-  data.assign(buffer, buffer + sizeof(buffer));
-
-  content::PresentationSessionInfo session(presentation_url1_, kPresentationId);
-  blink::mojom::ConnectionMessagePtr message_request(
-      blink::mojom::ConnectionMessage::New());
-  message_request->type = blink::mojom::PresentationMessageType::BINARY;
-  message_request->data = data;
-  service_ptr_->SendConnectionMessage(
-      session, std::move(message_request),
-      base::Bind(
-          &PresentationServiceImplTest::ExpectSendConnectionMessageCallback,
-          base::Unretained(this)));
-
-  base::RunLoop run_loop;
-  base::Callback<void(bool)> send_message_cb;
-  PresentationConnectionMessage* test_message = nullptr;
-  EXPECT_CALL(mock_delegate_, SendMessageRawPtr(_, _, _, _, _))
-      .WillOnce(DoAll(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-                      SaveArg<3>(&test_message), SaveArg<4>(&send_message_cb)));
-  run_loop.Run();
-
-  EXPECT_FALSE(test_message);
-  send_message_cb.Run(true);
-  SaveQuitClosureAndRunLoop();
-}
-
-TEST_F(PresentationServiceImplTest, SendBlobData) {
-  const uint8_t buffer[] = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
-  std::vector<uint8_t> data;
-  data.assign(buffer, buffer + sizeof(buffer));
-
-  content::PresentationSessionInfo session(presentation_url1_, kPresentationId);
-  blink::mojom::ConnectionMessagePtr message_request(
-      blink::mojom::ConnectionMessage::New());
-  message_request->type = blink::mojom::PresentationMessageType::BINARY;
-  message_request->data = data;
-  service_ptr_->SendConnectionMessage(
-      session, std::move(message_request),
-      base::Bind(
-          &PresentationServiceImplTest::ExpectSendConnectionMessageCallback,
-          base::Unretained(this)));
-
-  base::RunLoop run_loop;
-  base::Callback<void(bool)> send_message_cb;
-  PresentationConnectionMessage* test_message = nullptr;
-  EXPECT_CALL(mock_delegate_, SendMessageRawPtr(_, _, _, _, _))
-      .WillOnce(DoAll(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-                      SaveArg<3>(&test_message), SaveArg<4>(&send_message_cb)));
-  run_loop.Run();
-
-  // Make sure |test_message| gets deleted.
-  std::unique_ptr<PresentationConnectionMessage> scoped_test_message(
-      test_message);
-  EXPECT_TRUE(test_message);
-  EXPECT_TRUE(test_message->is_binary());
-  EXPECT_EQ(PresentationMessageType::BINARY, test_message->type);
-  EXPECT_TRUE(test_message->message.empty());
-  ASSERT_TRUE(test_message->data);
-  EXPECT_EQ(data.size(), test_message->data->size());
-  EXPECT_LE(test_message->data->size(), kMaxPresentationConnectionMessageSize);
-  EXPECT_EQ(0, memcmp(buffer, &(*test_message->data)[0], sizeof(buffer)));
-  send_message_cb.Run(true);
-  SaveQuitClosureAndRunLoop();
-}
-
 TEST_F(PresentationServiceImplTest, MaxPendingJoinSessionRequests) {
   const char* presentation_url = "http://fooUrl%d";
   const char* presentation_id = "presentationId%d";

diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 6e291141..ffd64e3e 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc

@@ -18,6 +18,7 @@
 #include "cc/output/copy_output_request.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
+#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ -49,7 +50,6 @@
       compositor_(nullptr),
       tick_clock_(new base::DefaultTickClock()),
       last_compositor_frame_sink_id_(0),
-      pending_delegated_ack_count_(0),
       skipped_frames_(false),
       background_color_(SK_ColorRED),
       current_scale_factor_(1.f),
@@ -60,12 +60,9 @@
   id_allocator_.reset(new cc::LocalSurfaceIdAllocator());
   factory->GetContextFactoryPrivate()->GetSurfaceManager()->RegisterFrameSinkId(
       frame_sink_id_);
-  factory->GetContextFactoryPrivate()
-      ->GetSurfaceManager()
-      ->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-  surface_factory_ = base::MakeUnique<cc::SurfaceFactory>(
-      frame_sink_id_, factory->GetContextFactoryPrivate()->GetSurfaceManager(),
-      this);
+  CreateCompositorFrameSinkSupport();
+  begin_frame_source_ = base::MakeUnique<cc::ExternalBeginFrameSource>(this);
+  client_->SetBeginFrameSource(begin_frame_source_.get());
 }
 
 void DelegatedFrameHost::WasShown(const ui::LatencyInfo& latency_info) {
@@ -379,7 +376,7 @@
     if (!request_copy_of_output_callback_for_testing_.is_null())
       request_copy_of_output_callback_for_testing_.Run(std::move(request));
     else
-      surface_factory_->RequestCopyOfSurface(std::move(request));
+      support_->RequestCopyOfSurface(std::move(request));
   } else {
     request->set_area(gfx::Rect(current_frame_size_in_dip_));
     RequestCopyOfOutput(std::move(request));
@@ -439,12 +436,10 @@
     // have the same id. Changing the layer to showing painted content destroys
     // the DelegatedRendererLayer.
     EvictDelegatedFrame();
-    surface_factory_->Reset();
-    surface_returned_resources_.clear();
+    ResetCompositorFrameSinkSupport();
+    CreateCompositorFrameSinkSupport();
     last_compositor_frame_sink_id_ = compositor_frame_sink_id;
   }
-  bool skip_frame = false;
-  pending_delegated_ack_count_++;
 
   background_color_ = frame.metadata.root_background_color;
 
@@ -464,7 +459,6 @@
 
     gfx::Size desired_size = client_->DelegatedFrameHostDesiredSizeInDIP();
     if (desired_size != frame_size_in_dip && !desired_size.IsEmpty()) {
-      skip_frame = true;
       skipped_latency_info_list_.insert(skipped_latency_info_list_.end(),
                                         frame.metadata.latency_info.begin(),
                                         frame.metadata.latency_info.end());
@@ -476,13 +470,8 @@
       skipped_latency_info_list_.clear();
     }
 
-    cc::SurfaceFactory::DrawCallback ack_callback;
-    if (!skip_frame) {
-      ack_callback = base::Bind(&DelegatedFrameHost::SurfaceDrawn, AsWeakPtr(),
-                                compositor_frame_sink_id);
-    }
-    surface_factory_->SubmitCompositorFrame(local_surface_id_, std::move(frame),
-                                            ack_callback);
+    support_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
+
     if (allocated_new_local_surface_id) {
       // manager must outlive compositors using it.
       cc::SurfaceId surface_id(frame_sink_id_, local_surface_id_);
@@ -505,12 +494,7 @@
         damage_rect_in_dip);
   }
 
-  if (skip_frame) {
-    SendReclaimCompositorResources(compositor_frame_sink_id,
-                                   true /* is_swap_ack */);
-  }
-
-  if (compositor_ && !skip_frame)
+  if (compositor_)
     can_lock_compositor_ = NO_PENDING_COMMIT;
 
   if (local_surface_id_.is_valid()) {
@@ -525,33 +509,16 @@
     EvictDelegatedFrame();
 }
 
-void DelegatedFrameHost::SendReclaimCompositorResources(
-    uint32_t compositor_frame_sink_id,
-    bool is_swap_ack) {
+void DelegatedFrameHost::DidReceiveCompositorFrameAck() {
   client_->DelegatedFrameHostSendReclaimCompositorResources(
-      compositor_frame_sink_id, is_swap_ack, surface_returned_resources_);
-  surface_returned_resources_.clear();
-  if (is_swap_ack) {
-    DCHECK_GT(pending_delegated_ack_count_, 0);
-    pending_delegated_ack_count_--;
-  }
+      last_compositor_frame_sink_id_, true /* is_swap_ack */,
+      cc::ReturnedResourceArray());
 }
 
-void DelegatedFrameHost::SurfaceDrawn(uint32_t compositor_frame_sink_id) {
-  SendReclaimCompositorResources(compositor_frame_sink_id,
-                                 true /* is_swap_ack */);
-}
-
-void DelegatedFrameHost::ReturnResources(
+void DelegatedFrameHost::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
-  if (resources.empty())
-    return;
-  std::copy(resources.begin(), resources.end(),
-            std::back_inserter(surface_returned_resources_));
-  if (!pending_delegated_ack_count_) {
-    SendReclaimCompositorResources(last_compositor_frame_sink_id_,
-                                   false /* is_swap_ack */);
-  }
+  client_->DelegatedFrameHostSendReclaimCompositorResources(
+      last_compositor_frame_sink_id_, false /* is_swap_ack */, resources);
 }
 
 void DelegatedFrameHost::WillDrawSurface(const cc::LocalSurfaceId& id,
@@ -565,15 +532,14 @@
   AttemptFrameSubscriberCapture(damage_rect);
 }
 
-void DelegatedFrameHost::SetBeginFrameSource(
-    cc::BeginFrameSource* begin_frame_source) {
-  client_->SetBeginFrameSource(begin_frame_source);
+void DelegatedFrameHost::OnBeginFrame(const cc::BeginFrameArgs& args) {
+  begin_frame_source_->OnBeginFrame(args);
 }
 
 void DelegatedFrameHost::EvictDelegatedFrame() {
   client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
   if (local_surface_id_.is_valid()) {
-    surface_factory_->EvictSurface();
+    support_->EvictFrame();
     local_surface_id_ = cc::LocalSurfaceId();
   }
   delegated_frame_evictor_->DiscardedFrame();
@@ -807,10 +773,10 @@
   DCHECK(!compositor_);
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->RemoveObserver(this);
-  surface_factory_->EvictSurface();
-  factory->GetContextFactoryPrivate()
-      ->GetSurfaceManager()
-      ->UnregisterSurfaceFactoryClient(frame_sink_id_);
+
+  begin_frame_source_.reset();
+  ResetCompositorFrameSinkSupport();
+
   factory->GetContextFactoryPrivate()
       ->GetSurfaceManager()
       ->InvalidateFrameSinkId(frame_sink_id_);
@@ -869,4 +835,33 @@
   delegated_frame_evictor_->UnlockFrame();
 }
 
+void DelegatedFrameHost::OnNeedsBeginFrames(bool needs_begin_frames) {
+  needs_begin_frame_ = needs_begin_frames;
+  support_->SetNeedsBeginFrame(needs_begin_frames);
+}
+
+void DelegatedFrameHost::OnDidFinishFrame(const cc::BeginFrameAck& ack) {}
+
+void DelegatedFrameHost::CreateCompositorFrameSinkSupport() {
+  DCHECK(!support_);
+  ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
+  support_ = base::MakeUnique<cc::CompositorFrameSinkSupport>(
+      this, factory->GetContextFactoryPrivate()->GetSurfaceManager(),
+      frame_sink_id_, false /* is_root */,
+      false /* handles_frame_sink_id_invalidation */,
+      true /* needs_sync_points */);
+  if (compositor_)
+    compositor_->AddFrameSink(frame_sink_id_);
+  if (needs_begin_frame_)
+    support_->SetNeedsBeginFrame(true);
+}
+
+void DelegatedFrameHost::ResetCompositorFrameSinkSupport() {
+  if (!support_)
+    return;
+  if (compositor_)
+    compositor_->RemoveFrameSink(frame_sink_id_);
+  support_.reset();
+}
+
 }  // namespace content

diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h
index 6b3b0b1b..c650d71 100644
--- a/content/browser/renderer_host/delegated_frame_host.h
+++ b/content/browser/renderer_host/delegated_frame_host.h

@@ -11,7 +11,8 @@
 
 #include "base/gtest_prod_util.h"
 #include "cc/output/copy_output_result.h"
-#include "cc/surfaces/surface_factory_client.h"
+#include "cc/scheduler/begin_frame_source.h"
+#include "cc/surfaces/compositor_frame_sink_support_client.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/compositor/owned_mailbox.h"
 #include "content/browser/renderer_host/delegated_frame_evictor.h"
@@ -31,8 +32,8 @@
 }
 
 namespace cc {
+class CompositorFrameSinkSupport;
 class LocalSurfaceIdAllocator;
-class SurfaceFactory;
 }
 
 namespace media {
@@ -87,7 +88,8 @@
       public ui::CompositorVSyncManager::Observer,
       public ui::ContextFactoryObserver,
       public DelegatedFrameEvictorClient,
-      public cc::SurfaceFactoryClient,
+      public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient),
+      public cc::ExternalBeginFrameSourceClient,
       public base::SupportsWeakPtr<DelegatedFrameHost> {
  public:
   DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
@@ -112,11 +114,12 @@
   // DelegatedFrameEvictorClient implementation.
   void EvictDelegatedFrame() override;
 
-  // cc::SurfaceFactoryClient implementation.
-  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
+  // cc::CompositorFrameSinkSupportClient implementation.
+  void DidReceiveCompositorFrameAck() override;
+  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
   void WillDrawSurface(const cc::LocalSurfaceId& id,
                        const gfx::Rect& damage_rect) override;
-  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   bool CanCopyToBitmap() const;
 
@@ -243,14 +246,17 @@
       scoped_refptr<OwnedMailbox> subscriber_texture,
       const gpu::SyncToken& sync_token);
 
-  void SendReclaimCompositorResources(uint32_t compositor_frame_sink_id,
-                                      bool is_swap_ack);
-  void SurfaceDrawn(uint32_t compositor_frame_sink_id);
-
   // Called to consult the current |frame_subscriber_|, to determine and maybe
   // initiate a copy-into-video-frame request.
   void AttemptFrameSubscriberCapture(const gfx::Rect& damage_rect);
 
+  // cc::ExternalBeginFrameSource implementation.
+  void OnNeedsBeginFrames(bool needs_begin_frames) override;
+  void OnDidFinishFrame(const cc::BeginFrameAck& ack) override;
+
+  void CreateCompositorFrameSinkSupport();
+  void ResetCompositorFrameSinkSupport();
+
   const cc::FrameSinkId frame_sink_id_;
   cc::LocalSurfaceId local_surface_id_;
   DelegatedFrameHostClient* const client_;
@@ -272,10 +278,6 @@
   // surfaces.
   uint32_t last_compositor_frame_sink_id_;
 
-  // The number of delegated frame acks that are pending, to delay resource
-  // returns until the acks are sent.
-  int pending_delegated_ack_count_;
-
   // True after a delegated frame has been skipped, until a frame is not
   // skipped.
   bool skipped_frames_;
@@ -289,7 +291,7 @@
 
   // State for rendering into a Surface.
   std::unique_ptr<cc::LocalSurfaceIdAllocator> id_allocator_;
-  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
   gfx::Size current_surface_size_;
   float current_scale_factor_;
   cc::ReturnedResourceArray surface_returned_resources_;
@@ -334,6 +336,10 @@
   std::unique_ptr<display_compositor::ReadbackYUVInterface>
       yuv_readback_pipeline_;
 
+  std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
+
+  bool needs_begin_frame_ = false;
+
   std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
 };
 

diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 9a08aa6..fafdb370 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -428,8 +428,8 @@
     return GetDelegatedFrameHost()->ReleasedFrontLockActiveForTesting();
   }
 
-  void ReturnResources(const cc::ReturnedResourceArray& resources) {
-    GetDelegatedFrameHost()->ReturnResources(resources);
+  void ReclaimResources(const cc::ReturnedResourceArray& resources) {
+    GetDelegatedFrameHost()->ReclaimResources(resources);
   }
 
   void ResetCompositor() { GetDelegatedFrameHost()->ResetCompositor(); }
@@ -1767,12 +1767,12 @@
   view_->Show();
   sink_->ClearMessages();
 
-  // Accumulate some returned resources. This should not trigger an IPC.
+  // Accumulate some returned resources. This should trigger an IPC.
   cc::ReturnedResourceArray resources;
   cc::ReturnedResource resource;
   resource.id = 1;
   resources.push_back(resource);
-  view_->ReturnResources(resources);
+  view_->ReclaimResources(resources);
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
@@ -1804,20 +1804,17 @@
   view_->Show();
   sink_->ClearMessages();
 
-  view_->OnSwapCompositorFrame(0,
-                               MakeDelegatedFrame(1.f, view_size, view_rect));
-
-  // Accumulate some returned resources. This should not trigger an IPC.
-  cc::ReturnedResourceArray resources;
-  cc::ReturnedResource resource;
+  // Submit a frame with resources.
+  cc::CompositorFrame frame = MakeDelegatedFrame(1.f, view_size, view_rect);
+  cc::TransferableResource resource;
   resource.id = 1;
-  resources.push_back(resource);
-  view_->ReturnResources(resources);
+  frame.resource_list.push_back(resource);
+  view_->OnSwapCompositorFrame(0, std::move(frame));
   EXPECT_EQ(0u, sink_->message_count());
 
   // Swap another CompositorFrame but this time from another
-  // compositor_frame_sink_id. The resources held by DelegatedFrameHost are old
-  // and should not be returned.
+  // compositor_frame_sink_id. The resources for the previous frame are old and
+  // should not be returned.
   view_->OnSwapCompositorFrame(1,
                                MakeDelegatedFrame(1.f, view_size, view_rect));
   EXPECT_EQ(0u, sink_->message_count());

diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index 2a52bbd..04759bb 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc

@@ -668,8 +668,10 @@
   }
 
   if (ipc_type == blink::WebURLRequest::LoadingIPCType::Mojo) {
+    scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+        loading_task_runner ? loading_task_runner : main_thread_task_runner_;
     std::unique_ptr<URLLoaderClientImpl> client(
-        new URLLoaderClientImpl(request_id, this, main_thread_task_runner_));
+        new URLLoaderClientImpl(request_id, this, std::move(task_runner)));
     mojom::URLLoaderAssociatedPtr url_loader;
     mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info;
     client->Bind(&client_ptr_info);

diff --git a/content/child/url_loader_client_impl.cc b/content/child/url_loader_client_impl.cc
index ab1e930..0ade247 100644
--- a/content/child/url_loader_client_impl.cc
+++ b/content/child/url_loader_client_impl.cc

@@ -30,6 +30,8 @@
 
 void URLLoaderClientImpl::Bind(
     mojom::URLLoaderClientAssociatedPtrInfo* client_ptr_info) {
+  // TODO(yhirano): Use |task_runner_| here.
+  // Currently it is unable because of a ChannelAssociatedInterface restriction.
   binding_.Bind(client_ptr_info);
 }
 

diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index 86554c33..50dde0fd 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc

@@ -184,6 +184,7 @@
       reg_exp_allowed_(false),
       function_allowed_(false),
       strip_null_from_objects_(false),
+      convert_negative_zero_to_int_(false),
       avoid_identity_hash_for_testing_(false),
       strategy_(NULL) {}
 
@@ -203,6 +204,10 @@
   strip_null_from_objects_ = val;
 }
 
+void V8ValueConverterImpl::SetConvertNegativeZeroToInt(bool val) {
+  convert_negative_zero_to_int_ = val;
+}
+
 void V8ValueConverterImpl::SetStrategy(Strategy* strategy) {
   strategy_ = strategy;
 }
@@ -373,6 +378,11 @@
     double val_as_double = val.As<v8::Number>()->Value();
     if (!std::isfinite(val_as_double))
       return nullptr;
+    // Normally, this would be an integer, and fall into IsInt32(). But if the
+    // value is -0, it's treated internally as a double. Consumers are allowed
+    // to ignore this esoterica and treat it as an integer.
+    if (convert_negative_zero_to_int_ && val_as_double == 0.0)
+      return base::MakeUnique<base::FundamentalValue>(0);
     return base::MakeUnique<base::FundamentalValue>(val_as_double);
   }
 

diff --git a/content/child/v8_value_converter_impl.h b/content/child/v8_value_converter_impl.h
index 0cc996e4..1fbc9892 100644
--- a/content/child/v8_value_converter_impl.h
+++ b/content/child/v8_value_converter_impl.h

@@ -30,6 +30,7 @@
   void SetRegExpAllowed(bool val) override;
   void SetFunctionAllowed(bool val) override;
   void SetStripNullFromObjects(bool val) override;
+  void SetConvertNegativeZeroToInt(bool val) override;
   void SetStrategy(Strategy* strategy) override;
   v8::Local<v8::Value> ToV8Value(
       const base::Value* value,
@@ -87,6 +88,9 @@
   // into Values.
   bool strip_null_from_objects_;
 
+  // If true, convert -0 to an integer value (instead of a double).
+  bool convert_negative_zero_to_int_;
+
   bool avoid_identity_hash_for_testing_;
 
   // Strategy object that changes the converter's behavior.

diff --git a/content/child/v8_value_converter_impl_unittest.cc b/content/child/v8_value_converter_impl_unittest.cc
index 84d03fc..c08bc57 100644
--- a/content/child/v8_value_converter_impl_unittest.cc
+++ b/content/child/v8_value_converter_impl_unittest.cc

@@ -952,6 +952,37 @@
   EXPECT_TRUE(base::Value::Equals(&empty, current)) << *current;
 }
 
+TEST_F(V8ValueConverterImplTest, NegativeZero) {
+  v8::HandleScope handle_scope(isolate_);
+  v8::Local<v8::Context> context =
+      v8::Local<v8::Context>::New(isolate_, context_);
+  v8::MicrotasksScope microtasks(isolate_,
+                                 v8::MicrotasksScope::kDoNotRunMicrotasks);
+
+  v8::Context::Scope context_scope(context);
+  const char* source = "(function() { return -0; })();";
+
+  v8::Local<v8::Script> script(
+      v8::Script::Compile(v8::String::NewFromUtf8(isolate_, source)));
+  v8::Local<v8::Value> value = script->Run();
+  ASSERT_FALSE(value.IsEmpty());
+
+  {
+    V8ValueConverterImpl converter;
+    std::unique_ptr<base::Value> result = converter.FromV8Value(value, context);
+    ASSERT_TRUE(result->is_double())
+        << base::Value::GetTypeName(result->type());
+    EXPECT_EQ(0, result->GetDouble());
+  }
+  {
+    V8ValueConverterImpl converter;
+    converter.SetConvertNegativeZeroToInt(true);
+    std::unique_ptr<base::Value> result = converter.FromV8Value(value, context);
+    ASSERT_TRUE(result->is_int()) << base::Value::GetTypeName(result->type());
+    EXPECT_EQ(0, result->GetInt());
+  }
+}
+
 class V8ValueConverterOverridingStrategyForTesting
     : public V8ValueConverter::Strategy {
  public:

diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index 9035417..774d9cb 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h

@@ -147,7 +147,6 @@
   IPC_STRUCT_TRAITS_MEMBER(title_text)
   IPC_STRUCT_TRAITS_MEMBER(suggested_filename)
   IPC_STRUCT_TRAITS_MEMBER(misspelled_word)
-  IPC_STRUCT_TRAITS_MEMBER(misspelling_hash)
   IPC_STRUCT_TRAITS_MEMBER(dictionary_suggestions)
   IPC_STRUCT_TRAITS_MEMBER(spellcheck_enabled)
   IPC_STRUCT_TRAITS_MEMBER(is_editable)

diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc
index a6e5ba6..87babc1 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.cc
+++ b/content/ppapi_plugin/broker_process_dispatcher.cc

@@ -10,7 +10,6 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/debug/dump_without_crashing.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
@@ -119,14 +118,6 @@
   if (!peer_is_browser_) {
     // We might want to consider killing the peer instead is we see problems in
     // the future.
-    if (msg.type() == PpapiMsg_GetSitesWithData::ID ||
-        msg.type() == PpapiMsg_ClearSiteData::ID ||
-        msg.type() == PpapiMsg_DeauthorizeContentLicenses::ID ||
-        msg.type() == PpapiMsg_GetPermissionSettings::ID ||
-        msg.type() == PpapiMsg_SetDefaultPermission::ID ||
-        msg.type() == PpapiMsg_SetSitePermission::ID) {
-      base::debug::DumpWithoutCrashing();
-    }
     return false;
   }
 

diff --git a/content/public/android/java/res/OWNERS b/content/public/android/java/res/OWNERS
index 8780d0c1..6575857e 100644
--- a/content/public/android/java/res/OWNERS
+++ b/content/public/android/java/res/OWNERS

@@ -3,3 +3,5 @@
 dtrainor@chromium.org
 yusufo@chromium.org
 dfalcantara@chromium.org
+
+# COMPONENT: Content>Core

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index b25e034..1bef120 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

@@ -1985,7 +1985,7 @@
     @SuppressWarnings("unused")
     @CalledByNative
     private MotionEventSynthesizer createMotionEventSynthesizer() {
-        return new MotionEventSynthesizer(this);
+        return new MotionEventSynthesizer(getContainerView(), this);
     }
 
     @SuppressWarnings("unused")

diff --git a/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java b/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java
index 355bd48..14c6ace 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MotionEventSynthesizer.java

@@ -8,9 +8,12 @@
 import android.view.MotionEvent;
 import android.view.MotionEvent.PointerCoords;
 import android.view.MotionEvent.PointerProperties;
+import android.view.View;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.ui.display.DisplayAndroid;
 
 /**
  * Provides a Java-side implementation for injecting synthetic touch events.
@@ -24,24 +27,37 @@
     private static final int ACTION_CANCEL = 2;
     private static final int ACTION_END = 3;
     private static final int ACTION_SCROLL = 4;
+    private static final int ACTION_HOVER_ENTER = 5;
+    private static final int ACTION_HOVER_EXIT = 6;
+    private static final int ACTION_HOVER_MOVE = 7;
 
-    private final ContentViewCore mContentViewCore;
+    private final View mTarget;
+    private final WindowAndroidProvider mWindowProvider;
     private final PointerProperties[] mPointerProperties;
     private final PointerCoords[] mPointerCoords;
     private long mDownTimeInMs;
 
-    MotionEventSynthesizer(ContentViewCore contentViewCore) {
-        mContentViewCore = contentViewCore;
+    public MotionEventSynthesizer(View target, WindowAndroidProvider windowProvider) {
+        mTarget = target;
+        mWindowProvider = windowProvider;
         mPointerProperties = new PointerProperties[MAX_NUM_POINTERS];
         mPointerCoords = new PointerCoords[MAX_NUM_POINTERS];
     }
 
+    // Guaranteed to return a non-null DisplayAndroid.
+    private DisplayAndroid getDisplay() {
+        if (mWindowProvider != null && mWindowProvider.getWindowAndroid() != null) {
+            return mWindowProvider.getWindowAndroid().getDisplay();
+        }
+        return DisplayAndroid.getNonMultiDisplay(ContextUtils.getApplicationContext());
+    }
+
     @CalledByNative
     void setPointer(int index, int x, int y, int id) {
         assert (0 <= index && index < MAX_NUM_POINTERS);
 
         // Convert coordinates from density independent pixels to density dependent pixels.
-        float scaleFactor = mContentViewCore.getRenderCoordinates().getDeviceScaleFactor();
+        float scaleFactor = getDisplay().getDipScale();
 
         PointerCoords coords = new PointerCoords();
         coords.x = scaleFactor * x;
@@ -58,7 +74,7 @@
     void setScrollDeltas(int x, int y, int dx, int dy) {
         setPointer(0, x, y, 0);
         // Convert coordinates from density independent pixels to density dependent pixels.
-        float scaleFactor = mContentViewCore.getRenderCoordinates().getDeviceScaleFactor();
+        float scaleFactor = getDisplay().getDipScale();
         mPointerCoords[0].setAxisValue(MotionEvent.AXIS_HSCROLL, scaleFactor * dx);
         mPointerCoords[0].setAxisValue(MotionEvent.AXIS_VSCROLL, scaleFactor * dy);
     }
@@ -72,7 +88,7 @@
                         mDownTimeInMs, timeInMs, MotionEvent.ACTION_DOWN, 1,
                         mPointerProperties, mPointerCoords,
                         0, 0, 1, 1, 0, 0, 0, 0);
-                mContentViewCore.onTouchEvent(event);
+                mTarget.dispatchTouchEvent(event);
                 event.recycle();
 
                 if (pointerCount > 1) {
@@ -81,7 +97,7 @@
                             MotionEvent.ACTION_POINTER_DOWN, pointerCount,
                             mPointerProperties, mPointerCoords,
                             0, 0, 1, 1, 0, 0, 0, 0);
-                    mContentViewCore.onTouchEvent(event);
+                    mTarget.dispatchTouchEvent(event);
                     event.recycle();
                 }
                 break;
@@ -91,7 +107,7 @@
                         MotionEvent.ACTION_MOVE,
                         pointerCount, mPointerProperties, mPointerCoords,
                         0, 0, 1, 1, 0, 0, 0, 0);
-                mContentViewCore.onTouchEvent(event);
+                mTarget.dispatchTouchEvent(event);
                 event.recycle();
                 break;
             }
@@ -100,7 +116,7 @@
                         mDownTimeInMs, timeInMs, MotionEvent.ACTION_CANCEL, 1,
                         mPointerProperties, mPointerCoords,
                         0, 0, 1, 1, 0, 0, 0, 0);
-                mContentViewCore.onTouchEvent(event);
+                mTarget.dispatchTouchEvent(event);
                 event.recycle();
                 break;
             }
@@ -110,7 +126,7 @@
                             mDownTimeInMs, timeInMs, MotionEvent.ACTION_POINTER_UP,
                             pointerCount, mPointerProperties, mPointerCoords,
                             0, 0, 1, 1, 0, 0, 0, 0);
-                    mContentViewCore.onTouchEvent(event);
+                    mTarget.dispatchTouchEvent(event);
                     event.recycle();
                 }
 
@@ -118,7 +134,7 @@
                         mDownTimeInMs, timeInMs, MotionEvent.ACTION_UP, 1,
                         mPointerProperties, mPointerCoords,
                         0, 0, 1, 1, 0, 0, 0, 0);
-                mContentViewCore.onTouchEvent(event);
+                mTarget.dispatchTouchEvent(event);
                 event.recycle();
                 break;
             }
@@ -127,14 +143,32 @@
                 MotionEvent event = MotionEvent.obtain(mDownTimeInMs, timeInMs,
                         MotionEvent.ACTION_SCROLL, pointerCount, mPointerProperties, mPointerCoords,
                         0, 0, 1, 1, 0, 0, InputDevice.SOURCE_CLASS_POINTER, 0);
-                mContentViewCore.onGenericMotionEvent(event);
+                mTarget.dispatchGenericMotionEvent(event);
                 event.recycle();
                 break;
             }
+            case ACTION_HOVER_ENTER:
+            case ACTION_HOVER_EXIT:
+            case ACTION_HOVER_MOVE: {
+                injectHover(action, pointerCount, timeInMs);
+                break;
+            }
             default: {
                 assert false : "Unreached";
                 break;
             }
         }
     }
+
+    private void injectHover(int action, int pointerCount, long timeInMs) {
+        assert pointerCount == 1;
+        int androidAction = MotionEvent.ACTION_HOVER_ENTER;
+        if (ACTION_HOVER_EXIT == action) androidAction = MotionEvent.ACTION_HOVER_EXIT;
+        if (ACTION_HOVER_MOVE == action) androidAction = MotionEvent.ACTION_HOVER_MOVE;
+        MotionEvent event = MotionEvent.obtain(mDownTimeInMs, timeInMs, androidAction, pointerCount,
+                mPointerProperties, mPointerCoords, 0, 0, 1, 1, 0, 0,
+                InputDevice.SOURCE_CLASS_POINTER, 0);
+        mTarget.dispatchGenericMotionEvent(event);
+        event.recycle();
+    }
 }

diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h
index 32963bf..33ce114 100644
--- a/content/public/browser/download_item.h
+++ b/content/public/browser/download_item.h

@@ -102,6 +102,21 @@
     virtual ~Observer() {}
   };
 
+  // A slice of the target file that has been received so far, used when
+  // parallel downloading is enabled. Slices should have different offsets
+  // so that they don't overlap.
+  struct CONTENT_EXPORT ReceivedSlice {
+    ReceivedSlice(int64_t offset, int64_t received_bytes)
+        : offset(offset), received_bytes(received_bytes) {}
+
+    bool operator==(const ReceivedSlice& rhs) const {
+      return offset == rhs.offset && received_bytes == rhs.received_bytes;
+    }
+
+    int64_t offset;
+    int64_t received_bytes;
+  };
+
   ~DownloadItem() override {}
 
   // Observation ---------------------------------------------------------------
@@ -349,6 +364,10 @@
   // file.
   virtual int64_t GetReceivedBytes() const = 0;
 
+  // Return the slices that have been received so far, ordered by their offset.
+  // This is only used when parallel downloading is enabled.
+  virtual const std::vector<ReceivedSlice>& GetReceivedSlices() const = 0;
+
   // Time the download was first started. This timestamp is always valid and
   // doesn't change.
   virtual base::Time GetStartTime() const = 0;

diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h
index 4c46792..7a72e1b 100644
--- a/content/public/browser/download_manager.h
+++ b/content/public/browser/download_manager.h

@@ -150,7 +150,8 @@
       DownloadItem::DownloadState state,
       DownloadDangerType danger_type,
       DownloadInterruptReason interrupt_reason,
-      bool opened) = 0;
+      bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices) = 0;
 
   // The number of in progress (including paused) downloads.
   // Performance note: this loops over all items. If profiling finds that this

diff --git a/content/public/child/v8_value_converter.h b/content/public/child/v8_value_converter.h
index 9afeb397..f53c7c6 100644
--- a/content/public/child/v8_value_converter.h
+++ b/content/public/child/v8_value_converter.h

@@ -100,6 +100,9 @@
   // converting arguments to extension APIs.
   virtual void SetStripNullFromObjects(bool val) = 0;
 
+  // If true, treats -0 as an integer. Otherwise, -0 is converted to a double.
+  virtual void SetConvertNegativeZeroToInt(bool val) = 0;
+
   // Extend default behavior of V8ValueConverter.
   virtual void SetStrategy(Strategy* strategy) = 0;
 

diff --git a/content/public/common/common_param_traits_macros.h b/content/public/common/common_param_traits_macros.h
index bf638a5..a7d48d0 100644
--- a/content/public/common/common_param_traits_macros.h
+++ b/content/public/common/common_param_traits_macros.h

@@ -241,6 +241,7 @@
   IPC_STRUCT_TRAITS_MEMBER(progress_bar_completion)
   IPC_STRUCT_TRAITS_MEMBER(spellcheck_enabled_by_default)
   IPC_STRUCT_TRAITS_MEMBER(video_fullscreen_orientation_lock_enabled)
+  IPC_STRUCT_TRAITS_MEMBER(embedded_media_experience_enabled)
 #else  // defined(OS_ANDROID)
   IPC_STRUCT_TRAITS_MEMBER(cross_origin_media_playback_requires_user_gesture)
 #endif  // defined(OS_ANDROID)

diff --git a/content/public/common/context_menu_params.cc b/content/public/common/context_menu_params.cc
index e29305b..3b202e5a 100644
--- a/content/public/common/context_menu_params.cc
+++ b/content/public/common/context_menu_params.cc

@@ -20,7 +20,6 @@
       y(0),
       has_image_contents(true),
       media_flags(0),
-      misspelling_hash(0),
       spellcheck_enabled(false),
       is_editable(false),
       writing_direction_default(

diff --git a/content/public/common/context_menu_params.h b/content/public/common/context_menu_params.h
index a99bf8f3..f052d3ff 100644
--- a/content/public/common/context_menu_params.h
+++ b/content/public/common/context_menu_params.h

@@ -120,9 +120,6 @@
   // |dictionary_suggestions| list.
   base::string16 misspelled_word;
 
-  // The identifier of the misspelling under the cursor, if any.
-  uint32_t misspelling_hash;
-
   // Suggested replacements for a misspelled word under the cursor.
   // This vector gets populated in the render process host
   // by intercepting ViewHostMsg_ContextMenu in ResourceMessageFilter

diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc
index ba85d1b0..d44ff10 100644
--- a/content/public/common/web_preferences.cc
+++ b/content/public/common/web_preferences.cc

@@ -209,6 +209,7 @@
       progress_bar_completion(ProgressBarCompletion::LOAD_EVENT),
       spellcheck_enabled_by_default(true),
       video_fullscreen_orientation_lock_enabled(false),
+      embedded_media_experience_enabled(false),
 #else  // defined(OS_ANDROID)
       cross_origin_media_playback_requires_user_gesture(false),
 #endif  // defined(OS_ANDROID)

diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h
index 71ea3098..ba18988 100644
--- a/content/public/common/web_preferences.h
+++ b/content/public/common/web_preferences.h

@@ -250,6 +250,7 @@
   bool spellcheck_enabled_by_default;
   // If enabled, when a video goes fullscreen, the orientation should be locked.
   bool video_fullscreen_orientation_lock_enabled;
+  bool embedded_media_experience_enabled;
 #else  // defined(OS_ANDROID)
   bool cross_origin_media_playback_requires_user_gesture;
 #endif  // defined(OS_ANDROID)

diff --git a/content/public/test/android/BUILD.gn b/content/public/test/android/BUILD.gn
index 2d1af8a..91d05b2 100644
--- a/content/public/test/android/BUILD.gn
+++ b/content/public/test/android/BUILD.gn

@@ -29,6 +29,7 @@
   java_files = [
     "javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java",
     "javatests/src/org/chromium/content/browser/test/util/ApplicationUtils.java",
+    "javatests/src/org/chromium/content/browser/test/util/ClickUtils.java",
     "javatests/src/org/chromium/content/browser/test/util/Criteria.java",
     "javatests/src/org/chromium/content/browser/test/util/CriteriaHelper.java",
     "javatests/src/org/chromium/content/browser/test/util/DOMUtils.java",

diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/ClickUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/ClickUtils.java
new file mode 100644
index 0000000..89894d0
--- /dev/null
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/ClickUtils.java

@@ -0,0 +1,100 @@
+// Copyright 2017 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.
+
+package org.chromium.content.browser.test.util;
+
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.chromium.base.ThreadUtils;
+
+/**
+ * Test utils for clicking and other mouse actions.
+ */
+public class ClickUtils {
+    /**
+     * Click a button. Unlike {@link ClickUtils#mouseSingleClickView} this directly accesses
+     * the view and does not send motion events though the message queue. As such it doesn't require
+     * the view to have been created by the instrumented activity, but gives less flexibility than
+     * mouseSingleClickView. For example, if the view is hierachical, then clickButton will always
+     * act on specified view, whereas mouseSingleClickView will send the events to the appropriate
+     * child view. It is hence only really appropriate for simple views such as buttons.
+     *
+     * @param button the button to be clicked.
+     */
+    public static void clickButton(final View button) {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                // Post the actual click to the button's message queue, to ensure that it has been
+                // inflated before the click is received.
+                button.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        button.performClick();
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Sends (synchronously) a single mouse click to the View at the specified coordinates.
+     *
+     * @param instrumentation Instrumentation object used by the test.
+     * @param v The view the coordinates are relative to.
+     * @param x Relative x location to the view.
+     * @param y Relative y location to the view.
+     */
+    public static void mouseSingleClickView(Instrumentation instrumentation, View v, int x, int y) {
+        int location[] = TestTouchUtils.getAbsoluteLocationFromRelative(v, x, y);
+        int absoluteX = location[0];
+        int absoluteY = location[1];
+        mouseSingleClick(instrumentation, absoluteX, absoluteY);
+    }
+
+    /**
+     * Sends (synchronously) a single mouse click to the center of the View.
+     *
+     * @param instrumentation Instrumentation object used by the test.
+     * @param v The view the coordinates are relative to.
+     */
+    public static void mouseSingleClickView(Instrumentation instrumentation, View v) {
+        int x = v.getWidth() / 2;
+        int y = v.getHeight() / 2;
+        mouseSingleClickView(instrumentation, v, x, y);
+    }
+
+    private static void sendMouseAction(
+            Instrumentation instrumentation, int action, long downTime, float x, float y) {
+        long eventTime = SystemClock.uptimeMillis();
+        MotionEvent.PointerCoords coords[] = new MotionEvent.PointerCoords[1];
+        coords[0] = new MotionEvent.PointerCoords();
+        coords[0].x = x;
+        coords[0].y = y;
+        MotionEvent.PointerProperties properties[] = new MotionEvent.PointerProperties[1];
+        properties[0] = new MotionEvent.PointerProperties();
+        properties[0].id = 0;
+        properties[0].toolType = MotionEvent.TOOL_TYPE_FINGER;
+        MotionEvent event = MotionEvent.obtain(
+                downTime, eventTime, action, 1, properties, coords, 0, 0, 0.0f, 0.0f, 0, 0, 0, 0);
+        instrumentation.sendPointerSync(event);
+        instrumentation.waitForIdleSync();
+    }
+
+    /**
+     * Sends (synchronously) a single mouse click to an absolute screen coordinates.
+     *
+     * @param instrumentation Instrumentation object used by the test.
+     * @param x Screen absolute x location.
+     * @param y Screen absolute y location.
+     */
+    private static void mouseSingleClick(Instrumentation instrumentation, float x, float y) {
+        long downTime = SystemClock.uptimeMillis();
+        sendMouseAction(instrumentation, MotionEvent.ACTION_DOWN, downTime, x, y);
+        sendMouseAction(instrumentation, MotionEvent.ACTION_UP, downTime, x, y);
+    }
+}

diff --git a/content/public/test/mock_download_item.h b/content/public/test/mock_download_item.h
index 286176d..d99b6a9 100644
--- a/content/public/test/mock_download_item.h
+++ b/content/public/test/mock_download_item.h

@@ -88,6 +88,8 @@
   MOCK_CONST_METHOD0(AllDataSaved, bool());
   MOCK_CONST_METHOD0(GetTotalBytes, int64_t());
   MOCK_CONST_METHOD0(GetReceivedBytes, int64_t());
+  MOCK_CONST_METHOD0(GetReceivedSlices,
+                     const std::vector<DownloadItem::ReceivedSlice>&());
   MOCK_CONST_METHOD0(GetStartTime, base::Time());
   MOCK_CONST_METHOD0(GetEndTime, base::Time());
   MOCK_METHOD0(CanShowInFolder, bool());

diff --git a/content/public/test/mock_download_manager.cc b/content/public/test/mock_download_manager.cc
index cc2d625..8dca9b2 100644
--- a/content/public/test/mock_download_manager.cc
+++ b/content/public/test/mock_download_manager.cc

@@ -31,7 +31,8 @@
     DownloadItem::DownloadState state,
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
-    bool opened)
+    bool opened,
+    const std::vector<DownloadItem::ReceivedSlice>& received_slices)
     : guid(guid),
       id(id),
       current_path(current_path),
@@ -51,7 +52,8 @@
       state(state),
       danger_type(danger_type),
       interrupt_reason(interrupt_reason),
-      opened(opened) {}
+      opened(opened),
+      received_slices(received_slices) {}
 
 MockDownloadManager::CreateDownloadItemAdapter::CreateDownloadItemAdapter(
     const CreateDownloadItemAdapter& rhs)
@@ -73,7 +75,8 @@
       state(rhs.state),
       danger_type(rhs.danger_type),
       interrupt_reason(rhs.interrupt_reason),
-      opened(rhs.opened) {}
+      opened(rhs.opened),
+      received_slices(rhs.received_slices) {}
 
 MockDownloadManager::CreateDownloadItemAdapter::~CreateDownloadItemAdapter() {}
 
@@ -90,7 +93,8 @@
       etag == rhs.etag && last_modified == rhs.last_modified &&
       received_bytes == rhs.received_bytes && total_bytes == rhs.total_bytes &&
       state == rhs.state && danger_type == rhs.danger_type &&
-      interrupt_reason == rhs.interrupt_reason && opened == rhs.opened);
+      interrupt_reason == rhs.interrupt_reason && opened == rhs.opened &&
+      received_slices == rhs.received_slices);
 }
 
 MockDownloadManager::MockDownloadManager() {}
@@ -126,12 +130,13 @@
     DownloadItem::DownloadState state,
     DownloadDangerType danger_type,
     DownloadInterruptReason interrupt_reason,
-    bool opened) {
+    bool opened,
+    const std::vector<DownloadItem::ReceivedSlice>& received_slices) {
   CreateDownloadItemAdapter adapter(
       guid, id, current_path, target_path, url_chain, referrer_url, site_url,
       tab_url, tab_referrer_url, mime_type, original_mime_type, start_time,
       end_time, etag, last_modified, received_bytes, total_bytes, hash, state,
-      danger_type, interrupt_reason, opened);
+      danger_type, interrupt_reason, opened, received_slices);
   return MockCreateDownloadItem(adapter);
 }
 

diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h
index 2d38450c..1bf0164 100644
--- a/content/public/test/mock_download_manager.h
+++ b/content/public/test/mock_download_manager.h

@@ -52,29 +52,32 @@
     DownloadDangerType danger_type;
     DownloadInterruptReason interrupt_reason;
     bool opened;
+    std::vector<DownloadItem::ReceivedSlice> received_slices;
 
-    CreateDownloadItemAdapter(const std::string& guid,
-                              uint32_t id,
-                              const base::FilePath& current_path,
-                              const base::FilePath& target_path,
-                              const std::vector<GURL>& url_chain,
-                              const GURL& referrer_url,
-                              const GURL& site_url,
-                              const GURL& tab_url,
-                              const GURL& tab_refererr_url,
-                              const std::string& mime_type,
-                              const std::string& original_mime_type,
-                              const base::Time& start_time,
-                              const base::Time& end_time,
-                              const std::string& etag,
-                              const std::string& last_modified,
-                              int64_t received_bytes,
-                              int64_t total_bytes,
-                              const std::string& hash,
-                              DownloadItem::DownloadState state,
-                              DownloadDangerType danger_type,
-                              DownloadInterruptReason interrupt_reason,
-                              bool opened);
+    CreateDownloadItemAdapter(
+        const std::string& guid,
+        uint32_t id,
+        const base::FilePath& current_path,
+        const base::FilePath& target_path,
+        const std::vector<GURL>& url_chain,
+        const GURL& referrer_url,
+        const GURL& site_url,
+        const GURL& tab_url,
+        const GURL& tab_refererr_url,
+        const std::string& mime_type,
+        const std::string& original_mime_type,
+        const base::Time& start_time,
+        const base::Time& end_time,
+        const std::string& etag,
+        const std::string& last_modified,
+        int64_t received_bytes,
+        int64_t total_bytes,
+        const std::string& hash,
+        DownloadItem::DownloadState state,
+        DownloadDangerType danger_type,
+        DownloadInterruptReason interrupt_reason,
+        bool opened,
+        const std::vector<DownloadItem::ReceivedSlice>& received_slices);
     // Required by clang compiler.
     CreateDownloadItemAdapter(const CreateDownloadItemAdapter& rhs);
     ~CreateDownloadItemAdapter();
@@ -112,28 +115,30 @@
   MOCK_METHOD1(RemoveObserver, void(Observer* observer));
 
   // Redirects to mock method to get around gmock 10 argument limit.
-  DownloadItem* CreateDownloadItem(const std::string& guid,
-                                   uint32_t id,
-                                   const base::FilePath& current_path,
-                                   const base::FilePath& target_path,
-                                   const std::vector<GURL>& url_chain,
-                                   const GURL& referrer_url,
-                                   const GURL& site_url,
-                                   const GURL& tab_url,
-                                   const GURL& tab_refererr_url,
-                                   const std::string& mime_type,
-                                   const std::string& original_mime_type,
-                                   const base::Time& start_time,
-                                   const base::Time& end_time,
-                                   const std::string& etag,
-                                   const std::string& last_modified,
-                                   int64_t received_bytes,
-                                   int64_t total_bytes,
-                                   const std::string& hash,
-                                   DownloadItem::DownloadState state,
-                                   DownloadDangerType danger_type,
-                                   DownloadInterruptReason interrupt_reason,
-                                   bool opened) override;
+  DownloadItem* CreateDownloadItem(
+      const std::string& guid,
+      uint32_t id,
+      const base::FilePath& current_path,
+      const base::FilePath& target_path,
+      const std::vector<GURL>& url_chain,
+      const GURL& referrer_url,
+      const GURL& site_url,
+      const GURL& tab_url,
+      const GURL& tab_refererr_url,
+      const std::string& mime_type,
+      const std::string& original_mime_type,
+      const base::Time& start_time,
+      const base::Time& end_time,
+      const std::string& etag,
+      const std::string& last_modified,
+      int64_t received_bytes,
+      int64_t total_bytes,
+      const std::string& hash,
+      DownloadItem::DownloadState state,
+      DownloadDangerType danger_type,
+      DownloadInterruptReason interrupt_reason,
+      bool opened,
+      const std::vector<DownloadItem::ReceivedSlice>& received_slices) override;
 
   MOCK_METHOD1(MockCreateDownloadItem,
                DownloadItem*(CreateDownloadItemAdapter adapter));

diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc
index a344777..1d23a2f 100644
--- a/content/renderer/context_menu_params_builder.cc
+++ b/content/renderer/context_menu_params_builder.cc

@@ -31,7 +31,6 @@
   params.selection_text = data.selectedText.utf16();
   params.title_text = data.titleText.utf16();
   params.misspelled_word = data.misspelledWord.utf16();
-  params.misspelling_hash = data.misspellingHash;
   params.spellcheck_enabled = data.isSpellCheckingEnabled;
   params.is_editable = data.isEditable;
   params.writing_direction_default = data.writingDirectionDefault;

diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
index 7b268c07..1cb4efe7 100644
--- a/content/renderer/input/input_event_filter.cc
+++ b/content/renderer/input/input_event_filter.cc

@@ -126,7 +126,8 @@
   queue->EventHandled(type, result, ack_result);
 }
 
-void InputEventFilter::ProcessRafAlignedInput(int routing_id) {
+void InputEventFilter::ProcessRafAlignedInput(int routing_id,
+                                              base::TimeTicks frame_time) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   scoped_refptr<MainThreadEventQueue> queue;
   {
@@ -137,7 +138,7 @@
     queue = iter->second;
   }
 
-  queue->DispatchRafAlignedInput();
+  queue->DispatchRafAlignedInput(frame_time);
 }
 
 void InputEventFilter::OnFilterAdded(IPC::Channel* channel) {

diff --git a/content/renderer/input/input_event_filter.h b/content/renderer/input/input_event_filter.h
index 11dbb38..939e723 100644
--- a/content/renderer/input/input_event_filter.h
+++ b/content/renderer/input/input_event_filter.h

@@ -75,7 +75,8 @@
                                blink::WebInputEvent::Type type,
                                blink::WebInputEventResult result,
                                InputEventAckState ack_result) override;
-  void ProcessRafAlignedInput(int routing_id) override;
+  void ProcessRafAlignedInput(int routing_id,
+                              base::TimeTicks frame_time) override;
 
   // IPC::MessageFilter methods:
   void OnFilterAdded(IPC::Channel* channel) override;

diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index b039fe2..f1f02b6 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc

@@ -196,8 +196,10 @@
   client_->NotifyInputEventHandled(routing_id, type, result, ack_result);
 }
 
-void InputHandlerManager::ProcessRafAlignedInputOnMainThread(int routing_id) {
-  client_->ProcessRafAlignedInput(routing_id);
+void InputHandlerManager::ProcessRafAlignedInputOnMainThread(
+    int routing_id,
+    base::TimeTicks frame_time) {
+  client_->ProcessRafAlignedInput(routing_id, frame_time);
 }
 
 void InputHandlerManager::HandleInputEvent(

diff --git a/content/renderer/input/input_handler_manager.h b/content/renderer/input/input_handler_manager.h
index 15687ea1..e31d938c72b 100644
--- a/content/renderer/input/input_handler_manager.h
+++ b/content/renderer/input/input_handler_manager.h

@@ -77,7 +77,8 @@
                                            blink::WebInputEvent::Type,
                                            blink::WebInputEventResult,
                                            InputEventAckState);
-  void ProcessRafAlignedInputOnMainThread(int routing_id);
+  void ProcessRafAlignedInputOnMainThread(int routing_id,
+                                          base::TimeTicks frame_time);
 
   // Callback only from the compositor's thread.
   void RemoveInputHandler(int routing_id);

diff --git a/content/renderer/input/input_handler_manager_client.h b/content/renderer/input/input_handler_manager_client.h
index accfb8a..7534010 100644
--- a/content/renderer/input/input_handler_manager_client.h
+++ b/content/renderer/input/input_handler_manager_client.h

@@ -33,7 +33,8 @@
                                        blink::WebInputEvent::Type type,
                                        blink::WebInputEventResult result,
                                        InputEventAckState ack_result) = 0;
-  virtual void ProcessRafAlignedInput(int routing_id) = 0;
+  virtual void ProcessRafAlignedInput(int routing_id,
+                                      base::TimeTicks frame_time) = 0;
 
   // Called from the compositor thread.
   virtual void RegisterRoutingID(int routing_id) = 0;

diff --git a/content/renderer/input/main_thread_event_queue.cc b/content/renderer/input/main_thread_event_queue.cc
index d7337c6..39dd5e5 100644
--- a/content/renderer/input/main_thread_event_queue.cc
+++ b/content/renderer/input/main_thread_event_queue.cc

@@ -14,6 +14,10 @@
 
 namespace {
 
+// Time interval at which touchmove events will be skipped during rAF signal.
+const base::TimeDelta kAsyncTouchMoveInterval =
+    base::TimeDelta::FromMilliseconds(200);
+
 const size_t kTenSeconds = 10 * 1000 * 1000;
 
 bool IsContinuousEvent(const std::unique_ptr<EventWithDispatchType>& event) {
@@ -27,17 +31,27 @@
   }
 }
 
+bool IsAsyncTouchMove(const std::unique_ptr<EventWithDispatchType>& event) {
+  if (event->event().type() != blink::WebInputEvent::TouchMove)
+    return false;
+  const blink::WebTouchEvent& touch_event =
+      static_cast<const blink::WebTouchEvent&>(event->event());
+  return touch_event.movedBeyondSlopRegion && !event->originallyCancelable();
+}
+
 }  // namespace
 
 EventWithDispatchType::EventWithDispatchType(
     ui::WebScopedInputEvent event,
     const ui::LatencyInfo& latency,
-    InputEventDispatchType dispatch_type)
+    InputEventDispatchType dispatch_type,
+    bool originally_cancelable)
     : ScopedWebInputEventWithLatencyInfo(std::move(event), latency),
       dispatch_type_(dispatch_type),
       non_blocking_coalesced_count_(0),
       creation_timestamp_(base::TimeTicks::Now()),
-      last_coalesced_timestamp_(creation_timestamp_) {}
+      last_coalesced_timestamp_(creation_timestamp_),
+      originally_cancelable_(originally_cancelable) {}
 
 EventWithDispatchType::~EventWithDispatchType() {}
 
@@ -53,6 +67,7 @@
   ScopedWebInputEventWithLatencyInfo::CoalesceWith(other);
   dispatch_type_ = other.dispatch_type_;
   last_coalesced_timestamp_ = base::TimeTicks::Now();
+  originally_cancelable_ = other.originally_cancelable_;
 }
 
 MainThreadEventQueue::SharedState::SharedState()
@@ -116,11 +131,15 @@
                       ack_result == INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING;
   bool is_wheel = event->type() == blink::WebInputEvent::MouseWheel;
   bool is_touch = blink::WebInputEvent::isTouchEventType(event->type());
+  bool originally_cancelable = false;
 
   if (is_touch) {
     blink::WebTouchEvent* touch_event =
         static_cast<blink::WebTouchEvent*>(event.get());
 
+    originally_cancelable =
+        touch_event->dispatchType == blink::WebInputEvent::Blocking;
+
     // Adjust the |dispatchType| on the event since the compositor
     // determined all event listeners are passive.
     if (non_blocking) {
@@ -161,18 +180,25 @@
       non_blocking = true;
   }
 
-  if (is_wheel && non_blocking) {
-    // Adjust the |dispatchType| on the event since the compositor
-    // determined all event listeners are passive.
-    static_cast<blink::WebMouseWheelEvent*>(event.get())
-        ->dispatchType = blink::WebInputEvent::ListenersNonBlockingPassive;
+  if (is_wheel) {
+    blink::WebMouseWheelEvent* wheel_event =
+        static_cast<blink::WebMouseWheelEvent*>(event.get());
+    originally_cancelable =
+        wheel_event->dispatchType == blink::WebInputEvent::Blocking;
+    if (non_blocking) {
+      // Adjust the |dispatchType| on the event since the compositor
+      // determined all event listeners are passive.
+      wheel_event->dispatchType =
+          blink::WebInputEvent::ListenersNonBlockingPassive;
+    }
   }
 
   InputEventDispatchType dispatch_type =
       non_blocking ? DISPATCH_TYPE_NON_BLOCKING : DISPATCH_TYPE_BLOCKING;
 
   std::unique_ptr<EventWithDispatchType> event_with_dispatch_type(
-      new EventWithDispatchType(std::move(event), latency, dispatch_type));
+      new EventWithDispatchType(std::move(event), latency, dispatch_type,
+                                originally_cancelable));
 
   QueueEvent(std::move(event_with_dispatch_type));
 
@@ -269,7 +295,7 @@
   }
 }
 
-void MainThreadEventQueue::DispatchRafAlignedInput() {
+void MainThreadEventQueue::DispatchRafAlignedInput(base::TimeTicks frame_time) {
   if (IsRafAlignedInputDisabled())
     return;
 
@@ -278,9 +304,20 @@
     base::AutoLock lock(shared_state_lock_);
     shared_state_.sent_main_frame_request_ = false;
 
-    while(!shared_state_.events_.empty()) {
+    while (!shared_state_.events_.empty()) {
       if (!IsRafAlignedEvent(shared_state_.events_.front()->event()))
         break;
+
+      // Throttle touchmoves that are async.
+      if (handle_raf_aligned_touch_input_ &&
+          IsAsyncTouchMove(shared_state_.events_.front())) {
+        if (shared_state_.events_.size() == 1 &&
+            frame_time < shared_state_.last_async_touch_move_timestamp_ +
+                             kAsyncTouchMoveInterval) {
+          break;
+        }
+        shared_state_.last_async_touch_move_timestamp_ = frame_time;
+      }
       events_to_process.emplace_back(shared_state_.events_.Pop());
     }
   }

diff --git a/content/renderer/input/main_thread_event_queue.h b/content/renderer/input/main_thread_event_queue.h
index 7f2f62a..c793bdd7e 100644
--- a/content/renderer/input/main_thread_event_queue.h
+++ b/content/renderer/input/main_thread_event_queue.h

@@ -24,7 +24,8 @@
  public:
   EventWithDispatchType(ui::WebScopedInputEvent event,
                         const ui::LatencyInfo& latency,
-                        InputEventDispatchType dispatch_type);
+                        InputEventDispatchType dispatch_type,
+                        bool originally_cancelable);
   ~EventWithDispatchType();
   void CoalesceWith(const EventWithDispatchType& other);
 
@@ -41,6 +42,8 @@
     return non_blocking_coalesced_count_ + blocking_coalesced_event_ids_.size();
   }
 
+  bool originallyCancelable() const { return originally_cancelable_; }
+
  private:
   InputEventDispatchType dispatch_type_;
 
@@ -53,6 +56,12 @@
   size_t non_blocking_coalesced_count_;
   base::TimeTicks creation_timestamp_;
   base::TimeTicks last_coalesced_timestamp_;
+
+  // Whether the received event was originally cancelable or not. The compositor
+  // input handler can change the event based on presence of event handlers so
+  // this is the state at which the renderer received the event from the
+  // browser.
+  bool originally_cancelable_;
 };
 
 class CONTENT_EXPORT MainThreadEventQueueClient {
@@ -124,7 +133,7 @@
                    const ui::LatencyInfo& latency,
                    InputEventDispatchType dispatch_type,
                    InputEventAckState ack_result);
-  void DispatchRafAlignedInput();
+  void DispatchRafAlignedInput(base::TimeTicks frame_time);
 
   // Call once the main thread has handled an outstanding |type| event
   // in flight.
@@ -167,6 +176,7 @@
 
     WebInputEventQueue<EventWithDispatchType> events_;
     bool sent_main_frame_request_;
+    base::TimeTicks last_async_touch_move_timestamp_;
   };
 
   // Lock used to serialize |shared_state_|.

diff --git a/content/renderer/input/main_thread_event_queue_unittest.cc b/content/renderer/input/main_thread_event_queue_unittest.cc
index 2cdd7c4..1fe94ddd 100644
--- a/content/renderer/input/main_thread_event_queue_unittest.cc
+++ b/content/renderer/input/main_thread_event_queue_unittest.cc

@@ -42,6 +42,9 @@
 const unsigned kRafAlignedEnabledTouch = 1;
 const unsigned kRafAlignedEnabledMouse = 1 << 1;
 
+// Simulate a 16ms frame signal.
+const base::TimeDelta kFrameInterval = base::TimeDelta::FromMilliseconds(16);
+
 const int kTestRoutingID = 13;
 const char* kCoalescedCountHistogram =
     "Event.MainThreadEventQueue.CoalescedCount";
@@ -114,14 +117,16 @@
     while (needs_main_frame_ || main_task_runner_->HasPendingTask()) {
       main_task_runner_->RunUntilIdle();
       needs_main_frame_ = false;
-      queue_->DispatchRafAlignedInput();
+      frame_time_ += kFrameInterval;
+      queue_->DispatchRafAlignedInput(frame_time_);
     }
   }
 
   void RunSimulatedRafOnce() {
     if (needs_main_frame_) {
       needs_main_frame_ = false;
-      queue_->DispatchRafAlignedInput();
+      frame_time_ += kFrameInterval;
+      queue_->DispatchRafAlignedInput(frame_time_);
     }
   }
 
@@ -135,6 +140,7 @@
   std::vector<uint32_t> additional_acked_events_;
   int raf_aligned_input_setting_;
   bool needs_main_frame_;
+  base::TimeTicks frame_time_;
 };
 
 TEST_P(MainThreadEventQueueTest, NonBlockingWheel) {
@@ -582,6 +588,47 @@
   EXPECT_EQ(0u, additional_acked_events_.size());
 }
 
+TEST_P(MainThreadEventQueueTest, RafAlignedTouchInputThrottlingMoves) {
+  // Don't run the test when we aren't supporting rAF aligned input.
+  if ((raf_aligned_input_setting_ & kRafAlignedEnabledTouch) == 0)
+    return;
+
+  SyntheticWebTouchEvent kEvents[2];
+  kEvents[0].PressPoint(10, 10);
+  kEvents[0].MovePoint(0, 50, 50);
+  kEvents[0].dispatchType = WebInputEvent::EventNonBlocking;
+  kEvents[1].PressPoint(10, 10);
+  kEvents[1].MovePoint(0, 20, 20);
+  kEvents[1].dispatchType = WebInputEvent::EventNonBlocking;
+
+  EXPECT_FALSE(main_task_runner_->HasPendingTask());
+  EXPECT_EQ(0u, event_queue().size());
+
+  // Send a non-cancelable touch move and then send it another one. The
+  // second one shouldn't go out with the next rAF call and should be throttled.
+  EXPECT_TRUE(HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
+  EXPECT_EQ(1u, event_queue().size());
+  EXPECT_FALSE(main_task_runner_->HasPendingTask());
+  EXPECT_TRUE(needs_main_frame_);
+  RunPendingTasksWithSimulatedRaf();
+  EXPECT_TRUE(HandleEvent(kEvents[0], INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
+  EXPECT_TRUE(HandleEvent(kEvents[1], INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
+  EXPECT_EQ(1u, event_queue().size());
+  EXPECT_FALSE(main_task_runner_->HasPendingTask());
+  EXPECT_TRUE(needs_main_frame_);
+
+  // Event should still be in queue after handling a single rAF call.
+  RunSimulatedRafOnce();
+  EXPECT_EQ(1u, event_queue().size());
+  EXPECT_FALSE(main_task_runner_->HasPendingTask());
+  EXPECT_TRUE(needs_main_frame_);
+
+  // And should eventually flush.
+  RunPendingTasksWithSimulatedRaf();
+  EXPECT_EQ(0u, event_queue().size());
+  EXPECT_EQ(0u, additional_acked_events_.size());
+}
+
 TEST_P(MainThreadEventQueueTest, BlockingTouchesDuringFling) {
   SyntheticWebTouchEvent kEvents;
   kEvents.PressPoint(10, 10);

diff --git a/content/renderer/presentation/presentation_dispatcher_unittest.cc b/content/renderer/presentation/presentation_dispatcher_unittest.cc
index 8cf4429..d67f8b9 100644
--- a/content/renderer/presentation/presentation_dispatcher_unittest.cc
+++ b/content/renderer/presentation/presentation_dispatcher_unittest.cc

@@ -76,20 +76,6 @@
                     const base::Optional<std::string>& presentation_id,
                     const JoinSessionCallback& callback));
 
-  // *Internal method is to work around lack of support for move-only types in
-  // GMock.
-  void SendConnectionMessage(
-      const PresentationSessionInfo& session_info,
-      ConnectionMessagePtr message_request,
-      const SendConnectionMessageCallback& callback) override {
-    SendConnectionMessageInternal(session_info, message_request.get(),
-                                  callback);
-  }
-  MOCK_METHOD3(SendConnectionMessageInternal,
-               void(const PresentationSessionInfo& session_info,
-                    ConnectionMessage* message_request,
-                    const SendConnectionMessageCallback& callback));
-
   MOCK_METHOD2(CloseConnection,
                void(const GURL& presentation_url,
                     const std::string& presentation_id));

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 65b2fdc5..d7236cc 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc

@@ -1073,6 +1073,8 @@
 
   WebRuntimeFeatures::enableVideoFullscreenOrientationLock(
       prefs.video_fullscreen_orientation_lock_enabled);
+  settings->setEmbeddedMediaExperienceEnabled(
+      prefs.embedded_media_experience_enabled);
 #else   // defined(OS_ANDROID)
   settings->setCrossOriginMediaPlaybackRequiresUserGesture(
       prefs.cross_origin_media_playback_requires_user_gesture);

diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 0b42e60..f5f43f0 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc

@@ -91,6 +91,7 @@
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ -874,7 +875,8 @@
   InputHandlerManager* input_handler_manager =
       render_thread ? render_thread->input_handler_manager() : NULL;
   if (input_handler_manager)
-    input_handler_manager->ProcessRafAlignedInputOnMainThread(routing_id_);
+    input_handler_manager->ProcessRafAlignedInputOnMainThread(
+        routing_id_, ui::EventTimeStampFromSeconds(frame_time_sec));
 
   GetWebWidget()->beginFrame(frame_time_sec);
 }

diff --git a/content/renderer/sad_plugin.cc b/content/renderer/sad_plugin.cc
index 9f1cee156..5437685f 100644
--- a/content/renderer/sad_plugin.cc
+++ b/content/renderer/sad_plugin.cc

@@ -28,8 +28,7 @@
   cc::PaintFlags flags;
   flags.setStyle(cc::PaintFlags::kFill_Style);
   flags.setColor(SK_ColorBLACK);
-  canvas->drawRectCoords(0, 0, SkIntToScalar(width), SkIntToScalar(height),
-                         flags);
+  canvas->drawRect(SkRect::MakeIWH(width, height), flags);
   canvas->drawBitmap(
       sad_plugin_bitmap,
       SkIntToScalar(std::max(0, (width - sad_plugin_bitmap.width()) / 2)),

diff --git a/content/shell/test_runner/spell_check_client.cc b/content/shell/test_runner/spell_check_client.cc
index a6e0a4fd..adb7040 100644
--- a/content/shell/test_runner/spell_check_client.cc
+++ b/content/shell/test_runner/spell_check_client.cc

@@ -60,8 +60,6 @@
 
 void SpellCheckClient::requestCheckingOfText(
     const blink::WebString& text,
-    const blink::WebVector<uint32_t>& markers,
-    const blink::WebVector<unsigned>& marker_offsets,
     blink::WebTextCheckingCompletion* completion) {
   if (!enabled_ || text.isEmpty()) {
     if (completion) {

diff --git a/content/shell/test_runner/spell_check_client.h b/content/shell/test_runner/spell_check_client.h
index 2ad411ad..c5c2716 100644
--- a/content/shell/test_runner/spell_check_client.h
+++ b/content/shell/test_runner/spell_check_client.h

@@ -48,8 +48,6 @@
       blink::WebVector<blink::WebString>* optional_suggestions) override;
   void requestCheckingOfText(
       const blink::WebString& text,
-      const blink::WebVector<uint32_t>& markers,
-      const blink::WebVector<unsigned>& marker_offsets,
       blink::WebTextCheckingCompletion* completion) override;
   void cancelAllPendingRequests() override;
 

diff --git a/content/test/data/accessibility/html/id-expected-mac.txt b/content/test/data/accessibility/html/id-expected-mac.txt
new file mode 100644
index 0000000..83bca16
--- /dev/null
+++ b/content/test/data/accessibility/html/id-expected-mac.txt

@@ -0,0 +1,5 @@
+AXWebArea
+++AXGroup
+++++AXStaticText AXValue='No id'
+++AXGroup AXDOMIdentifier='para2'
+++++AXStaticText AXValue='Has id'

diff --git a/content/test/data/accessibility/html/id.html b/content/test/data/accessibility/html/id.html
new file mode 100644
index 0000000..578f4bdd
--- /dev/null
+++ b/content/test/data/accessibility/html/id.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<!--
+@MAC-ALLOW:AXDOMIdentifier*
+-->
+<html>
+<body>
+
+<p>No id</p>
+<p id="para2">Has id</p>
+
+</body>
+</html>

diff --git a/content/test/data/gpu/pixel_canvas_display_linear-rgb.html b/content/test/data/gpu/pixel_canvas_display_linear-rgb.html
index 363b1ef..9cae0de 100644
--- a/content/test/data/gpu/pixel_canvas_display_linear-rgb.html
+++ b/content/test/data/gpu/pixel_canvas_display_linear-rgb.html

@@ -15,7 +15,7 @@
 
 function draw()
 {
-  var ctx = document.getElementById("c").getContext("2d", {colorSpace:'linear-rgb'});
+  var ctx = document.getElementById("c").getContext("2d", {colorSpace:"srgb", pixelFormat: "float16"});
   ctx.fillStyle = 'red';
   ctx.fillRect(20,20,50,50);
   ctx.fillStyle = 'green';

diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 4327074e..4d9adf88 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py

@@ -591,6 +591,17 @@
       'swarming': False,
       'os_type': 'linux',
     },
+    'Linux GPU TSAN Release': {
+      'swarming_dimensions': [
+        {
+          'gpu': '10de:104a',
+          'os': 'Ubuntu'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'linux',
+    },
     'Android Release (Nexus 5)': {
       'swarming_dimensions': [
         {

diff --git a/docs/accessibility/patts.md b/docs/accessibility/patts.md
index 5a7fce5..c51b911 100644
--- a/docs/accessibility/patts.md
+++ b/docs/accessibility/patts.md

@@ -33,22 +33,28 @@
 (from the chroot) is call cros_workon with two relevant ebuilds:
 
 ```
-cros_workon --board=$BOARD start chromeos-assets
+cros_workon --board=$BOARD start chromiumos-assets
 cros_workon --board=$BOARD start common-assets
 ```
 
-Next, make sure you're in the platform/assets directory and run
-```repo start``` and create a branch.
+From outside the root, from anywhere under your top-level ```<repo-dir>```, pull down the relevant sources:
 
 ```
-cd platform/assets
+repo sync
+```
+
+Again, outside the root, make sure you're in the ```<repo-dir>/src/platform/assets``` directory and run
+```repo start``` to create a branch:
+
+```
+cd src/platform/assets
 repo start <branch_name> .
 ```
 
 
 The PATTS data files can be found in this directory:
 
-```platform/assets/speech_synthesis/patts```
+```src/platform/assets/speech_synthesis/patts```
 
 When updating the files, the native client files (nexe) need to be zipped.
 

diff --git a/docs/testing/web_platform_tests.md b/docs/testing/web_platform_tests.md
index e3e07a3..a5d90685 100644
--- a/docs/testing/web_platform_tests.md
+++ b/docs/testing/web_platform_tests.md

@@ -101,6 +101,11 @@
     --tests-root=LayoutTests/external/wpt
 ```
 
+Note: the `--work` argument is important even if you have no local changes.
+Without it the `manifest` script will try to generate a manifest for all files
+in the Chromium tree and take a very long time.
+See [wpt-tools issue #171](https://github.com/w3c/wpt-tools/issues/171).
+
 Most tests are written using testharness.js, see
 [Writing Layout Tests](./writing_layout_tests.md) and
 [Layout Tests Tips](./layout_tests_tips.md) for general guidelines.

diff --git a/extensions/renderer/api_binding.cc b/extensions/renderer/api_binding.cc
index 7680509..3ff9e2b4 100644
--- a/extensions/renderer/api_binding.cc
+++ b/extensions/renderer/api_binding.cc

@@ -185,6 +185,23 @@
         }
       }
       type_refs->AddSpec(id, std::move(argument_spec));
+      // Some types, like storage.StorageArea, have functions associated with
+      // them. Cache the function signatures in the type map.
+      const base::ListValue* type_functions = nullptr;
+      if (type_dict->GetList("functions", &type_functions)) {
+        for (const auto& func : *type_functions) {
+          const base::DictionaryValue* func_dict = nullptr;
+          CHECK(func->GetAsDictionary(&func_dict));
+          std::string function_name;
+          CHECK(func_dict->GetString("name", &function_name));
+
+          const base::ListValue* params = nullptr;
+          CHECK(func_dict->GetList("parameters", &params));
+          type_refs->AddTypeMethodSignature(
+              base::StringPrintf("%s.%s", id.c_str(), function_name.c_str()),
+              base::MakeUnique<APISignature>(*params));
+        }
+      }
     }
   }
 

diff --git a/extensions/renderer/api_type_reference_map.cc b/extensions/renderer/api_type_reference_map.cc
index d700e34bc..328cf28 100644
--- a/extensions/renderer/api_type_reference_map.cc
+++ b/extensions/renderer/api_type_reference_map.cc

@@ -4,6 +4,7 @@
 
 #include "extensions/renderer/api_type_reference_map.h"
 
+#include "extensions/renderer/api_signature.h"
 #include "extensions/renderer/argument_spec.h"
 
 namespace extensions {
@@ -29,4 +30,27 @@
   return iter == type_refs_.end() ? nullptr : iter->second.get();
 }
 
+void APITypeReferenceMap::AddTypeMethodSignature(
+    const std::string& name,
+    std::unique_ptr<APISignature> signature) {
+  DCHECK(type_methods_.find(name) == type_methods_.end())
+      << "Cannot re-register signature for: " << name;
+  type_methods_[name] = std::move(signature);
+}
+
+const APISignature* APITypeReferenceMap::GetTypeMethodSignature(
+    const std::string& name) const {
+  auto iter = type_methods_.find(name);
+  if (iter == type_methods_.end()) {
+    // Find the type name by stripping away the method suffix.
+    std::string::size_type dot = name.rfind('.');
+    DCHECK_NE(std::string::npos, dot);
+    DCHECK_LT(dot, name.size() - 1);
+    std::string type_name = name.substr(0, dot);
+    initialize_type_.Run(type_name);
+    iter = type_methods_.find(name);
+  }
+  return iter == type_methods_.end() ? nullptr : iter->second.get();
+}
+
 }  // namespace extensions

diff --git a/extensions/renderer/api_type_reference_map.h b/extensions/renderer/api_type_reference_map.h
index cf572bd1..e960996 100644
--- a/extensions/renderer/api_type_reference_map.h
+++ b/extensions/renderer/api_type_reference_map.h

@@ -13,10 +13,10 @@
 #include "base/macros.h"
 
 namespace extensions {
+class APISignature;
 class ArgumentSpec;
 
-// A map from type name -> ArgumentSpec for API type definitions. This is used
-// when an argument is declared to be a reference to a type defined elsewhere.
+// A map storing type specifications and method signatures for API definitions.
 class APITypeReferenceMap {
  public:
   // A callback used to initialize an unknown type, so that these can be
@@ -32,6 +32,17 @@
   // Returns the spec for the given |name|.
   const ArgumentSpec* GetSpec(const std::string& name) const;
 
+  // Adds the |signature| to the map under the given |name|. |name| is expected
+  // to be fully qualified with API, type, and method (e.g.
+  // storage.StorageArea.get).
+  void AddTypeMethodSignature(const std::string& name,
+                              std::unique_ptr<APISignature> signature);
+
+  // Returns the signature for the given |name|. |name| is expected
+  // to be fully qualified with API, type, and method (e.g.
+  // storage.StorageArea.get).
+  const APISignature* GetTypeMethodSignature(const std::string& name) const;
+
   bool empty() const { return type_refs_.empty(); }
   size_t size() const { return type_refs_.size(); }
 
@@ -40,6 +51,8 @@
 
   std::map<std::string, std::unique_ptr<ArgumentSpec>> type_refs_;
 
+  std::map<std::string, std::unique_ptr<APISignature>> type_methods_;
+
   DISALLOW_COPY_AND_ASSIGN(APITypeReferenceMap);
 };
 

diff --git a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
index 77bc51f..d6b9e6d 100644
--- a/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc
+++ b/extensions/renderer/guest_view/guest_view_internal_custom_bindings.cc

@@ -347,8 +347,7 @@
   if (frame->isWebLocalFrame()) {
     window = frame->mainWorldScriptContext()->Global();
   } else {
-    window =
-        frame->toWebRemoteFrame()->deprecatedMainWorldScriptContext()->Global();
+    window = frame->toWebRemoteFrame()->globalProxy();
   }
   args.GetReturnValue().Set(window);
 }

diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index bb13920f..811e3ca 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

@@ -242,9 +242,7 @@
     guest_proxy_window =
         guest_proxy_frame->mainWorldScriptContext()->Global();
   } else {
-    guest_proxy_window = guest_proxy_frame->toWebRemoteFrame()
-                             ->deprecatedMainWorldScriptContext()
-                             ->Global();
+    guest_proxy_window = guest_proxy_frame->toWebRemoteFrame()->globalProxy();
   }
   gin::Dictionary window_object(isolate, guest_proxy_window);
   v8::Local<v8::Function> post_message;

diff --git a/extensions/renderer/resources/guest_view/guest_view.js b/extensions/renderer/resources/guest_view/guest_view.js
index 1f887a74..939a0b1 100644
--- a/extensions/renderer/resources/guest_view/guest_view.js
+++ b/extensions/renderer/resources/guest_view/guest_view.js

@@ -45,6 +45,10 @@
   this.setupOnResize();
 }
 
+// Prevent GuestViewImpl inadvertently inheriting code from the global Object,
+// allowing a pathway for executing unintended user code execution.
+GuestViewImpl.prototype.__proto__ = null;
+
 // Possible states.
 GuestViewImpl.GuestState = {
   GUEST_STATE_START: 0,

diff --git a/extensions/renderer/resources/guest_view/guest_view_container.js b/extensions/renderer/resources/guest_view/guest_view_container.js
index 8cfc8cb..efec02adb 100644
--- a/extensions/renderer/resources/guest_view/guest_view_container.js
+++ b/extensions/renderer/resources/guest_view/guest_view_container.js

@@ -31,6 +31,10 @@
   GuestViewInternalNatives.RegisterView(this.viewInstanceId, this, viewType);
 }
 
+// Prevent GuestViewContainer inadvertently inheriting code from the global
+// Object, allowing a pathway for executing unintended user code execution.
+GuestViewContainer.prototype.__proto__ = null;
+
 // Forward public API methods from |proto| to their internal implementations.
 GuestViewContainer.forwardApiMethods = function(proto, apiMethods) {
   var createProtoHandler = function(m) {

diff --git a/extensions/renderer/resources/schema_utils.js b/extensions/renderer/resources/schema_utils.js
index 1d1023a0..8f8e26a 100644
--- a/extensions/renderer/resources/schema_utils.js
+++ b/extensions/renderer/resources/schema_utils.js

@@ -117,9 +117,6 @@
   var normalizedArgs = [];
   var ai = 0;
   for (var si = 0; si < definedSignature.length; ++si) {
-    // Handle integer -0 as 0.
-    if (JSONSchemaValidator.getType(args[ai]) === 'integer' && args[ai] === 0)
-      args[ai] = 0;
     if (definedSignature[si] === resolvedSignature[ai])
       $Array.push(normalizedArgs, args[ai++]);
     else

diff --git a/extensions/renderer/send_request_natives.cc b/extensions/renderer/send_request_natives.cc
index 4a32814..5824bc0 100644
--- a/extensions/renderer/send_request_natives.cc
+++ b/extensions/renderer/send_request_natives.cc

@@ -48,6 +48,9 @@
   // we shouldn't really be doing it (e.g. for the sake of the storage API).
   converter->SetFunctionAllowed(true);
 
+  // See http://crbug.com/694248.
+  converter->SetConvertNegativeZeroToInt(true);
+
   if (!preserve_null_in_objects)
     converter->SetStripNullFromObjects(true);
 

diff --git a/extensions/renderer/storage_area.cc b/extensions/renderer/storage_area.cc
index a87a0496..4b68e717 100644
--- a/extensions/renderer/storage_area.cc
+++ b/extensions/renderer/storage_area.cc

@@ -6,11 +6,10 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/values.h"
 #include "extensions/common/api/storage.h"
-#include "extensions/common/extension_api.h"
 #include "extensions/renderer/api_request_handler.h"
 #include "extensions/renderer/api_signature.h"
+#include "extensions/renderer/api_type_reference_map.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
@@ -193,9 +192,12 @@
   std::unique_ptr<base::ListValue> converted_arguments;
   v8::Local<v8::Function> callback;
   std::string error;
-  if (!GetFunctionSchema("storage", "storage.StorageArea", method_name)
-           .ParseArgumentsToJSON(context, argument_list, *type_refs_,
-                                 &converted_arguments, &callback, &error)) {
+  const APISignature* signature = type_refs_->GetTypeMethodSignature(
+      base::StringPrintf("%s.%s", "storage.StorageArea", method_name.c_str()));
+  DCHECK(signature);
+  if (!signature->ParseArgumentsToJSON(context, argument_list, *type_refs_,
+                                       &converted_arguments, &callback,
+                                       &error)) {
     arguments->ThrowTypeError("Invalid invocation");
     return;
   }
@@ -206,50 +208,4 @@
                                  v8::Local<v8::Function>());
 }
 
-const APISignature& StorageArea::GetFunctionSchema(
-    base::StringPiece api_name,
-    base::StringPiece type_name,
-    base::StringPiece function_name) {
-  std::string full_name = base::StringPrintf(
-      "%s.%s.%s", api_name.data(), type_name.data(), function_name.data());
-  auto iter = signatures_.find(full_name);
-  if (iter != signatures_.end())
-    return *iter->second;
-
-  const base::DictionaryValue* full_schema =
-      ExtensionAPI::GetSharedInstance()->GetSchema(api_name.as_string());
-  const base::ListValue* types = nullptr;
-  CHECK(full_schema->GetList("types", &types));
-  const base::DictionaryValue* type_schema = nullptr;
-  for (const auto& type : *types) {
-    const base::DictionaryValue* type_dict = nullptr;
-    CHECK(type->GetAsDictionary(&type_dict));
-    std::string id;
-    CHECK(type_dict->GetString("id", &id));
-    if (id == type_name) {
-      type_schema = type_dict;
-      break;
-    }
-  }
-  CHECK(type_schema);
-  const base::ListValue* type_functions = nullptr;
-  CHECK(type_schema->GetList("functions", &type_functions));
-  const base::ListValue* parameters = nullptr;
-  for (const auto& function : *type_functions) {
-    const base::DictionaryValue* function_dict = nullptr;
-    CHECK(function->GetAsDictionary(&function_dict));
-    std::string name;
-    CHECK(function_dict->GetString("name", &name));
-    if (name == function_name) {
-      CHECK(function_dict->GetList("parameters", &parameters));
-      break;
-    }
-  }
-  CHECK(parameters);
-  auto signature = base::MakeUnique<APISignature>(*parameters);
-  const auto* raw_signature = signature.get();
-  signatures_[full_name] = std::move(signature);
-  return *raw_signature;
-}
-
 }  // namespace extensions

diff --git a/extensions/renderer/storage_area.h b/extensions/renderer/storage_area.h
index 159fd9e5..fbe6df3 100644
--- a/extensions/renderer/storage_area.h
+++ b/extensions/renderer/storage_area.h

@@ -5,7 +5,6 @@
 #ifndef EXTENSIONS_RENDERER_STORAGE_AREA_H_
 #define EXTENSIONS_RENDERER_STORAGE_AREA_H_
 
-#include <map>
 #include <string>
 
 #include "base/macros.h"
@@ -18,7 +17,6 @@
 
 namespace extensions {
 class APIRequestHandler;
-class APISignature;
 class APITypeReferenceMap;
 
 // Implementation of the storage.StorageArea custom type used in the
@@ -41,22 +39,12 @@
                           gin::Arguments* arguments);
 
  private:
-  // Returns the schema associated with the specified function.
-  // TODO(devlin): Other custom types will need this, too; move it out of here
-  // when more exist.
-  const APISignature& GetFunctionSchema(base::StringPiece api_name,
-                                        base::StringPiece type_name,
-                                        base::StringPiece function_name);
-
   APIRequestHandler* request_handler_;
 
   const APITypeReferenceMap* type_refs_;
 
   std::string name_;
 
-  // TODO(devlin): See GetFunctionSchema.
-  std::map<std::string, std::unique_ptr<APISignature>> signatures_;
-
   DISALLOW_COPY_AND_ASSIGN(StorageArea);
 };
 

diff --git a/gpu/command_buffer/common/capabilities.h b/gpu/command_buffer/common/capabilities.h
index b190dcc9..15de84c5 100644
--- a/gpu/command_buffer/common/capabilities.h
+++ b/gpu/command_buffer/common/capabilities.h

@@ -140,7 +140,7 @@
   bool blend_equation_advanced_coherent = false;
   bool texture_rg = false;
   bool texture_half_float_linear = false;
-  bool color_buffer_float = false;
+  bool color_buffer_half_float_rgba = false;
   bool image_ycbcr_422 = false;
   bool image_ycbcr_420v = false;
   bool render_buffer_format_bgra8888 = false;

diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index 3bb365a..6c078a4 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc

@@ -50,6 +50,7 @@
     adjusted_disallowed_features.chromium_color_buffer_float_rgba = true;
     adjusted_disallowed_features.chromium_color_buffer_float_rgb = true;
     adjusted_disallowed_features.ext_color_buffer_float = true;
+    adjusted_disallowed_features.ext_color_buffer_half_float = true;
     adjusted_disallowed_features.oes_texture_float_linear = true;
   }
   return adjusted_disallowed_features;

diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index 8646fd2..5d7e214 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc

@@ -37,7 +37,9 @@
   size_t count;
 };
 
-class StringSet {
+}  // anonymous namespace.
+
+class FeatureInfo::StringSet {
  public:
   StringSet() {}
 
@@ -64,11 +66,11 @@
     string_set_.insert(tokens.begin(), tokens.end());
   }
 
-  bool Contains(const char* s) {
+  bool Contains(const char* s) const {
     return string_set_.find(s) != string_set_.end();
   }
 
-  bool Contains(const std::string& s) {
+  bool Contains(const std::string& s) const {
     return string_set_.find(s) != string_set_.end();
   }
 
@@ -80,6 +82,8 @@
   std::set<std::string> string_set_;
 };
 
+namespace {
+
 class ScopedPixelUnpackBufferOverride {
  public:
   explicit ScopedPixelUnpackBufferOverride(
@@ -236,6 +240,21 @@
   feature_flags_.enable_color_buffer_float = true;
 }
 
+void FeatureInfo::EnableEXTColorBufferHalfFloat() {
+  AddExtensionString("GL_EXT_color_buffer_half_float");
+  validators_.render_buffer_format.AddValue(GL_R16F);
+  validators_.render_buffer_format.AddValue(GL_RG16F);
+  validators_.render_buffer_format.AddValue(GL_RGB16F);
+  validators_.render_buffer_format.AddValue(GL_RGBA16F);
+  validators_.texture_sized_color_renderable_internal_format.AddValue(GL_R16F);
+  validators_.texture_sized_color_renderable_internal_format.AddValue(GL_RG16F);
+  validators_.texture_sized_color_renderable_internal_format.AddValue(
+      GL_RGB16F);
+  validators_.texture_sized_color_renderable_internal_format.AddValue(
+      GL_RGBA16F);
+  feature_flags_.enable_color_buffer_half_float = true;
+}
+
 void FeatureInfo::EnableCHROMIUMColorBufferFloatRGBA() {
   if (!feature_flags_.chromium_color_buffer_float_rgba)
     return;
@@ -655,6 +674,19 @@
     }
   }
 
+  if (enable_texture_storage) {
+    feature_flags_.ext_texture_storage = true;
+    AddExtensionString("GL_EXT_texture_storage");
+    validators_.texture_parameter.AddValue(GL_TEXTURE_IMMUTABLE_FORMAT_EXT);
+    if (enable_texture_format_bgra8888) {
+      validators_.texture_internal_format_storage.AddValue(GL_BGRA8_EXT);
+      validators_.texture_sized_color_renderable_internal_format.AddValue(
+          GL_BGRA8_EXT);
+      validators_.texture_sized_texture_filterable_internal_format.AddValue(
+          GL_BGRA8_EXT);
+    }
+  }
+
   if (enable_texture_format_bgra8888) {
     feature_flags_.ext_texture_format_bgra8888 = true;
     AddExtensionString("GL_EXT_texture_format_BGRA8888");
@@ -725,171 +757,7 @@
     feature_flags_.npot_ok = true;
   }
 
-  // Check if we should allow GL_OES_texture_float, GL_OES_texture_half_float,
-  // GL_OES_texture_float_linear, GL_OES_texture_half_float_linear
-  bool enable_texture_float = false;
-  bool enable_texture_float_linear = false;
-  bool enable_texture_half_float = false;
-  bool enable_texture_half_float_linear = false;
-  bool enable_ext_color_buffer_float = false;
-
-  bool may_enable_chromium_color_buffer_float = false;
-
-  // This extension allows a variety of floating point formats to be
-  // rendered to via framebuffer objects.
-  if (extensions.Contains("GL_EXT_color_buffer_float")) {
-    enable_ext_color_buffer_float = true;
-  }
-
-  if (extensions.Contains("GL_ARB_texture_float") ||
-      gl_version_info_->is_desktop_core_profile) {
-    enable_texture_float = true;
-    enable_texture_float_linear = true;
-    enable_texture_half_float = true;
-    enable_texture_half_float_linear = true;
-    may_enable_chromium_color_buffer_float = true;
-  } else {
-    // GLES3 adds support for Float type by default but it doesn't support all
-    // formats as GL_OES_texture_float(i.e.LUMINANCE_ALPHA,LUMINANCE and Alpha)
-    if (extensions.Contains("GL_OES_texture_float")) {
-      enable_texture_float = true;
-      if (extensions.Contains("GL_OES_texture_float_linear")) {
-        enable_texture_float_linear = true;
-      }
-
-      if (enable_ext_color_buffer_float || gl_version_info_->is_angle) {
-        may_enable_chromium_color_buffer_float = true;
-      }
-    }
-
-    // TODO(dshwang): GLES3 supports half float by default but GL_HALF_FLOAT_OES
-    // isn't equal to GL_HALF_FLOAT.
-    if (extensions.Contains("GL_OES_texture_half_float")) {
-      enable_texture_half_float = true;
-      if (extensions.Contains("GL_OES_texture_half_float_linear")) {
-        enable_texture_half_float_linear = true;
-      }
-    }
-  }
-
-  if (enable_texture_float) {
-    validators_.pixel_type.AddValue(GL_FLOAT);
-    validators_.read_pixel_type.AddValue(GL_FLOAT);
-    AddExtensionString("GL_OES_texture_float");
-    if (enable_texture_float_linear) {
-      oes_texture_float_linear_available_ = true;
-      if (!disallowed_features_.oes_texture_float_linear)
-        EnableOESTextureFloatLinear();
-    }
-  }
-
-  if (enable_texture_half_float) {
-    validators_.pixel_type.AddValue(GL_HALF_FLOAT_OES);
-    validators_.read_pixel_type.AddValue(GL_HALF_FLOAT_OES);
-    AddExtensionString("GL_OES_texture_half_float");
-    if (enable_texture_half_float_linear) {
-      oes_texture_half_float_linear_available_ = true;
-      if (!disallowed_features_.oes_texture_half_float_linear)
-        EnableOESTextureHalfFloatLinear();
-    }
-  }
-
-  if (may_enable_chromium_color_buffer_float) {
-    static_assert(GL_RGBA32F_ARB == GL_RGBA32F &&
-                  GL_RGBA32F_EXT == GL_RGBA32F &&
-                  GL_RGB32F_ARB == GL_RGB32F &&
-                  GL_RGB32F_EXT == GL_RGB32F,
-                  "sized float internal format variations must match");
-    // We don't check extension support beyond ARB_texture_float on desktop GL,
-    // and format support varies between GL configurations. For example, spec
-    // prior to OpenGL 3.0 mandates framebuffer support only for one
-    // implementation-chosen format, and ES3.0 EXT_color_buffer_float does not
-    // support rendering to RGB32F. Check for framebuffer completeness with
-    // formats that the extensions expose, and only enable an extension when a
-    // framebuffer created with its texture format is reported as complete.
-    GLint fb_binding = 0;
-    GLint tex_binding = 0;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fb_binding);
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &tex_binding);
-
-    GLuint tex_id = 0;
-    GLuint fb_id = 0;
-    GLsizei width = 16;
-
-    glGenTextures(1, &tex_id);
-    glGenFramebuffersEXT(1, &fb_id);
-    glBindTexture(GL_TEXTURE_2D, tex_id);
-    // Nearest filter needed for framebuffer completeness on some drivers.
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, width, 0, GL_RGBA,
-                 GL_FLOAT, NULL);
-    glBindFramebufferEXT(GL_FRAMEBUFFER, fb_id);
-    glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                              GL_TEXTURE_2D, tex_id, 0);
-    GLenum status_rgba = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, width, 0, GL_RGB,
-                 GL_FLOAT, NULL);
-    GLenum status_rgb = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
-
-    // For desktop systems, check to see if we support rendering to the full
-    // range of formats supported by EXT_color_buffer_float
-    if (status_rgba == GL_FRAMEBUFFER_COMPLETE && enable_es3) {
-      bool full_float_support = true;
-
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_R16F, width, width, 0, GL_RED,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RG16F, width, width, 0, GL_RG,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, width, width, 0, GL_RGBA,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_R32F, width, width, 0, GL_RED,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, width, width, 0, GL_RG,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-      glTexImage2D(GL_TEXTURE_2D, 0, GL_R11F_G11F_B10F, width, width, 0, GL_RGB,
-          GL_FLOAT, NULL);
-      full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
-          GL_FRAMEBUFFER_COMPLETE;
-
-      enable_ext_color_buffer_float = full_float_support;
-    }
-
-    glDeleteFramebuffersEXT(1, &fb_id);
-    glDeleteTextures(1, &tex_id);
-
-    glBindFramebufferEXT(GL_FRAMEBUFFER, static_cast<GLuint>(fb_binding));
-    glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(tex_binding));
-
-    DCHECK(glGetError() == GL_NO_ERROR);
-
-    if (status_rgba == GL_FRAMEBUFFER_COMPLETE) {
-      feature_flags_.chromium_color_buffer_float_rgba = true;
-      if (!disallowed_features_.chromium_color_buffer_float_rgba)
-        EnableCHROMIUMColorBufferFloatRGBA();
-    }
-    if (status_rgb == GL_FRAMEBUFFER_COMPLETE) {
-      feature_flags_.chromium_color_buffer_float_rgb = true;
-      if (!disallowed_features_.chromium_color_buffer_float_rgb)
-        EnableCHROMIUMColorBufferFloatRGB();
-    }
-  }
-
-  // Enable the GL_EXT_color_buffer_float extension for WebGL 2.0
-  if (enable_ext_color_buffer_float && enable_es3) {
-    ext_color_buffer_float_available_ = true;
-    if (!disallowed_features_.ext_color_buffer_float)
-      EnableEXTColorBufferFloat();
-  }
+  InitializeFloatAndHalfFloatFeatures(extensions);
 
   // Check for multisample support
   if (!workarounds_.disable_chromium_framebuffer_multisample) {
@@ -1083,37 +951,6 @@
     validators_.texture_parameter.AddValue(GL_TEXTURE_USAGE_ANGLE);
   }
 
-  if (enable_texture_storage) {
-    feature_flags_.ext_texture_storage = true;
-    AddExtensionString("GL_EXT_texture_storage");
-    validators_.texture_parameter.AddValue(GL_TEXTURE_IMMUTABLE_FORMAT_EXT);
-    if (enable_texture_format_bgra8888) {
-      validators_.texture_internal_format_storage.AddValue(GL_BGRA8_EXT);
-      validators_.texture_sized_color_renderable_internal_format.AddValue(
-          GL_BGRA8_EXT);
-      validators_.texture_sized_texture_filterable_internal_format.AddValue(
-          GL_BGRA8_EXT);
-    }
-    if (enable_texture_float) {
-        validators_.texture_internal_format_storage.AddValue(GL_RGBA32F_EXT);
-        validators_.texture_internal_format_storage.AddValue(GL_RGB32F_EXT);
-        validators_.texture_internal_format_storage.AddValue(GL_ALPHA32F_EXT);
-        validators_.texture_internal_format_storage.AddValue(
-            GL_LUMINANCE32F_EXT);
-        validators_.texture_internal_format_storage.AddValue(
-            GL_LUMINANCE_ALPHA32F_EXT);
-    }
-    if (enable_texture_half_float) {
-        validators_.texture_internal_format_storage.AddValue(GL_RGBA16F_EXT);
-        validators_.texture_internal_format_storage.AddValue(GL_RGB16F_EXT);
-        validators_.texture_internal_format_storage.AddValue(GL_ALPHA16F_EXT);
-        validators_.texture_internal_format_storage.AddValue(
-            GL_LUMINANCE16F_EXT);
-        validators_.texture_internal_format_storage.AddValue(
-            GL_LUMINANCE_ALPHA16F_EXT);
-    }
-  }
-
   bool have_occlusion_query =
       gl_version_info_->IsAtLeastGLES(3, 0) ||
       gl_version_info_->IsAtLeastGL(3, 3);
@@ -1418,6 +1255,214 @@
       extensions.Contains("GL_ANGLE_client_arrays");
 }
 
+void FeatureInfo::InitializeFloatAndHalfFloatFeatures(
+    const StringSet& extensions) {
+  // Check if we should allow GL_OES_texture_float, GL_OES_texture_half_float,
+  // GL_OES_texture_float_linear, GL_OES_texture_half_float_linear
+  bool enable_texture_float = false;
+  bool enable_texture_float_linear = false;
+  bool enable_texture_half_float = false;
+  bool enable_texture_half_float_linear = false;
+  bool enable_ext_color_buffer_float = false;
+  bool enable_ext_color_buffer_half_float = false;
+
+  bool may_enable_chromium_color_buffer_float = false;
+
+  bool enable_es3 = IsWebGL2OrES3Context();
+
+  // These extensions allow a variety of floating point formats to be
+  // rendered to via framebuffer objects.
+  if (extensions.Contains("GL_EXT_color_buffer_float"))
+    enable_ext_color_buffer_float = true;
+  if (extensions.Contains("GL_EXT_color_buffer_half_float"))
+    enable_ext_color_buffer_half_float = true;
+
+  if (extensions.Contains("GL_ARB_texture_float") ||
+      gl_version_info_->is_desktop_core_profile) {
+    enable_texture_float = true;
+    enable_texture_float_linear = true;
+    enable_texture_half_float = true;
+    enable_texture_half_float_linear = true;
+    may_enable_chromium_color_buffer_float = true;
+  } else {
+    // GLES3 adds support for Float type by default but it doesn't support all
+    // formats as GL_OES_texture_float(i.e.LUMINANCE_ALPHA,LUMINANCE and Alpha)
+    if (extensions.Contains("GL_OES_texture_float")) {
+      enable_texture_float = true;
+      if (extensions.Contains("GL_OES_texture_float_linear")) {
+        enable_texture_float_linear = true;
+      }
+
+      if (enable_ext_color_buffer_float || gl_version_info_->is_angle) {
+        may_enable_chromium_color_buffer_float = true;
+      }
+    }
+
+    // TODO(dshwang): GLES3 supports half float by default but GL_HALF_FLOAT_OES
+    // isn't equal to GL_HALF_FLOAT.
+    if (extensions.Contains("GL_OES_texture_half_float")) {
+      enable_texture_half_float = true;
+      if (extensions.Contains("GL_OES_texture_half_float_linear")) {
+        enable_texture_half_float_linear = true;
+      }
+    }
+  }
+
+  if (enable_texture_float) {
+    validators_.pixel_type.AddValue(GL_FLOAT);
+    validators_.read_pixel_type.AddValue(GL_FLOAT);
+    AddExtensionString("GL_OES_texture_float");
+    if (enable_texture_float_linear) {
+      oes_texture_float_linear_available_ = true;
+      if (!disallowed_features_.oes_texture_float_linear)
+        EnableOESTextureFloatLinear();
+    }
+  }
+
+  if (enable_texture_half_float) {
+    validators_.pixel_type.AddValue(GL_HALF_FLOAT_OES);
+    validators_.read_pixel_type.AddValue(GL_HALF_FLOAT_OES);
+    AddExtensionString("GL_OES_texture_half_float");
+    if (enable_texture_half_float_linear) {
+      oes_texture_half_float_linear_available_ = true;
+      if (!disallowed_features_.oes_texture_half_float_linear)
+        EnableOESTextureHalfFloatLinear();
+    }
+  }
+
+  if (may_enable_chromium_color_buffer_float) {
+    static_assert(GL_RGBA32F_ARB == GL_RGBA32F &&
+                      GL_RGBA32F_EXT == GL_RGBA32F &&
+                      GL_RGB32F_ARB == GL_RGB32F && GL_RGB32F_EXT == GL_RGB32F,
+                  "sized float internal format variations must match");
+    // We don't check extension support beyond ARB_texture_float on desktop GL,
+    // and format support varies between GL configurations. For example, spec
+    // prior to OpenGL 3.0 mandates framebuffer support only for one
+    // implementation-chosen format, and ES3.0 EXT_color_buffer_float does not
+    // support rendering to RGB32F. Check for framebuffer completeness with
+    // formats that the extensions expose, and only enable an extension when a
+    // framebuffer created with its texture format is reported as complete.
+    GLint fb_binding = 0;
+    GLint tex_binding = 0;
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fb_binding);
+    glGetIntegerv(GL_TEXTURE_BINDING_2D, &tex_binding);
+
+    GLuint tex_id = 0;
+    GLuint fb_id = 0;
+    GLsizei width = 16;
+
+    glGenTextures(1, &tex_id);
+    glGenFramebuffersEXT(1, &fb_id);
+    glBindTexture(GL_TEXTURE_2D, tex_id);
+    // Nearest filter needed for framebuffer completeness on some drivers.
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, width, 0, GL_RGBA,
+                 GL_FLOAT, NULL);
+    glBindFramebufferEXT(GL_FRAMEBUFFER, fb_id);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                              GL_TEXTURE_2D, tex_id, 0);
+    GLenum status_rgba = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB32F, width, width, 0, GL_RGB, GL_FLOAT,
+                 NULL);
+    GLenum status_rgb = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
+
+    // For desktop systems, check to see if we support rendering to the full
+    // range of formats supported by EXT_color_buffer_float
+    if (status_rgba == GL_FRAMEBUFFER_COMPLETE && enable_es3) {
+      bool full_float_support = true;
+      GLenum internal_formats[] = {
+          GL_R16F, GL_RG16F, GL_RGBA16F, GL_R32F, GL_RG32F, GL_R11F_G11F_B10F,
+      };
+      GLenum formats[] = {
+          GL_RED, GL_RG, GL_RGBA, GL_RED, GL_RG, GL_RGB,
+      };
+      DCHECK_EQ(arraysize(internal_formats), arraysize(formats));
+      for (size_t i = 0; i < arraysize(formats); ++i) {
+        glTexImage2D(GL_TEXTURE_2D, 0, internal_formats[i], width, width, 0,
+                     formats[i], GL_FLOAT, NULL);
+        full_float_support &= glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
+                              GL_FRAMEBUFFER_COMPLETE;
+      }
+      enable_ext_color_buffer_float = full_float_support;
+    }
+    // Likewise for EXT_color_buffer_half_float on ES2 contexts.
+    if (IsWebGL1OrES2Context() && !enable_ext_color_buffer_half_float) {
+      bool full_half_float_support = true;
+      GLenum internal_formats[] = {
+          GL_R16F, GL_RG16F, GL_RGBA16F,
+      };
+      GLenum formats[] = {
+          GL_RED, GL_RG, GL_RGBA,
+      };
+      GLenum data_type = GL_FLOAT;
+      if (gl_version_info_->is_es2)
+        data_type = GL_HALF_FLOAT_OES;
+      if (gl_version_info_->is_es3)
+        data_type = GL_HALF_FLOAT;
+      DCHECK_EQ(arraysize(internal_formats), arraysize(formats));
+      for (size_t i = 0; i < arraysize(formats); ++i) {
+        glTexImage2D(GL_TEXTURE_2D, 0, internal_formats[i], width, width, 0,
+                     formats[i], data_type, NULL);
+        full_half_float_support &=
+            glCheckFramebufferStatusEXT(GL_FRAMEBUFFER) ==
+            GL_FRAMEBUFFER_COMPLETE;
+      }
+      enable_ext_color_buffer_half_float = full_half_float_support;
+    }
+
+    glDeleteFramebuffersEXT(1, &fb_id);
+    glDeleteTextures(1, &tex_id);
+
+    glBindFramebufferEXT(GL_FRAMEBUFFER, static_cast<GLuint>(fb_binding));
+    glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(tex_binding));
+
+    DCHECK_EQ(glGetError(), static_cast<GLuint>(GL_NO_ERROR));
+
+    if (status_rgba == GL_FRAMEBUFFER_COMPLETE) {
+      feature_flags_.chromium_color_buffer_float_rgba = true;
+      if (!disallowed_features_.chromium_color_buffer_float_rgba)
+        EnableCHROMIUMColorBufferFloatRGBA();
+    }
+    if (status_rgb == GL_FRAMEBUFFER_COMPLETE) {
+      feature_flags_.chromium_color_buffer_float_rgb = true;
+      if (!disallowed_features_.chromium_color_buffer_float_rgb)
+        EnableCHROMIUMColorBufferFloatRGB();
+    }
+  }
+
+  // Enable the GL_EXT_color_buffer_float extension for WebGL 2.0
+  if (enable_ext_color_buffer_float && enable_es3) {
+    ext_color_buffer_float_available_ = true;
+    if (!disallowed_features_.ext_color_buffer_float)
+      EnableEXTColorBufferFloat();
+  }
+
+  // Enable GL_EXT_color_buffer_half_float if we have found the capability.
+  if (enable_ext_color_buffer_half_float &&
+      !disallowed_features_.ext_color_buffer_half_float) {
+    EnableEXTColorBufferHalfFloat();
+  }
+
+  if (feature_flags_.ext_texture_storage) {
+    if (enable_texture_float) {
+      validators_.texture_internal_format_storage.AddValue(GL_RGBA32F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_RGB32F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_ALPHA32F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_LUMINANCE32F_EXT);
+      validators_.texture_internal_format_storage.AddValue(
+          GL_LUMINANCE_ALPHA32F_EXT);
+    }
+    if (enable_texture_half_float) {
+      validators_.texture_internal_format_storage.AddValue(GL_RGBA16F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_RGB16F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_ALPHA16F_EXT);
+      validators_.texture_internal_format_storage.AddValue(GL_LUMINANCE16F_EXT);
+      validators_.texture_internal_format_storage.AddValue(
+          GL_LUMINANCE_ALPHA16F_EXT);
+    }
+  }
+}
+
 bool FeatureInfo::IsES3Capable() const {
   if (workarounds_.disable_texture_storage)
     return false;

diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h
index fa0da85f..a2a7f51 100644
--- a/gpu/command_buffer/service/feature_info.h
+++ b/gpu/command_buffer/service/feature_info.h

@@ -53,6 +53,7 @@
     bool enable_texture_float_linear = false;
     bool enable_texture_half_float_linear = false;
     bool enable_color_buffer_float = false;
+    bool enable_color_buffer_half_float = false;
     bool angle_translated_shader_source = false;
     bool angle_pack_reverse_row_order = false;
     bool arb_texture_rectangle = false;
@@ -167,6 +168,7 @@
   void EnableCHROMIUMColorBufferFloatRGBA();
   void EnableCHROMIUMColorBufferFloatRGB();
   void EnableEXTColorBufferFloat();
+  void EnableEXTColorBufferHalfFloat();
   void EnableOESTextureFloatLinear();
   void EnableOESTextureHalfFloatLinear();
 
@@ -181,12 +183,14 @@
  private:
   friend class base::RefCounted<FeatureInfo>;
   friend class BufferManagerClientSideArraysTest;
+  class StringSet;
 
   ~FeatureInfo();
 
   void AddExtensionString(const char* s);
   void InitializeBasicState(const base::CommandLine* command_line);
   void InitializeFeatures();
+  void InitializeFloatAndHalfFloatFeatures(const StringSet& extensions);
 
   Validators validators_;
 

diff --git a/gpu/command_buffer/service/framebuffer_manager.cc b/gpu/command_buffer/service/framebuffer_manager.cc
index 6391295..55ed2e1 100644
--- a/gpu/command_buffer/service/framebuffer_manager.cc
+++ b/gpu/command_buffer/service/framebuffer_manager.cc

@@ -269,6 +269,10 @@
         internal_format == GL_LUMINANCE_ALPHA) {
       return false;
     }
+    // Disallow RGB16F, because it is only supported in ES2 and not ES3.
+    if (internal_format == GL_RGB16F) {
+      return false;
+    }
     return (need & have) != 0;
   }
 

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 344671b..67eab70d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -3745,8 +3745,9 @@
   caps.texture_rg = feature_info_->feature_flags().ext_texture_rg;
   caps.texture_half_float_linear =
       feature_info_->feature_flags().enable_texture_half_float_linear;
-  caps.color_buffer_float =
-      feature_info_->feature_flags().enable_color_buffer_float;
+  caps.color_buffer_half_float_rgba =
+      feature_info_->feature_flags().enable_color_buffer_float ||
+      feature_info_->feature_flags().enable_color_buffer_half_float;
   caps.image_ycbcr_422 =
       feature_info_->feature_flags().chromium_image_ycbcr_422;
   caps.image_ycbcr_420v =

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h
index ae2269517..c53b522 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.h

@@ -54,31 +54,25 @@
 struct ContextState;
 
 struct DisallowedFeatures {
-  DisallowedFeatures()
-      : gpu_memory_manager(false),
-        npot_support(false),
-        chromium_color_buffer_float_rgba(false),
-        chromium_color_buffer_float_rgb(false),
-        ext_color_buffer_float(false),
-        oes_texture_float_linear(false),
-        oes_texture_half_float_linear(false) {
-  }
+  DisallowedFeatures() {}
 
   void AllowExtensions() {
     chromium_color_buffer_float_rgba = false;
     chromium_color_buffer_float_rgb = false;
     ext_color_buffer_float = false;
+    ext_color_buffer_half_float = false;
     oes_texture_float_linear = false;
     oes_texture_half_float_linear = false;
   }
 
-  bool gpu_memory_manager;
-  bool npot_support;
-  bool chromium_color_buffer_float_rgba;
-  bool chromium_color_buffer_float_rgb;
-  bool ext_color_buffer_float;
-  bool oes_texture_float_linear;
-  bool oes_texture_half_float_linear;
+  bool gpu_memory_manager = false;
+  bool npot_support = false;
+  bool chromium_color_buffer_float_rgba = false;
+  bool chromium_color_buffer_float_rgb = false;
+  bool ext_color_buffer_float = false;
+  bool ext_color_buffer_half_float = false;
+  bool oes_texture_float_linear = false;
+  bool oes_texture_half_float_linear = false;
 };
 
 typedef base::Callback<void(const std::string& key,

diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index b5fa864..dc4e3ac 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc

@@ -638,6 +638,32 @@
           .RetiresOnSaturation();
     }
 
+    if (!enable_es3 && !strstr(extensions, "GL_EXT_color_buffer_half_float")) {
+      EXPECT_CALL(
+          *gl,
+          TexImage2D(GL_TEXTURE_2D, 0, GL_R16F, width, width, 0, GL_RED, _, _))
+          .Times(1)
+          .RetiresOnSaturation();
+      EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
+          .Times(1)
+          .RetiresOnSaturation();
+      EXPECT_CALL(
+          *gl,
+          TexImage2D(GL_TEXTURE_2D, 0, GL_RG16F, width, width, 0, GL_RG, _, _))
+          .Times(1)
+          .RetiresOnSaturation();
+      EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
+          .Times(1)
+          .RetiresOnSaturation();
+      EXPECT_CALL(*gl,
+                  TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F, width, width, 0,
+                             GL_RGBA, _, _))
+          .Times(1)
+          .RetiresOnSaturation();
+      EXPECT_CALL(*gl, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
+          .Times(1)
+          .RetiresOnSaturation();
+    }
 
     EXPECT_CALL(*gl, DeleteFramebuffersEXT(1, _))
         .Times(1)

diff --git a/gpu/config/gpu_driver_bug_list_json.cc b/gpu/config/gpu_driver_bug_list_json.cc
index 3006d298..a301a1ae8 100644
--- a/gpu/config/gpu_driver_bug_list_json.cc
+++ b/gpu/config/gpu_driver_bug_list_json.cc

@@ -2214,7 +2214,7 @@
         "type": "android",
         "version": {
           "op": "=",
-          "value": "7.1"
+          "value": "7.1.0"
         }
       },
       "gl_renderer": "Adreno \\(TM\\) 5.*",

diff --git a/gpu/ipc/common/gpu_command_buffer_traits_multi.h b/gpu/ipc/common/gpu_command_buffer_traits_multi.h
index 33fa07b6f..bb52e5b 100644
--- a/gpu/ipc/common/gpu_command_buffer_traits_multi.h
+++ b/gpu/ipc/common/gpu_command_buffer_traits_multi.h

@@ -111,7 +111,7 @@
   IPC_STRUCT_TRAITS_MEMBER(blend_equation_advanced_coherent)
   IPC_STRUCT_TRAITS_MEMBER(texture_rg)
   IPC_STRUCT_TRAITS_MEMBER(texture_half_float_linear)
-  IPC_STRUCT_TRAITS_MEMBER(color_buffer_float)
+  IPC_STRUCT_TRAITS_MEMBER(color_buffer_half_float_rgba)
   IPC_STRUCT_TRAITS_MEMBER(image_ycbcr_422)
   IPC_STRUCT_TRAITS_MEMBER(image_ycbcr_420v)
   IPC_STRUCT_TRAITS_MEMBER(render_buffer_format_bgra8888)

diff --git a/gpu/ipc/service/child_window_surface_win.cc b/gpu/ipc/service/child_window_surface_win.cc
index 92a9392..f04f674 100644
--- a/gpu/ipc/service/child_window_surface_win.cc
+++ b/gpu/ipc/service/child_window_surface_win.cc

@@ -11,6 +11,7 @@
 #include "gpu/ipc/common/gpu_messages.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/egl_util.h"
 #include "ui/gl/gl_context.h"
@@ -34,15 +35,19 @@
 EGLConfig ChildWindowSurfaceWin::GetConfig() {
   if (!config_) {
     int alpha_size = alpha_ ? 8 : EGL_DONT_CARE;
+    int bits_per_channel = base::CommandLine::ForCurrentProcess()->HasSwitch(
+                               switches::kEnableHDROutput)
+                               ? 16
+                               : 8;
 
     EGLint config_attribs[] = {EGL_ALPHA_SIZE,
                                alpha_size,
                                EGL_BLUE_SIZE,
-                               8,
+                               bits_per_channel,
                                EGL_GREEN_SIZE,
-                               8,
+                               bits_per_channel,
                                EGL_RED_SIZE,
-                               8,
+                               bits_per_channel,
                                EGL_RENDERABLE_TYPE,
                                EGL_OPENGL_ES2_BIT,
                                EGL_SURFACE_TYPE,

diff --git a/gpu/ipc/service/gpu_vsync_provider_win.cc b/gpu/ipc/service/gpu_vsync_provider_win.cc
index 97eb394..dccb122 100644
--- a/gpu/ipc/service/gpu_vsync_provider_win.cc
+++ b/gpu/ipc/service/gpu_vsync_provider_win.cc

@@ -190,11 +190,12 @@
     OpenAdapter(monitor_info.szDevice);
   }
 
-  if (WaitForVBlankEvent()) {
-    vsync_provider_->GetVSyncParameters(
-        base::Bind(&GpuVSyncWorker::SendVSyncUpdate, base::Unretained(this),
-                   base::TimeTicks::Now()));
-  }
+  // Crash if WaitForVBlankEvent fails to avoid spinning the loop.
+  CHECK(WaitForVBlankEvent());
+
+  vsync_provider_->GetVSyncParameters(
+      base::Bind(&GpuVSyncWorker::SendVSyncUpdate, base::Unretained(this),
+                 base::TimeTicks::Now()));
 
   Reschedule();
 }
@@ -209,7 +210,7 @@
     // be up to 2-3 vsync cycles in the past or in the future.
     // The adjustment formula was suggested here:
     // http://www.vsynctester.com/firefoxisbroken.html
-    base::TimeDelta adjustment =
+    adjustment =
         ((now - timestamp + interval / 8) % interval + interval) % interval -
         interval / 8;
     timestamp = now - adjustment;

diff --git a/gpu/ipc/service/image_transport_surface_win.cc b/gpu/ipc/service/image_transport_surface_win.cc
index 5fcaf7f59..236c42c 100644
--- a/gpu/ipc/service/image_transport_surface_win.cc
+++ b/gpu/ipc/service/image_transport_surface_win.cc

@@ -40,8 +40,7 @@
   DCHECK_NE(surface_handle, kNullSurfaceHandle);
 
   scoped_refptr<gl::GLSurface> surface;
-  if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 &&
-      gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
+  if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2) {
     std::unique_ptr<gfx::VSyncProvider> vsync_provider;
 
     if (IsGpuVSyncSignalSupported())
@@ -49,19 +48,26 @@
     else
       vsync_provider.reset(new gl::VSyncProviderWin(surface_handle));
 
-    if (base::FeatureList::IsEnabled(switches::kDirectCompositionOverlays)) {
-      scoped_refptr<DirectCompositionSurfaceWin> egl_surface =
-          make_scoped_refptr(
-              new DirectCompositionSurfaceWin(delegate, surface_handle));
-      if (!egl_surface->Initialize(std::move(vsync_provider)))
-        return nullptr;
-      surface = egl_surface;
+    if (gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
+      if (base::FeatureList::IsEnabled(switches::kDirectCompositionOverlays)) {
+        scoped_refptr<DirectCompositionSurfaceWin> egl_surface =
+            make_scoped_refptr(
+                new DirectCompositionSurfaceWin(delegate, surface_handle));
+        if (!egl_surface->Initialize(std::move(vsync_provider)))
+          return nullptr;
+        surface = egl_surface;
+      } else {
+        scoped_refptr<ChildWindowSurfaceWin> egl_surface = make_scoped_refptr(
+            new ChildWindowSurfaceWin(delegate, surface_handle));
+        if (!egl_surface->Initialize(std::move(vsync_provider)))
+          return nullptr;
+        surface = egl_surface;
+      }
     } else {
-      scoped_refptr<ChildWindowSurfaceWin> egl_surface = make_scoped_refptr(
-          new ChildWindowSurfaceWin(delegate, surface_handle));
-      if (!egl_surface->Initialize(std::move(vsync_provider)))
+      surface = gl::init::CreateNativeViewGLSurfaceEGL(
+          surface_handle, std::move(vsync_provider));
+      if (!surface)
         return nullptr;
-      surface = egl_surface;
     }
   } else {
     surface = gl::init::CreateViewGLSurface(surface_handle);

diff --git a/ios/chrome/browser/browser_state_metrics/OWNERS b/ios/chrome/browser/browser_state_metrics/OWNERS
index 367bb85d..e43d48c 100644
--- a/ios/chrome/browser/browser_state_metrics/OWNERS
+++ b/ios/chrome/browser/browser_state_metrics/OWNERS

@@ -1,3 +1,5 @@
 anthonyvd@chromium.org
 erg@chromium.org
 mlerman@chromium.org
+
+# COMPONENT: UI>Browser>Profiles

diff --git a/ios/chrome/browser/payments/BUILD.gn b/ios/chrome/browser/payments/BUILD.gn
index 52cdde4..aa274121 100644
--- a/ios/chrome/browser/payments/BUILD.gn
+++ b/ios/chrome/browser/payments/BUILD.gn

@@ -11,6 +11,7 @@
 }
 
 source_set("payments") {
+  configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "js_payment_request_manager.h",
     "js_payment_request_manager.mm",

diff --git a/ios/chrome/browser/payments/js_payment_request_manager.mm b/ios/chrome/browser/payments/js_payment_request_manager.mm
index cd8cb5c1..48337a4 100644
--- a/ios/chrome/browser/payments/js_payment_request_manager.mm
+++ b/ios/chrome/browser/payments/js_payment_request_manager.mm

@@ -10,6 +10,10 @@
 #include "base/values.h"
 #include "ios/web/public/payments/payment_request.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 
 // Sanitizes |JSON| and wraps it in quotes so it can be injected safely in

diff --git a/ios/chrome/browser/payments/payment_items_display_coordinator.mm b/ios/chrome/browser/payments/payment_items_display_coordinator.mm
index daa6779..b6b23da 100644
--- a/ios/chrome/browser/payments/payment_items_display_coordinator.mm
+++ b/ios/chrome/browser/payments/payment_items_display_coordinator.mm

@@ -4,13 +4,15 @@
 
 #import "ios/chrome/browser/payments/payment_items_display_coordinator.h"
 
-#import "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
+#include "base/logging.h"
 #include "ios/web/public/payments/payment_request.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 @interface PaymentItemsDisplayCoordinator () {
-  base::WeakNSProtocol<id<PaymentItemsDisplayCoordinatorDelegate>> _delegate;
-  base::scoped_nsobject<PaymentItemsDisplayViewController> _viewController;
+  PaymentItemsDisplayViewController* _viewController;
 }
 
 @end
@@ -18,20 +20,13 @@
 @implementation PaymentItemsDisplayCoordinator
 
 @synthesize paymentRequest = _paymentRequest;
-
-- (id<PaymentItemsDisplayCoordinatorDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentItemsDisplayCoordinatorDelegate>)delegate {
-  _delegate.reset(delegate);
-}
+@synthesize delegate = _delegate;
 
 - (void)start {
   BOOL payButtonEnabled = _paymentRequest->selected_credit_card() != nil;
-  _viewController.reset([[PaymentItemsDisplayViewController alloc]
+  _viewController = [[PaymentItemsDisplayViewController alloc]
       initWithPaymentRequest:_paymentRequest
-            payButtonEnabled:payButtonEnabled]);
+            payButtonEnabled:payButtonEnabled];
   [_viewController setDelegate:self];
   [_viewController loadModel];
 
@@ -44,7 +39,7 @@
 - (void)stop {
   [[self baseViewController].navigationController
       popViewControllerAnimated:YES];
-  _viewController.reset();
+  _viewController = nil;
 }
 
 #pragma mark - PaymentItemsDisplayViewControllerDelegate

diff --git a/ios/chrome/browser/payments/payment_items_display_view_controller.mm b/ios/chrome/browser/payments/payment_items_display_view_controller.mm
index 53c03ed..afc96455 100644
--- a/ios/chrome/browser/payments/payment_items_display_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_items_display_view_controller.mm

@@ -4,9 +4,7 @@
 
 #import "ios/chrome/browser/payments/payment_items_display_view_controller.h"
 
-#import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/credit_card.h"
@@ -23,6 +21,10 @@
 #import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 NSString* const kPaymentItemsDisplayCollectionViewId =
     @"kPaymentItemsDisplayCollectionViewId";
 NSString* const kPaymentItemsDisplayItemId = @"kPaymentItemsDisplayItemId";
@@ -44,8 +46,7 @@
 }  // namespace
 
 @interface PaymentItemsDisplayViewController () {
-  base::WeakNSProtocol<id<PaymentItemsDisplayViewControllerDelegate>> _delegate;
-  base::scoped_nsobject<MDCFlatButton> _payButton;
+  MDCFlatButton* _payButton;
 
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
@@ -62,6 +63,7 @@
 @end
 
 @implementation PaymentItemsDisplayViewController
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest
                       payButtonEnabled:(BOOL)payButtonEnabled {
@@ -80,7 +82,7 @@
     [self navigationItem].leftBarButtonItem = returnButton;
 
     // Set up right (pay) button.
-    _payButton.reset([[MDCFlatButton alloc] init]);
+    _payButton = [[MDCFlatButton alloc] init];
     [_payButton
         setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAY_BUTTON)
         forState:UIControlStateNormal];
@@ -102,8 +104,7 @@
     // height of the bar. We don't want that for the button so we use a UIView
     // here to contain the button instead and the button is vertically centered
     // inside the full bar height.
-    UIView* buttonView =
-        [[[UIView alloc] initWithFrame:CGRectZero] autorelease];
+    UIView* buttonView = [[UIView alloc] initWithFrame:CGRectZero];
     [buttonView addSubview:_payButton];
     // Navigation bar button items are aligned with the trailing edge of the
     // screen. Make the enclosing view larger here. The pay button will be
@@ -115,7 +116,7 @@
     buttonView.bounds = buttonViewBounds;
 
     UIBarButtonItem* payButtonItem =
-        [[[UIBarButtonItem alloc] initWithCustomView:buttonView] autorelease];
+        [[UIBarButtonItem alloc] initWithCustomView:buttonView];
     [self navigationItem].rightBarButtonItem = payButtonItem;
 
     _paymentRequest = paymentRequest;
@@ -123,14 +124,6 @@
   return self;
 }
 
-- (id<PaymentItemsDisplayViewControllerDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentItemsDisplayViewControllerDelegate>)delegate {
-  _delegate.reset(delegate);
-}
-
 - (void)onReturn {
   [_payButton setEnabled:NO];
   [_delegate paymentItemsDisplayViewControllerDidReturn:self];
@@ -150,7 +143,7 @@
 
   // Add the total entry.
   PriceItem* totalItem =
-      [[[PriceItem alloc] initWithType:ItemTypePaymentItemTotal] autorelease];
+      [[PriceItem alloc] initWithType:ItemTypePaymentItemTotal];
   totalItem.accessibilityIdentifier = kPaymentItemsDisplayItemId;
   totalItem.item =
       base::SysUTF16ToNSString(_paymentRequest->payment_details().total.label);
@@ -168,7 +161,7 @@
   for (const auto& paymentItem :
        _paymentRequest->payment_details().display_items) {
     PriceItem* paymentItemItem =
-        [[[PriceItem alloc] initWithType:ItemTypePaymentItem] autorelease];
+        [[PriceItem alloc] initWithType:ItemTypePaymentItem];
     paymentItemItem.accessibilityIdentifier = kPaymentItemsDisplayItemId;
     paymentItemItem.item = base::SysUTF16ToNSString(paymentItem.label);
     payments::CurrencyFormatter* currencyFormatter =

diff --git a/ios/chrome/browser/payments/payment_method_selection_coordinator.mm b/ios/chrome/browser/payments/payment_method_selection_coordinator.mm
index 6cf1de3..4d32e858 100644
--- a/ios/chrome/browser/payments/payment_method_selection_coordinator.mm
+++ b/ios/chrome/browser/payments/payment_method_selection_coordinator.mm

@@ -4,15 +4,16 @@
 
 #import "ios/chrome/browser/payments/payment_method_selection_coordinator.h"
 
-#import "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 
-@interface PaymentMethodSelectionCoordinator () {
-  base::WeakNSProtocol<id<PaymentMethodSelectionCoordinatorDelegate>> _delegate;
-  base::scoped_nsobject<PaymentMethodSelectionViewController> _viewController;
-}
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+@interface PaymentMethodSelectionCoordinator ()
+@property(nonatomic, strong)
+    PaymentMethodSelectionViewController* viewController;
 
 // Called when the user selects a payment method. The cell is checked, the
 // UI is locked so that the user can't interact with it, then the delegate is
@@ -23,20 +24,13 @@
 @end
 
 @implementation PaymentMethodSelectionCoordinator
-
 @synthesize paymentRequest = _paymentRequest;
-
-- (id<PaymentMethodSelectionCoordinatorDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentMethodSelectionCoordinatorDelegate>)delegate {
-  _delegate.reset(delegate);
-}
+@synthesize delegate = _delegate;
+@synthesize viewController = _viewController;
 
 - (void)start {
-  _viewController.reset([[PaymentMethodSelectionViewController alloc]
-      initWithPaymentRequest:_paymentRequest]);
+  _viewController = [[PaymentMethodSelectionViewController alloc]
+      initWithPaymentRequest:_paymentRequest];
   [_viewController setDelegate:self];
   [_viewController loadModel];
 
@@ -49,7 +43,7 @@
 - (void)stop {
   [[self baseViewController].navigationController
       popViewControllerAnimated:YES];
-  _viewController.reset();
+  _viewController = nil;
 }
 
 #pragma mark - PaymentMethodSelectionViewControllerDelegate
@@ -67,22 +61,21 @@
 }
 
 - (void)delayedNotifyDelegateOfSelection:(autofill::CreditCard*)paymentMethod {
-  _viewController.get().view.userInteractionEnabled = NO;
-  base::WeakNSObject<PaymentMethodSelectionCoordinator> weakSelf(self);
-  dispatch_after(
-      dispatch_time(DISPATCH_TIME_NOW,
-                    static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
-      dispatch_get_main_queue(), ^{
-        base::scoped_nsobject<PaymentMethodSelectionCoordinator> strongSelf(
-            [weakSelf retain]);
-        // Early return if the coordinator has been deallocated.
-        if (!strongSelf)
-          return;
+  _viewController.view.userInteractionEnabled = NO;
+  __weak PaymentMethodSelectionCoordinator* weakSelf = self;
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
+                               static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   PaymentMethodSelectionCoordinator* strongSelf = weakSelf;
+                   // Early return if the coordinator has been deallocated.
+                   if (!strongSelf)
+                     return;
 
-        _viewController.get().view.userInteractionEnabled = YES;
-        [_delegate paymentMethodSelectionCoordinator:self
-                              didSelectPaymentMethod:paymentMethod];
-      });
+                   strongSelf.viewController.view.userInteractionEnabled = YES;
+                   [strongSelf.delegate
+                       paymentMethodSelectionCoordinator:strongSelf
+                                  didSelectPaymentMethod:paymentMethod];
+                 });
 }
 
 @end

diff --git a/ios/chrome/browser/payments/payment_method_selection_view_controller.mm b/ios/chrome/browser/payments/payment_method_selection_view_controller.mm
index 2ab51c9..e68e3fa 100644
--- a/ios/chrome/browser/payments/payment_method_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_method_selection_view_controller.mm

@@ -4,9 +4,7 @@
 
 #import "ios/chrome/browser/payments/payment_method_selection_view_controller.h"
 
-#import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/credit_card.h"
@@ -27,6 +25,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 NSString* const kPaymentMethodSelectionCollectionViewId =
     @"kPaymentMethodSelectionCollectionViewId";
 
@@ -46,16 +48,13 @@
 }  // namespace
 
 @interface PaymentMethodSelectionViewController () {
-  base::WeakNSProtocol<id<PaymentMethodSelectionViewControllerDelegate>>
-      _delegate;
-
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
   // pointer and should outlive this class.
   PaymentRequest* _paymentRequest;
 
   // The currently selected item. May be nil.
-  PaymentMethodItem* _selectedItem;
+  __weak PaymentMethodItem* _selectedItem;
 }
 
 // Called when the user presses the return button.
@@ -64,6 +63,7 @@
 @end
 
 @implementation PaymentMethodSelectionViewController
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest {
   DCHECK(paymentRequest);
@@ -83,14 +83,6 @@
   return self;
 }
 
-- (id<PaymentMethodSelectionViewControllerDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentMethodSelectionViewControllerDelegate>)delegate {
-  _delegate.reset(delegate);
-}
-
 - (void)onReturn {
   [_delegate paymentMethodSelectionViewControllerDidReturn:self];
 }
@@ -105,8 +97,8 @@
   [model addSectionWithIdentifier:SectionIdentifierPayment];
 
   for (const auto& paymentMethod : _paymentRequest->credit_cards()) {
-    PaymentMethodItem* paymentMethodItem = [[[PaymentMethodItem alloc]
-        initWithType:ItemTypePaymentMethod] autorelease];
+    PaymentMethodItem* paymentMethodItem =
+        [[PaymentMethodItem alloc] initWithType:ItemTypePaymentMethod];
     paymentMethodItem.accessibilityTraits |= UIAccessibilityTraitButton;
     paymentMethodItem.methodID =
         base::SysUTF16ToNSString(paymentMethod->TypeAndLastFourDigits());
@@ -126,7 +118,7 @@
   }
 
   PaymentsTextItem* addPaymentMethod =
-      [[[PaymentsTextItem alloc] initWithType:ItemTypeAddMethod] autorelease];
+      [[PaymentsTextItem alloc] initWithType:ItemTypeAddMethod];
   addPaymentMethod.text =
       l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_ADD_METHOD_BUTTON);
   addPaymentMethod.image = NativeImage(IDR_IOS_PAYMENTS_ADD);

diff --git a/ios/chrome/browser/payments/payment_request.mm b/ios/chrome/browser/payments/payment_request.mm
index 9e099fa8..e61c810 100644
--- a/ios/chrome/browser/payments/payment_request.mm
+++ b/ios/chrome/browser/payments/payment_request.mm

@@ -15,6 +15,10 @@
 #include "ios/chrome/browser/application_context.h"
 #include "ios/web/public/payments/payment_request.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 PaymentRequest::PaymentRequest(
     std::unique_ptr<web::PaymentRequest> web_payment_request,
     autofill::PersonalDataManager* personal_data_manager)

diff --git a/ios/chrome/browser/payments/payment_request_coordinator.h b/ios/chrome/browser/payments/payment_request_coordinator.h
index b2e1d9a0..bd316ffc 100644
--- a/ios/chrome/browser/payments/payment_request_coordinator.h
+++ b/ios/chrome/browser/payments/payment_request_coordinator.h

@@ -73,7 +73,7 @@
 
 // The favicon of the page invoking the PaymentRequest API. Should be set before
 // calling |start|.
-@property(nonatomic, retain) UIImage* pageFavicon;
+@property(nonatomic, strong) UIImage* pageFavicon;
 
 // The title of the page invoking the Payment Request API. Should be set before
 // calling |start|.

diff --git a/ios/chrome/browser/payments/payment_request_coordinator.mm b/ios/chrome/browser/payments/payment_request_coordinator.mm
index 6205c4b..326060d6 100644
--- a/ios/chrome/browser/payments/payment_request_coordinator.mm
+++ b/ios/chrome/browser/payments/payment_request_coordinator.mm

@@ -7,9 +7,6 @@
 #include <unordered_set>
 #include <vector>
 
-#import "base/ios/weak_nsobject.h"
-#include "base/mac/objc_property_releaser.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ -28,6 +25,10 @@
 #include "ios/chrome/browser/payments/payment_request_util.h"
 #include "ios/chrome/browser/ui/autofill/card_unmask_prompt_view_bridge.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 // The unmask prompt UI for Payment Request.
 class PRCardUnmaskPromptViewBridge
     : public autofill::CardUnmaskPromptViewBridge {
@@ -36,7 +37,7 @@
       autofill::CardUnmaskPromptController* controller,
       UIViewController* base_view_controller)
       : autofill::CardUnmaskPromptViewBridge(controller),
-        base_view_controller_(base_view_controller){};
+        base_view_controller_(base_view_controller) {}
 
   // autofill::CardUnmaskPromptView:
   void Show() override {
@@ -48,7 +49,7 @@
   };
 
  private:
-  UIViewController* base_view_controller_;  // Weak.
+  __weak UIViewController* base_view_controller_;
   DISALLOW_COPY_AND_ASSIGN(PRCardUnmaskPromptViewBridge);
 };
 
@@ -108,36 +109,25 @@
   }
 
  private:
-  PaymentRequestCoordinator* owner_;        // Weak. Owns this instance.
-  UIViewController* base_view_controller_;  // Weak.
+  __weak PaymentRequestCoordinator* owner_;
+  __weak UIViewController* base_view_controller_;
   autofill::CardUnmaskPromptControllerImpl unmask_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FullCardRequester);
 };
 
-@interface PaymentRequestCoordinator () {
-  base::WeakNSProtocol<id<PaymentRequestCoordinatorDelegate>> _delegate;
-  base::scoped_nsobject<UINavigationController> _navigationController;
-  base::scoped_nsobject<PaymentRequestViewController> _viewController;
-  base::scoped_nsobject<PaymentItemsDisplayCoordinator>
-      _itemsDisplayCoordinator;
-  base::scoped_nsobject<ShippingAddressSelectionCoordinator>
-      _shippingAddressSelectionCoordinator;
-  base::scoped_nsobject<ShippingOptionSelectionCoordinator>
-      _shippingOptionSelectionCoordinator;
-  base::scoped_nsobject<PaymentMethodSelectionCoordinator>
-      _methodSelectionCoordinator;
+@implementation PaymentRequestCoordinator {
+  UINavigationController* _navigationController;
+  PaymentRequestViewController* _viewController;
+  PaymentItemsDisplayCoordinator* _itemsDisplayCoordinator;
+  ShippingAddressSelectionCoordinator* _shippingAddressSelectionCoordinator;
+  ShippingOptionSelectionCoordinator* _shippingOptionSelectionCoordinator;
+  PaymentMethodSelectionCoordinator* _methodSelectionCoordinator;
 
   // Receiver of the full credit card details. Also displays the unmask prompt
   // UI.
   std::unique_ptr<FullCardRequester> _fullCardRequester;
 
-  base::mac::ObjCPropertyReleaser _propertyReleaser_PaymentRequestCoordinator;
-}
-
-@end
-
-@implementation PaymentRequestCoordinator {
   // The selected shipping address, pending approval from the page.
   autofill::AutofillProfile* _pendingShippingAddress;
 }
@@ -148,35 +138,23 @@
 @synthesize pageFavicon = _pageFavicon;
 @synthesize pageTitle = _pageTitle;
 @synthesize pageHost = _pageHost;
+@synthesize delegate = _delegate;
 
-- (instancetype)initWithBaseViewController:
-    (UIViewController*)baseViewController {
-  if ((self = [super initWithBaseViewController:baseViewController])) {
-    _propertyReleaser_PaymentRequestCoordinator.Init(
-        self, [PaymentRequestCoordinator class]);
-  }
-  return self;
-}
-
-- (id<PaymentRequestCoordinatorDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentRequestCoordinatorDelegate>)delegate {
-  _delegate.reset(delegate);
+- (instancetype)initWithBaseViewController:(UIViewController*)viewController {
+  return [super initWithBaseViewController:viewController];
 }
 
 - (void)start {
-  _viewController.reset([[PaymentRequestViewController alloc]
-      initWithPaymentRequest:_paymentRequest]);
+  _viewController = [[PaymentRequestViewController alloc]
+      initWithPaymentRequest:_paymentRequest];
   [_viewController setPageFavicon:_pageFavicon];
   [_viewController setPageTitle:_pageTitle];
   [_viewController setPageHost:_pageHost];
   [_viewController setDelegate:self];
   [_viewController loadModel];
 
-  _navigationController.reset([[UINavigationController alloc]
-      initWithRootViewController:_viewController]);
+  _navigationController = [[UINavigationController alloc]
+      initWithRootViewController:_viewController];
   [_navigationController setNavigationBarHidden:YES];
 
   [[self baseViewController] presentViewController:_navigationController
@@ -188,12 +166,12 @@
   [[_navigationController presentingViewController]
       dismissViewControllerAnimated:YES
                          completion:nil];
-  _itemsDisplayCoordinator.reset();
-  _shippingAddressSelectionCoordinator.reset();
-  _shippingOptionSelectionCoordinator.reset();
-  _methodSelectionCoordinator.reset();
-  _navigationController.reset();
-  _viewController.reset();
+  _itemsDisplayCoordinator = nil;
+  _shippingAddressSelectionCoordinator = nil;
+  _shippingOptionSelectionCoordinator = nil;
+  _methodSelectionCoordinator = nil;
+  _navigationController = nil;
+  _viewController = nil;
 }
 
 - (void)sendPaymentResponse {
@@ -226,6 +204,11 @@
     }
   }
 
+  _viewController.view.userInteractionEnabled = NO;
+  [_viewController setPending:YES];
+  [_viewController loadModel];
+  [[_viewController collectionView] reloadData];
+
   [_delegate paymentRequestCoordinator:self
          didConfirmWithPaymentResponse:paymentResponse];
 }
@@ -260,7 +243,7 @@
 
       // Dismiss the shipping address selection view.
       [_shippingAddressSelectionCoordinator stop];
-      _shippingAddressSelectionCoordinator.reset();
+      _shippingAddressSelectionCoordinator = nil;
     } else if (_shippingOptionSelectionCoordinator) {
       // Update the selected shipping option in the payment request summary
       // view. The updated selection is already reflected in |_paymentRequest|.
@@ -268,7 +251,7 @@
 
       // Dismiss the shipping option selection view.
       [_shippingOptionSelectionCoordinator stop];
-      _shippingOptionSelectionCoordinator.reset();
+      _shippingOptionSelectionCoordinator = nil;
     }
   }
 }
@@ -287,8 +270,8 @@
 
 - (void)paymentRequestViewControllerDidSelectPaymentSummaryItem:
     (PaymentRequestViewController*)controller {
-  _itemsDisplayCoordinator.reset([[PaymentItemsDisplayCoordinator alloc]
-      initWithBaseViewController:_viewController]);
+  _itemsDisplayCoordinator = [[PaymentItemsDisplayCoordinator alloc]
+      initWithBaseViewController:_viewController];
   [_itemsDisplayCoordinator setPaymentRequest:_paymentRequest];
   [_itemsDisplayCoordinator setDelegate:self];
 
@@ -297,9 +280,9 @@
 
 - (void)paymentRequestViewControllerDidSelectShippingAddressItem:
     (PaymentRequestViewController*)controller {
-  _shippingAddressSelectionCoordinator.reset(
+  _shippingAddressSelectionCoordinator =
       [[ShippingAddressSelectionCoordinator alloc]
-          initWithBaseViewController:_viewController]);
+          initWithBaseViewController:_viewController];
   [_shippingAddressSelectionCoordinator setPaymentRequest:_paymentRequest];
   [_shippingAddressSelectionCoordinator setDelegate:self];
 
@@ -308,9 +291,9 @@
 
 - (void)paymentRequestViewControllerDidSelectShippingOptionItem:
     (PaymentRequestViewController*)controller {
-  _shippingOptionSelectionCoordinator.reset(
+  _shippingOptionSelectionCoordinator =
       [[ShippingOptionSelectionCoordinator alloc]
-          initWithBaseViewController:_viewController]);
+          initWithBaseViewController:_viewController];
   [_shippingOptionSelectionCoordinator setPaymentRequest:_paymentRequest];
   [_shippingOptionSelectionCoordinator setDelegate:self];
 
@@ -319,8 +302,8 @@
 
 - (void)paymentRequestViewControllerDidSelectPaymentMethodItem:
     (PaymentRequestViewController*)controller {
-  _methodSelectionCoordinator.reset([[PaymentMethodSelectionCoordinator alloc]
-      initWithBaseViewController:_viewController]);
+  _methodSelectionCoordinator = [[PaymentMethodSelectionCoordinator alloc]
+      initWithBaseViewController:_viewController];
   [_methodSelectionCoordinator setPaymentRequest:_paymentRequest];
   [_methodSelectionCoordinator setDelegate:self];
 
@@ -335,7 +318,7 @@
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_itemsDisplayCoordinator stop];
-  _itemsDisplayCoordinator.reset();
+  _itemsDisplayCoordinator = nil;
 }
 
 - (void)paymentItemsDisplayCoordinatorDidConfirm:
@@ -362,7 +345,7 @@
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_shippingAddressSelectionCoordinator stop];
-  _shippingAddressSelectionCoordinator.reset();
+  _shippingAddressSelectionCoordinator = nil;
 }
 
 #pragma mark - ShippingOptionSelectionCoordinatorDelegate
@@ -381,7 +364,7 @@
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_shippingOptionSelectionCoordinator stop];
-  _shippingOptionSelectionCoordinator.reset();
+  _shippingOptionSelectionCoordinator = nil;
 }
 
 #pragma mark - PaymentMethodSelectionCoordinatorDelegate
@@ -397,7 +380,7 @@
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_methodSelectionCoordinator stop];
-  _methodSelectionCoordinator.reset();
+  _methodSelectionCoordinator = nil;
 }
 
 - (void)paymentMethodSelectionCoordinatorDidReturn:
@@ -406,7 +389,7 @@
   [_viewController updatePaymentSummaryWithTotalValueChanged:NO];
 
   [_methodSelectionCoordinator stop];
-  _methodSelectionCoordinator.reset();
+  _methodSelectionCoordinator = nil;
 }
 
 @end

diff --git a/ios/chrome/browser/payments/payment_request_manager.mm b/ios/chrome/browser/payments/payment_request_manager.mm
index f4cbdc0..5bab919 100644
--- a/ios/chrome/browser/payments/payment_request_manager.mm
+++ b/ios/chrome/browser/payments/payment_request_manager.mm

@@ -5,10 +5,8 @@
 #import "ios/chrome/browser/payments/payment_request_manager.h"
 
 #include "base/ios/ios_util.h"
-#import "base/ios/weak_nsobject.h"
 #import "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "base/values.h"
@@ -32,6 +30,10 @@
 #include "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 // Command prefix for injected JavaScript.
 const std::string kCommandPrefix = "paymentRequest";
@@ -48,7 +50,7 @@
 @interface PaymentRequestManager ()<CRWWebStateObserver,
                                     PaymentRequestCoordinatorDelegate> {
   // View controller used to present the PaymentRequest view controller.
-  base::WeakNSObject<UIViewController> _baseViewController;
+  __weak UIViewController* _baseViewController;
 
   // PersonalDataManager used to manage user credit cards and addresses.
   autofill::PersonalDataManager* _personalDataManager;
@@ -66,7 +68,7 @@
   std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
 
   // Object that manages JavaScript injection into the web view.
-  base::WeakNSObject<JSPaymentRequestManager> _paymentRequestJsManager;
+  __weak JSPaymentRequestManager* _paymentRequestJsManager;
 
   // Boolean to track if the current WebState is enabled (JS callback is set
   // up).
@@ -81,14 +83,14 @@
   BOOL _closed;
 
   // Coordinator used to create and present the PaymentRequest view controller.
-  base::scoped_nsobject<PaymentRequestCoordinator> _paymentRequestCoordinator;
+  PaymentRequestCoordinator* _paymentRequestCoordinator;
 
   // Timer used to periodically unblock the webview's JS event queue.
-  base::scoped_nsobject<NSTimer> _unblockEventQueueTimer;
+  NSTimer* _unblockEventQueueTimer;
 
   // Timer used to close the UI if the page does not call
   // PaymentResponse.complete() in a timely fashion.
-  base::scoped_nsobject<NSTimer> _paymentResponseTimeoutTimer;
+  NSTimer* _paymentResponseTimeoutTimer;
 }
 
 // Synchronous method executed by -asynchronouslyEnablePaymentRequest:
@@ -136,7 +138,7 @@
                               browserState:
                                   (ios::ChromeBrowserState*)browserState {
   if ((self = [super init])) {
-    _baseViewController.reset(viewController);
+    _baseViewController = viewController;
 
     _browserState = browserState;
 
@@ -155,10 +157,10 @@
 - (void)setWebState:(web::WebState*)webState {
   [self disconnectWebState];
   if (webState) {
-    _paymentRequestJsManager.reset(
+    _paymentRequestJsManager =
         base::mac::ObjCCastStrict<JSPaymentRequestManager>(
             [webState->GetJSInjectionReceiver()
-                instanceOfClass:[JSPaymentRequestManager class]]));
+                instanceOfClass:[JSPaymentRequestManager class]]);
     _webState = webState;
     _webStateObserver.reset(new web::WebStateObserverBridge(webState, self));
     [self enableCurrentWebState];
@@ -171,7 +173,7 @@
   // Asynchronously enables PaymentRequest, so that some preferences
   // (UIAccessibilityIsVoiceOverRunning(), for example) have time to synchronize
   // with their own notifications.
-  base::WeakNSObject<PaymentRequestManager> weakSelf(self);
+  __weak PaymentRequestManager* weakSelf = self;
   dispatch_async(dispatch_get_main_queue(), ^{
     [weakSelf doEnablePaymentRequest:enabled];
   });
@@ -215,14 +217,12 @@
 
   if (_enabled) {
     if (!_webStateEnabled) {
-      base::WeakNSObject<PaymentRequestManager> weakSelf(self);
-      auto callback =
-          base::BindBlock(^bool(const base::DictionaryValue& JSON,
-                                const GURL& originURL, bool userIsInteracting) {
-            base::scoped_nsobject<PaymentRequestManager> strongSelf(
-                [weakSelf retain]);
+      __weak PaymentRequestManager* weakSelf = self;
+      auto callback = base::BindBlockArc(
+          ^bool(const base::DictionaryValue& JSON, const GURL& originURL,
+                bool userIsInteracting) {
             // |originURL| and |userIsInteracting| aren't used.
-            return [strongSelf handleScriptCommand:JSON];
+            return [weakSelf handleScriptCommand:JSON];
           });
       [self webState]->AddScriptCommandCallback(callback, kCommandPrefix);
 
@@ -242,7 +242,7 @@
 
 - (void)disconnectWebState {
   if (_webState) {
-    _paymentRequestJsManager.reset();
+    _paymentRequestJsManager = nil;
     _webStateObserver.reset();
     [self disableCurrentWebState];
   }
@@ -314,8 +314,8 @@
       base::SysUTF8ToNSString([self webState]->GetLastCommittedURL().host());
   autofill::AutofillManager* autofillManager =
       autofill::AutofillDriverIOS::FromWebState(_webState)->autofill_manager();
-  _paymentRequestCoordinator.reset([[PaymentRequestCoordinator alloc]
-      initWithBaseViewController:_baseViewController]);
+  _paymentRequestCoordinator = [[PaymentRequestCoordinator alloc]
+      initWithBaseViewController:_baseViewController];
   [_paymentRequestCoordinator setPaymentRequest:_paymentRequest.get()];
   [_paymentRequestCoordinator setAutofillManager:autofillManager];
   [_paymentRequestCoordinator setBrowserState:_browserState];
@@ -376,26 +376,26 @@
 }
 
 - (void)setUnblockEventQueueTimer {
-  _unblockEventQueueTimer.reset(
-      [[NSTimer scheduledTimerWithTimeInterval:kNoopInterval
-                                        target:_paymentRequestJsManager
-                                      selector:@selector(executeNoop)
-                                      userInfo:nil
-                                       repeats:YES] retain]);
+  _unblockEventQueueTimer =
+      [NSTimer scheduledTimerWithTimeInterval:kNoopInterval
+                                       target:_paymentRequestJsManager
+                                     selector:@selector(executeNoop)
+                                     userInfo:nil
+                                      repeats:YES];
 }
 
 - (void)setPaymentResponseTimeoutTimer {
-  _paymentResponseTimeoutTimer.reset(
-      [[NSTimer scheduledTimerWithTimeInterval:kTimeoutInterval
-                                        target:self
-                                      selector:@selector(handleResponseComplete)
-                                      userInfo:nil
-                                       repeats:NO] retain]);
+  _paymentResponseTimeoutTimer =
+      [NSTimer scheduledTimerWithTimeInterval:kTimeoutInterval
+                                       target:self
+                                     selector:@selector(handleResponseComplete)
+                                     userInfo:nil
+                                      repeats:NO];
 }
 
 - (void)dismissUI {
   [_paymentRequestCoordinator stop];
-  _paymentRequestCoordinator.reset();
+  _paymentRequestCoordinator = nil;
 }
 
 - (BOOL)webStateContentIsSecureHTML {

diff --git a/ios/chrome/browser/payments/payment_request_util.mm b/ios/chrome/browser/payments/payment_request_util.mm
index 5bdf315..12dbde21 100644
--- a/ios/chrome/browser/payments/payment_request_util.mm
+++ b/ios/chrome/browser/payments/payment_request_util.mm

@@ -13,6 +13,10 @@
 #include "ios/chrome/browser/payments/payment_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace payment_request_util {
 
 NSString* NameLabelFromAutofillProfile(autofill::AutofillProfile* profile) {

diff --git a/ios/chrome/browser/payments/payment_request_view_controller.h b/ios/chrome/browser/payments/payment_request_view_controller.h
index d0f9e5631..053b28e 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.h
+++ b/ios/chrome/browser/payments/payment_request_view_controller.h

@@ -49,7 +49,7 @@
 @interface PaymentRequestViewController : CollectionViewController
 
 // The favicon of the page invoking the Payment Request API.
-@property(nonatomic, retain) UIImage* pageFavicon;
+@property(nonatomic, strong) UIImage* pageFavicon;
 
 // The title of the page invoking the Payment Request API.
 @property(nonatomic, copy) NSString* pageTitle;
@@ -57,6 +57,9 @@
 // The host of the page invoking the Payment Request API.
 @property(nonatomic, copy) NSString* pageHost;
 
+// Whether or not the view is in a pending state.
+@property(nonatomic, assign, getter=isPending) BOOL pending;
+
 // The delegate to be notified when the user confirms or cancels the request.
 @property(nonatomic, weak) id<PaymentRequestViewControllerDelegate> delegate;
 

diff --git a/ios/chrome/browser/payments/payment_request_view_controller.mm b/ios/chrome/browser/payments/payment_request_view_controller.mm
index 8d9f78a..e698c6a 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller.mm

@@ -4,10 +4,8 @@
 
 #import "ios/chrome/browser/payments/payment_request_view_controller.h"
 
-#import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
-#include "base/mac/objc_property_releaser.h"
-#include "base/mac/scoped_nsobject.h"
+
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
@@ -22,6 +20,7 @@
 #import "ios/chrome/browser/payments/cells/price_item.h"
 #import "ios/chrome/browser/payments/cells/shipping_address_item.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
+#import "ios/chrome/browser/ui/autofill/cells/status_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
@@ -38,6 +37,10 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 using payment_request_util::NameLabelFromAutofillProfile;
 using payment_request_util::AddressLabelFromAutofillProfile;
 using payment_request_util::PhoneNumberLabelFromAutofillProfile;
@@ -59,6 +62,7 @@
 
 typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeSummaryPageInfo = kItemTypeEnumZero,
+  ItemTypeSpinner,
   ItemTypeSummaryTotal,
   ItemTypeShippingTitle,
   ItemTypeShippingAddress,
@@ -73,9 +77,8 @@
 }  // namespace
 
 @interface PaymentRequestViewController () {
-  base::WeakNSProtocol<id<PaymentRequestViewControllerDelegate>> _delegate;
-  base::scoped_nsobject<UIBarButtonItem> _cancelButton;
-  base::scoped_nsobject<MDCFlatButton> _payButton;
+  UIBarButtonItem* _cancelButton;
+  MDCFlatButton* _payButton;
 
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
@@ -86,9 +89,6 @@
   ShippingAddressItem* _selectedShippingAddressItem;
   CollectionViewTextItem* _selectedShippingOptionItem;
   PaymentMethodItem* _selectedPaymentMethodItem;
-
-  base::mac::ObjCPropertyReleaser
-      _propertyReleaser_PaymentRequestViewController;
 }
 
 // Called when the user presses the cancel button.
@@ -104,22 +104,21 @@
 @synthesize pageFavicon = _pageFavicon;
 @synthesize pageTitle = _pageTitle;
 @synthesize pageHost = _pageHost;
+@synthesize pending = _pending;
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest {
   DCHECK(paymentRequest);
   if ((self = [super initWithStyle:CollectionViewControllerStyleAppBar])) {
-    _propertyReleaser_PaymentRequestViewController.Init(
-        self, [PaymentRequestViewController class]);
-
     [self setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_TITLE)];
 
     // Set up left (cancel) button.
-    _cancelButton.reset([[UIBarButtonItem alloc]
+    _cancelButton = [[UIBarButtonItem alloc]
         initWithTitle:l10n_util::GetNSString(
                           IDS_IOS_PAYMENT_REQUEST_CANCEL_BUTTON)
                 style:UIBarButtonItemStylePlain
                target:nil
-               action:@selector(onCancel)]);
+               action:@selector(onCancel)];
     [_cancelButton setTitleTextAttributes:@{
       NSForegroundColorAttributeName : [UIColor lightGrayColor]
     }
@@ -129,7 +128,7 @@
     [self navigationItem].leftBarButtonItem = _cancelButton;
 
     // Set up right (pay) button.
-    _payButton.reset([[MDCFlatButton alloc] init]);
+    _payButton = [[MDCFlatButton alloc] init];
     [_payButton
         setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAY_BUTTON)
         forState:UIControlStateNormal];
@@ -151,8 +150,7 @@
     // height of the bar. We don't want that for the button so we use a UIView
     // here to contain the button instead and the button is vertically centered
     // inside the full bar height.
-    UIView* buttonView =
-        [[[UIView alloc] initWithFrame:CGRectZero] autorelease];
+    UIView* buttonView = [[UIView alloc] initWithFrame:CGRectZero];
     [buttonView addSubview:_payButton];
     // Navigation bar button items are aligned with the trailing edge of the
     // screen. Make the enclosing view larger here. The pay button will be
@@ -164,7 +162,7 @@
     buttonView.bounds = buttonViewBounds;
 
     UIBarButtonItem* payButtonItem =
-        [[[UIBarButtonItem alloc] initWithCustomView:buttonView] autorelease];
+        [[UIBarButtonItem alloc] initWithCustomView:buttonView];
     [self navigationItem].rightBarButtonItem = payButtonItem;
 
     _paymentRequest = paymentRequest;
@@ -172,14 +170,6 @@
   return self;
 }
 
-- (id<PaymentRequestViewControllerDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<PaymentRequestViewControllerDelegate>)delegate {
-  _delegate.reset(delegate);
-}
-
 - (void)onCancel {
   [_delegate paymentRequestViewControllerDidCancel:self];
 }
@@ -198,14 +188,23 @@
   [model addSectionWithIdentifier:SectionIdentifierSummary];
 
   PageInfoItem* pageInfo =
-      [[[PageInfoItem alloc] initWithType:ItemTypeSummaryPageInfo] autorelease];
+      [[PageInfoItem alloc] initWithType:ItemTypeSummaryPageInfo];
   pageInfo.pageFavicon = _pageFavicon;
   pageInfo.pageTitle = _pageTitle;
   pageInfo.pageHost = _pageHost;
   [model setHeader:pageInfo forSectionWithIdentifier:SectionIdentifierSummary];
 
-  _paymentSummaryItem =
-      [[[PriceItem alloc] initWithType:ItemTypeSummaryTotal] autorelease];
+  if (_pending) {
+    [_payButton setEnabled:NO];
+    [_cancelButton setEnabled:NO];
+
+    StatusItem* statusItem = [[StatusItem alloc] initWithType:ItemTypeSpinner];
+    statusItem.text = l10n_util::GetNSString(IDS_PAYMENTS_PROCESSING_MESSAGE);
+    [model addItem:statusItem toSectionWithIdentifier:SectionIdentifierSummary];
+    return;
+  }
+
+  _paymentSummaryItem = [[PriceItem alloc] initWithType:ItemTypeSummaryTotal];
   [self fillPaymentSummaryItem:_paymentSummaryItem
                withPaymentItem:_paymentRequest->payment_details().total
          withTotalValueChanged:NO];
@@ -220,8 +219,8 @@
   // Shipping section.
   [model addSectionWithIdentifier:SectionIdentifierShipping];
 
-  CollectionViewTextItem* shippingTitle = [[[CollectionViewTextItem alloc]
-      initWithType:ItemTypeShippingTitle] autorelease];
+  CollectionViewTextItem* shippingTitle =
+      [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingTitle];
   shippingTitle.text =
       payment_request_util::GetShippingSectionTitle(_paymentRequest);
   [model setHeader:shippingTitle
@@ -229,8 +228,8 @@
 
   CollectionViewItem* shippingAddressItem = nil;
   if (_paymentRequest->selected_shipping_profile()) {
-    _selectedShippingAddressItem = [[[ShippingAddressItem alloc]
-        initWithType:ItemTypeShippingAddress] autorelease];
+    _selectedShippingAddressItem =
+        [[ShippingAddressItem alloc] initWithType:ItemTypeShippingAddress];
     shippingAddressItem = _selectedShippingAddressItem;
     [self fillShippingAddressItem:_selectedShippingAddressItem
                       withAddress:_paymentRequest->selected_shipping_profile()];
@@ -238,9 +237,8 @@
         MDCCollectionViewCellAccessoryDisclosureIndicator;
 
   } else {
-    CollectionViewDetailItem* addAddressItem =
-        [[[CollectionViewDetailItem alloc]
-            initWithType:ItemTypeAddShippingAddress] autorelease];
+    CollectionViewDetailItem* addAddressItem = [[CollectionViewDetailItem alloc]
+        initWithType:ItemTypeAddShippingAddress];
     shippingAddressItem = addAddressItem;
     addAddressItem.text =
         payment_request_util::GetShippingAddressSelectorTitle(_paymentRequest);
@@ -254,8 +252,8 @@
 
   CollectionViewItem* shippingOptionItem = nil;
   if (_paymentRequest->selected_shipping_option()) {
-    _selectedShippingOptionItem = [[[CollectionViewTextItem alloc]
-        initWithType:ItemTypeShippingOption] autorelease];
+    _selectedShippingOptionItem =
+        [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption];
     shippingOptionItem = _selectedShippingOptionItem;
     [self fillShippingOptionItem:_selectedShippingOptionItem
                       withOption:_paymentRequest->selected_shipping_option()];
@@ -263,8 +261,8 @@
         MDCCollectionViewCellAccessoryDisclosureIndicator;
   } else {
     CollectionViewDetailItem* selectShippingOptionItem =
-        [[[CollectionViewDetailItem alloc]
-            initWithType:ItemTypeSelectShippingOption] autorelease];
+        [[CollectionViewDetailItem alloc]
+            initWithType:ItemTypeSelectShippingOption];
     shippingOptionItem = selectShippingOptionItem;
     selectShippingOptionItem.text =
         payment_request_util::GetShippingOptionSelectorTitle(_paymentRequest);
@@ -280,24 +278,23 @@
 
   CollectionViewItem* paymentMethodItem = nil;
   if (_paymentRequest->selected_credit_card()) {
-    CollectionViewTextItem* paymentTitle = [[[CollectionViewTextItem alloc]
-        initWithType:ItemTypePaymentTitle] autorelease];
+    CollectionViewTextItem* paymentTitle =
+        [[CollectionViewTextItem alloc] initWithType:ItemTypePaymentTitle];
     paymentTitle.text =
         l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAYMENT_METHOD_HEADER);
     [model setHeader:paymentTitle
         forSectionWithIdentifier:SectionIdentifierPayment];
 
-    _selectedPaymentMethodItem = [[[PaymentMethodItem alloc]
-        initWithType:ItemTypePaymentMethod] autorelease];
+    _selectedPaymentMethodItem =
+        [[PaymentMethodItem alloc] initWithType:ItemTypePaymentMethod];
     paymentMethodItem = _selectedPaymentMethodItem;
     [self fillPaymentMethodItem:_selectedPaymentMethodItem
               withPaymentMethod:_paymentRequest->selected_credit_card()];
     _selectedPaymentMethodItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
   } else {
-    CollectionViewDetailItem* addPaymentMethodItem =
-        [[[CollectionViewDetailItem alloc]
-            initWithType:ItemTypeAddPaymentMethod] autorelease];
+    CollectionViewDetailItem* addPaymentMethodItem = [
+        [CollectionViewDetailItem alloc] initWithType:ItemTypeAddPaymentMethod];
     paymentMethodItem = addPaymentMethodItem;
     addPaymentMethodItem.text =
         l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAYMENT_METHOD_HEADER);
@@ -474,6 +471,7 @@
   CollectionViewItem* item =
       [self.collectionViewModel itemAtIndexPath:indexPath];
   switch (item.type) {
+    case ItemTypeSpinner:
     case ItemTypeShippingAddress:
     case ItemTypePaymentMethod:
       return [MDCCollectionViewCell

diff --git a/ios/chrome/browser/payments/payment_request_view_controller_unittest.mm b/ios/chrome/browser/payments/payment_request_view_controller_unittest.mm
index 490e4d3..fdc5d9bc 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller_unittest.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller_unittest.mm

@@ -181,3 +181,21 @@
   CollectionViewDetailItem* detail_item = item;
   EXPECT_EQ(MDCCollectionViewCellAccessoryNone, detail_item.accessoryType);
 }
+
+// Tests that the correct items are displayed after loading the model, when
+// the view is in pending state.
+TEST_F(PaymentRequestViewControllerTest, TestModelPendingState) {
+  CreateController();
+  CheckController();
+
+  [GetPaymentRequestViewController() setPending:YES];
+  [GetPaymentRequestViewController() loadModel];
+
+  ASSERT_EQ(1, NumberOfSections());
+  // There should be only one item.
+  ASSERT_EQ(1U, static_cast<unsigned int>(NumberOfItemsInSection(0)));
+
+  // The item should be of type StatusItem.
+  id item = GetCollectionViewItem(0, 0);
+  EXPECT_TRUE([item isMemberOfClass:[StatusItem class]]);
+}

diff --git a/ios/chrome/browser/payments/shipping_address_selection_coordinator.mm b/ios/chrome/browser/payments/shipping_address_selection_coordinator.mm
index e3dfcb5..c1e983e7b 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_coordinator.mm
+++ b/ios/chrome/browser/payments/shipping_address_selection_coordinator.mm

@@ -4,18 +4,19 @@
 
 #import "ios/chrome/browser/payments/shipping_address_selection_coordinator.h"
 
-#import "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "ios/chrome/browser/payments/payment_request.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
 
-@interface ShippingAddressSelectionCoordinator () {
-  base::WeakNSProtocol<id<ShippingAddressSelectionCoordinatorDelegate>>
-      _delegate;
-  base::scoped_nsobject<ShippingAddressSelectionViewController> _viewController;
-}
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+@interface ShippingAddressSelectionCoordinator ()
+
+@property(nonatomic, strong)
+    ShippingAddressSelectionViewController* viewController;
 
 // Called when the user selects a shipping address. The cell is checked, the
 // UI is locked so that the user can't interact with it, then the delegate is
@@ -29,18 +30,12 @@
 @implementation ShippingAddressSelectionCoordinator
 
 @synthesize paymentRequest = _paymentRequest;
-
-- (id<ShippingAddressSelectionCoordinatorDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<ShippingAddressSelectionCoordinatorDelegate>)delegate {
-  _delegate.reset(delegate);
-}
+@synthesize delegate = _delegate;
+@synthesize viewController = _viewController;
 
 - (void)start {
-  _viewController.reset([[ShippingAddressSelectionViewController alloc]
-      initWithPaymentRequest:_paymentRequest]);
+  _viewController = [[ShippingAddressSelectionViewController alloc]
+      initWithPaymentRequest:_paymentRequest];
   [_viewController setDelegate:self];
   [_viewController loadModel];
 
@@ -52,19 +47,18 @@
 
 - (void)stop {
   [self.baseViewController.navigationController popViewControllerAnimated:YES];
-  _viewController.reset();
+  _viewController = nil;
 }
 
 - (void)stopSpinnerAndDisplayError {
   // Re-enable user interactions that were disabled earlier in
   // delayedNotifyDelegateOfSelection.
-  _viewController.get().view.userInteractionEnabled = YES;
+  _viewController.view.userInteractionEnabled = YES;
 
-  [_viewController setIsLoading:NO];
-  NSString* errorMessage =
-      payment_request_util::GetShippingAddressSelectorErrorMessage(
-          _paymentRequest);
-  [_viewController setErrorMessage:errorMessage];
+  [_viewController setPending:NO];
+  [_viewController setErrorMessage:payment_request_util::
+                                       GetShippingAddressSelectorErrorMessage(
+                                           _paymentRequest)];
   [_viewController loadModel];
   [[_viewController collectionView] reloadData];
 }
@@ -85,25 +79,24 @@
 
 - (void)delayedNotifyDelegateOfSelection:
     (autofill::AutofillProfile*)shippingAddress {
-  _viewController.get().view.userInteractionEnabled = NO;
-  base::WeakNSObject<ShippingAddressSelectionCoordinator> weakSelf(self);
-  dispatch_after(
-      dispatch_time(DISPATCH_TIME_NOW,
-                    static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
-      dispatch_get_main_queue(), ^{
-        base::scoped_nsobject<ShippingAddressSelectionCoordinator> strongSelf(
-            [weakSelf retain]);
-        // Early return if the coordinator has been deallocated.
-        if (!strongSelf)
-          return;
+  _viewController.view.userInteractionEnabled = NO;
+  __weak ShippingAddressSelectionCoordinator* weakSelf = self;
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
+                               static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   ShippingAddressSelectionCoordinator* strongSelf = weakSelf;
+                   // Early return if the coordinator has been deallocated.
+                   if (!strongSelf)
+                     return;
 
-        [_viewController setIsLoading:YES];
-        [_viewController loadModel];
-        [[_viewController collectionView] reloadData];
+                   [strongSelf.viewController setPending:YES];
+                   [strongSelf.viewController loadModel];
+                   [[strongSelf.viewController collectionView] reloadData];
 
-        [_delegate shippingAddressSelectionCoordinator:self
-                              didSelectShippingAddress:shippingAddress];
-      });
+                   [strongSelf.delegate
+                       shippingAddressSelectionCoordinator:strongSelf
+                                  didSelectShippingAddress:shippingAddress];
+                 });
 }
 
 @end

diff --git a/ios/chrome/browser/payments/shipping_address_selection_view_controller.h b/ios/chrome/browser/payments/shipping_address_selection_view_controller.h
index 5bc73bb..024aea9 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_view_controller.h
+++ b/ios/chrome/browser/payments/shipping_address_selection_view_controller.h

@@ -38,11 +38,11 @@
 // delegate. Also offers a button to add a shipping address.
 @interface ShippingAddressSelectionViewController : CollectionViewController
 
-// Whether or not the view is in a loading state.
-@property(nonatomic, assign) BOOL isLoading;
+// Whether or not the view is in a pending state.
+@property(nonatomic, assign, getter=isPending) BOOL pending;
 
 // The error message to display, if any.
-@property(nonatomic, assign) NSString* errorMessage;
+@property(nonatomic, copy) NSString* errorMessage;
 
 // The delegate to be notified when the user selects a shipping address or
 // returns without selecting one.

diff --git a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
index 19a7041..0d887cc 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_address_selection_view_controller.mm

@@ -4,7 +4,6 @@
 
 #import "ios/chrome/browser/payments/shipping_address_selection_view_controller.h"
 
-#import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ -25,6 +24,10 @@
 #include "ios/chrome/grit/ios_theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 using payment_request_util::NameLabelFromAutofillProfile;
 using payment_request_util::AddressLabelFromAutofillProfile;
 using payment_request_util::PhoneNumberLabelFromAutofillProfile;
@@ -50,16 +53,13 @@
 }  // namespace
 
 @interface ShippingAddressSelectionViewController () {
-  base::WeakNSProtocol<id<ShippingAddressSelectionViewControllerDelegate>>
-      _delegate;
-
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
   // pointer and should outlive this class.
   PaymentRequest* _paymentRequest;
 
   // The currently selected item. May be nil.
-  ShippingAddressItem* _selectedItem;
+  __weak ShippingAddressItem* _selectedItem;
 }
 
 // Called when the user presses the return button.
@@ -69,8 +69,9 @@
 
 @implementation ShippingAddressSelectionViewController
 
-@synthesize isLoading = _isLoading;
+@synthesize pending = _pending;
 @synthesize errorMessage = _errorMessage;
+@synthesize delegate = _delegate;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest {
   DCHECK(paymentRequest);
@@ -90,15 +91,6 @@
   return self;
 }
 
-- (id<ShippingAddressSelectionViewControllerDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:
-    (id<ShippingAddressSelectionViewControllerDelegate>)delegate {
-  _delegate.reset(delegate);
-}
-
 - (void)onReturn {
   [_delegate shippingAddressSelectionViewControllerDidReturn:self];
 }
@@ -112,9 +104,8 @@
 
   [model addSectionWithIdentifier:SectionIdentifierShippingAddress];
 
-  if (_isLoading) {
-    StatusItem* statusItem =
-        [[[StatusItem alloc] initWithType:ItemTypeSpinner] autorelease];
+  if (_pending) {
+    StatusItem* statusItem = [[StatusItem alloc] initWithType:ItemTypeSpinner];
     statusItem.text =
         l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_CHECKING_LABEL);
     [model addItem:statusItem
@@ -123,7 +114,7 @@
   }
 
   PaymentsTextItem* messageItem =
-      [[[PaymentsTextItem alloc] initWithType:ItemTypeMessage] autorelease];
+      [[PaymentsTextItem alloc] initWithType:ItemTypeMessage];
   if (_errorMessage) {
     messageItem.text = _errorMessage;
     messageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
@@ -136,8 +127,8 @@
       toSectionWithIdentifier:SectionIdentifierShippingAddress];
 
   for (const auto& shippingAddress : _paymentRequest->shipping_profiles()) {
-    ShippingAddressItem* item = [[[ShippingAddressItem alloc]
-        initWithType:ItemTypeShippingAddress] autorelease];
+    ShippingAddressItem* item =
+        [[ShippingAddressItem alloc] initWithType:ItemTypeShippingAddress];
     item.accessibilityTraits |= UIAccessibilityTraitButton;
     item.name = NameLabelFromAutofillProfile(shippingAddress);
     item.address = AddressLabelFromAutofillProfile(shippingAddress);
@@ -150,8 +141,8 @@
         toSectionWithIdentifier:SectionIdentifierShippingAddress];
   }
 
-  PaymentsTextItem* addShippingAddress = [[[PaymentsTextItem alloc]
-      initWithType:ItemTypeAddShippingAddress] autorelease];
+  PaymentsTextItem* addShippingAddress =
+      [[PaymentsTextItem alloc] initWithType:ItemTypeAddShippingAddress];
   addShippingAddress.text = l10n_util::GetNSString(
       IDS_IOS_PAYMENT_REQUEST_SHIPPING_ADDRESS_SELECTION_ADD_BUTTON);
   addShippingAddress.image = NativeImage(IDR_IOS_PAYMENTS_ADD);

diff --git a/ios/chrome/browser/payments/shipping_address_selection_view_controller_unittest.mm b/ios/chrome/browser/payments/shipping_address_selection_view_controller_unittest.mm
index 2d48c61..d386384 100644
--- a/ios/chrome/browser/payments/shipping_address_selection_view_controller_unittest.mm
+++ b/ios/chrome/browser/payments/shipping_address_selection_view_controller_unittest.mm

@@ -101,8 +101,8 @@
   // There should stil be 4 items in total.
   ASSERT_EQ(4U, static_cast<unsigned int>(NumberOfItemsInSection(0)));
 
-  // Test the loading state.
-  [GetShippingAddressSelectionViewController() setIsLoading:YES];
+  // Test the pending state.
+  [GetShippingAddressSelectionViewController() setPending:YES];
   [GetShippingAddressSelectionViewController() loadModel];
 
   ASSERT_EQ(1, NumberOfSections());

diff --git a/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm b/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
index c30c6bed..ba8691f3 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm
+++ b/ios/chrome/browser/payments/shipping_option_selection_coordinator.mm

@@ -4,16 +4,17 @@
 
 #import "ios/chrome/browser/payments/shipping_option_selection_coordinator.h"
 
-#import "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/payments/payment_request_util.h"
 
-@interface ShippingOptionSelectionCoordinator () {
-  base::WeakNSProtocol<id<ShippingOptionSelectionCoordinatorDelegate>>
-      _delegate;
-  base::scoped_nsobject<ShippingOptionSelectionViewController> _viewController;
-}
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+@interface ShippingOptionSelectionCoordinator ()
+
+@property(nonatomic, strong)
+    ShippingOptionSelectionViewController* viewController;
 
 // Called when the user selects a shipping option. The cell is checked, the
 // UI is locked so that the user can't interact with it, then the delegate is
@@ -27,18 +28,12 @@
 @implementation ShippingOptionSelectionCoordinator
 
 @synthesize paymentRequest = _paymentRequest;
-
-- (id<ShippingOptionSelectionCoordinatorDelegate>)delegate {
-  return _delegate.get();
-}
-
-- (void)setDelegate:(id<ShippingOptionSelectionCoordinatorDelegate>)delegate {
-  _delegate.reset(delegate);
-}
+@synthesize delegate = _delegate;
+@synthesize viewController = _viewController;
 
 - (void)start {
-  _viewController.reset([[ShippingOptionSelectionViewController alloc]
-      initWithPaymentRequest:_paymentRequest]);
+  _viewController = [[ShippingOptionSelectionViewController alloc]
+      initWithPaymentRequest:_paymentRequest];
   [_viewController setDelegate:self];
   [_viewController loadModel];
 
@@ -50,19 +45,18 @@
 
 - (void)stop {
   [self.baseViewController.navigationController popViewControllerAnimated:YES];
-  _viewController.reset();
+  _viewController = nil;
 }
 
 - (void)stopSpinnerAndDisplayError {
   // Re-enable user interactions that were disabled earlier in
   // delayedNotifyDelegateOfSelection.
-  _viewController.get().view.userInteractionEnabled = YES;
+  _viewController.view.userInteractionEnabled = YES;
 
-  [_viewController setIsLoading:NO];
-  NSString* errorMessage =
-      payment_request_util::GetShippingOptionSelectorErrorMessage(
-          _paymentRequest);
-  [_viewController setErrorMessage:errorMessage];
+  [_viewController setPending:NO];
+  [_viewController setErrorMessage:payment_request_util::
+                                       GetShippingOptionSelectorErrorMessage(
+                                           _paymentRequest)];
   [_viewController loadModel];
   [[_viewController collectionView] reloadData];
 }
@@ -83,24 +77,23 @@
 
 - (void)delayedNotifyDelegateOfSelection:
     (web::PaymentShippingOption*)shippingOption {
-  _viewController.get().view.userInteractionEnabled = NO;
-  base::WeakNSObject<ShippingOptionSelectionCoordinator> weakSelf(self);
-  dispatch_after(
-      dispatch_time(DISPATCH_TIME_NOW,
-                    static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
-      dispatch_get_main_queue(), ^{
-        base::scoped_nsobject<ShippingOptionSelectionCoordinator> strongSelf(
-            [weakSelf retain]);
-        // Early return if the coordinator has been deallocated.
-        if (!strongSelf)
-          return;
-        [_viewController setIsLoading:YES];
-        [_viewController loadModel];
-        [[_viewController collectionView] reloadData];
+  _viewController.view.userInteractionEnabled = NO;
+  __weak ShippingOptionSelectionCoordinator* weakSelf = self;
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW,
+                               static_cast<int64_t>(0.2 * NSEC_PER_SEC)),
+                 dispatch_get_main_queue(), ^{
+                   ShippingOptionSelectionCoordinator* strongSelf = weakSelf;
+                   // Early return if the coordinator has been deallocated.
+                   if (!strongSelf)
+                     return;
+                   [strongSelf.viewController setPending:YES];
+                   [strongSelf.viewController loadModel];
+                   [[strongSelf.viewController collectionView] reloadData];
 
-        [_delegate shippingOptionSelectionCoordinator:self
-                              didSelectShippingOption:shippingOption];
-      });
+                   [strongSelf.delegate
+                       shippingOptionSelectionCoordinator:strongSelf
+                                  didSelectShippingOption:shippingOption];
+                 });
 }
 
 @end

diff --git a/ios/chrome/browser/payments/shipping_option_selection_view_controller.h b/ios/chrome/browser/payments/shipping_option_selection_view_controller.h
index e1a4648d..4232706 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_view_controller.h
+++ b/ios/chrome/browser/payments/shipping_option_selection_view_controller.h

@@ -34,11 +34,11 @@
 // delegate.
 @interface ShippingOptionSelectionViewController : CollectionViewController
 
-// Whether or not the view is in a loading state.
-@property(nonatomic, assign) BOOL isLoading;
+// Whether or not the view is in a pending state.
+@property(nonatomic, assign, getter=isPending) BOOL pending;
 
 // The error message to display, if any.
-@property(nonatomic, assign) NSString* errorMessage;
+@property(nonatomic, copy) NSString* errorMessage;
 
 // The delegate to be notified when the user selects a shipping option or
 // returns without selecting one.

diff --git a/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm b/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
index 1620902..5334944 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm
+++ b/ios/chrome/browser/payments/shipping_option_selection_view_controller.mm

@@ -4,7 +4,6 @@
 
 #import "ios/chrome/browser/payments/shipping_option_selection_view_controller.h"
 
-#import "base/ios/weak_nsobject.h"
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -26,6 +25,10 @@
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 NSString* const kShippingOptionSelectionCollectionViewId =
     @"kShippingOptionSelectionCollectionViewId";
 
@@ -46,8 +49,7 @@
 }  // namespace
 
 @interface ShippingOptionSelectionViewController () {
-  base::WeakNSProtocol<id<ShippingOptionSelectionViewControllerDelegate>>
-      _delegate;
+  __weak id<ShippingOptionSelectionViewControllerDelegate> _delegate;
 
   // The PaymentRequest object owning an instance of web::PaymentRequest as
   // provided by the page invoking the Payment Request API. This is a weak
@@ -65,7 +67,7 @@
 
 @implementation ShippingOptionSelectionViewController
 
-@synthesize isLoading = _isLoading;
+@synthesize pending = _pending;
 @synthesize errorMessage = _errorMessage;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest {
@@ -87,12 +89,12 @@
 }
 
 - (id<ShippingOptionSelectionViewControllerDelegate>)delegate {
-  return _delegate.get();
+  return _delegate;
 }
 
 - (void)setDelegate:
     (id<ShippingOptionSelectionViewControllerDelegate>)delegate {
-  _delegate.reset(delegate);
+  _delegate = delegate;
 }
 
 - (void)onReturn {
@@ -108,9 +110,8 @@
 
   [model addSectionWithIdentifier:SectionIdentifierShippingOption];
 
-  if (self.isLoading) {
-    StatusItem* statusItem =
-        [[[StatusItem alloc] initWithType:ItemTypeSpinner] autorelease];
+  if (self.pending) {
+    StatusItem* statusItem = [[StatusItem alloc] initWithType:ItemTypeSpinner];
     statusItem.text =
         l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_CHECKING_LABEL);
     [model addItem:statusItem
@@ -120,7 +121,7 @@
 
   if (_errorMessage) {
     PaymentsTextItem* messageItem =
-        [[[PaymentsTextItem alloc] initWithType:ItemTypeMessage] autorelease];
+        [[PaymentsTextItem alloc] initWithType:ItemTypeMessage];
     messageItem.text = _errorMessage;
     messageItem.image = NativeImage(IDR_IOS_PAYMENTS_WARNING);
     [model addItem:messageItem
@@ -128,8 +129,8 @@
   }
 
   for (const auto& shippingOption : _paymentRequest->shipping_options()) {
-    CollectionViewTextItem* item = [[[CollectionViewTextItem alloc]
-        initWithType:ItemTypeShippingOption] autorelease];
+    CollectionViewTextItem* item =
+        [[CollectionViewTextItem alloc] initWithType:ItemTypeShippingOption];
     item.text = base::SysUTF16ToNSString(shippingOption->label);
     payments::CurrencyFormatter* currencyFormatter =
         _paymentRequest->GetOrCreateCurrencyFormatter();

diff --git a/ios/chrome/browser/payments/shipping_option_selection_view_controller_unittest.mm b/ios/chrome/browser/payments/shipping_option_selection_view_controller_unittest.mm
index 370cf95..973ab11b 100644
--- a/ios/chrome/browser/payments/shipping_option_selection_view_controller_unittest.mm
+++ b/ios/chrome/browser/payments/shipping_option_selection_view_controller_unittest.mm

@@ -87,8 +87,8 @@
   item = GetCollectionViewItem(0, 0);
   EXPECT_TRUE([item isMemberOfClass:[PaymentsTextItem class]]);
 
-  // Test the loading state.
-  [GetShippingOptionSelectionViewController() setIsLoading:YES];
+  // Test the pending state.
+  [GetShippingOptionSelectionViewController() setPending:YES];
   [GetShippingOptionSelectionViewController() loadModel];
 
   ASSERT_EQ(1, NumberOfSections());

diff --git a/ios/chrome/browser/tabs/tab.h b/ios/chrome/browser/tabs/tab.h
index 163c8274..14acb25 100644
--- a/ios/chrome/browser/tabs/tab.h
+++ b/ios/chrome/browser/tabs/tab.h

@@ -133,7 +133,10 @@
 @property(nonatomic, assign) id<TabHeadersDelegate> tabHeadersDelegate;
 @property(nonatomic, assign) id<TabSnapshottingDelegate>
     tabSnapshottingDelegate;
-@property(nonatomic, readonly) BOOL useDesktopUserAgent;
+
+// Whether or not desktop user agent is used for the currently visible page.
+@property(nonatomic, readonly) BOOL usesDesktopUserAgent;
+
 @property(nonatomic, assign) id<StoreKitLauncher> storeKitLauncher;
 @property(nonatomic, assign) id<FullScreenControllerDelegate>
     fullScreenControllerDelegate;

diff --git a/ios/chrome/browser/tabs/tab.mm b/ios/chrome/browser/tabs/tab.mm
index e8e4d245..f669f1bf 100644
--- a/ios/chrome/browser/tabs/tab.mm
+++ b/ios/chrome/browser/tabs/tab.mm

@@ -1550,13 +1550,16 @@
   [storeKitLauncher_ openAppStore:appId];
 }
 
-- (BOOL)useDesktopUserAgent {
-  web::NavigationItem* currentItem = self.currentNavigationItem;
-  return currentItem && currentItem->IsOverridingUserAgent();
+- (BOOL)usesDesktopUserAgent {
+  if (!self.navigationManager)
+    return NO;
+
+  web::NavigationItem* visibleItem = self.navigationManager->GetVisibleItem();
+  return visibleItem && visibleItem->IsOverridingUserAgent();
 }
 
 - (void)enableDesktopUserAgent {
-  DCHECK_EQ(self.useDesktopUserAgent, NO);
+  DCHECK_EQ(self.usesDesktopUserAgent, NO);
   DCHECK([self navigationManager]);
   [self navigationManager]->OverrideDesktopUserAgentForNextPendingItem();
 }

diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 04a2708..9b3b3af 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm

@@ -1069,7 +1069,7 @@
     return NO;
 
   // If |useDesktopUserAgent| is |NO|, allow useDesktopUserAgent.
-  return !tab.useDesktopUserAgent;
+  return !tab.usesDesktopUserAgent;
 }
 
 // Whether the sharing menu should be shown.
@@ -4814,7 +4814,7 @@
 #pragma mark - PreloadControllerDelegate methods
 
 - (BOOL)shouldUseDesktopUserAgent {
-  return [_model currentTab].useDesktopUserAgent;
+  return [_model currentTab].usesDesktopUserAgent;
 }
 
 - (CRWSessionEntry*)currentSessionEntry {

diff --git a/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm b/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm
index fdb89c2..6e4ff201 100644
--- a/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm
+++ b/ios/chrome/browser/ui/browser_view_controller_dependency_factory.mm

@@ -52,8 +52,7 @@
   DCHECK(infoBarManager);
   SimpleAlertInfoBarDelegate::Create(
       infoBarManager,
-      infobars::InfoBarDelegate::SHOW_PASSKIT_INFOBAR_ERROR_DELEGATE,
-      infobars::InfoBarDelegate::kNoIconID, gfx::VectorIconId::VECTOR_ICON_NONE,
+      infobars::InfoBarDelegate::SHOW_PASSKIT_INFOBAR_ERROR_DELEGATE, nullptr,
       l10n_util::GetStringUTF16(IDS_IOS_GENERIC_PASSKIT_ERROR), true);
 }
 

diff --git a/ios/chrome/browser/ui/tools_menu/BUILD.gn b/ios/chrome/browser/ui/tools_menu/BUILD.gn
index 91972e30..9dcda12 100644
--- a/ios/chrome/browser/ui/tools_menu/BUILD.gn
+++ b/ios/chrome/browser/ui/tools_menu/BUILD.gn

@@ -8,6 +8,8 @@
     "reading_list_menu_view_item.mm",
     "tools_menu_context.h",
     "tools_menu_context.mm",
+    "tools_menu_model.h",
+    "tools_menu_model.mm",
     "tools_menu_view_controller.h",
     "tools_menu_view_controller.mm",
     "tools_menu_view_item.h",

diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_model.h b/ios/chrome/browser/ui/tools_menu/tools_menu_model.h
new file mode 100644
index 0000000..2965b491
--- /dev/null
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_model.h

@@ -0,0 +1,83 @@
+// Copyright 2017 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 IOS_CHROME_BROWSER_UI_TOOLS_MENU_TOOLS_MENU_MODEL_H_
+#define IOS_CHROME_BROWSER_UI_TOOLS_MENU_TOOLS_MENU_MODEL_H_
+
+#import <Foundation/Foundation.h>
+
+// New Tab item accessibility Identifier.
+extern NSString* const kToolsMenuNewTabId;
+// New incognito Tab item accessibility Identifier.
+extern NSString* const kToolsMenuNewIncognitoTabId;
+// Close all Tabs item accessibility Identifier.
+extern NSString* const kToolsMenuCloseAllTabsId;
+// Close all incognito Tabs item accessibility Identifier.
+extern NSString* const kToolsMenuCloseAllIncognitoTabsId;
+// Bookmarks item accessibility Identifier.
+extern NSString* const kToolsMenuBookmarksId;
+// Reading List item accessibility Identifier.
+extern NSString* const kToolsMenuReadingListId;
+// Other Devices item accessibility Identifier.
+extern NSString* const kToolsMenuOtherDevicesId;
+// History item accessibility Identifier.
+extern NSString* const kToolsMenuHistoryId;
+// Report an issue item accessibility Identifier.
+extern NSString* const kToolsMenuReportAnIssueId;
+// Find in Page item accessibility Identifier.
+extern NSString* const kToolsMenuFindInPageId;
+// Reader Mode item accessibility Identifier.
+extern NSString* const kToolsMenuReaderMode;
+// Request desktop item accessibility Identifier.
+extern NSString* const kToolsMenuRequestDesktopId;
+// Settings item accessibility Identifier.
+extern NSString* const kToolsMenuSettingsId;
+// Help item accessibility Identifier.
+extern NSString* const kToolsMenuHelpId;
+// Suggestions item accessibility Identifier.
+extern NSString* const kToolsMenuSuggestionsId;
+
+// Total number of possible menu items.
+const int kToolsMenuNumberOfItems = 15;
+
+// Initialization table for all possible commands to initialize the
+// tools menu at run time. Data initialized into this structure is not mutable.
+struct MenuItemInfo {
+  int title_id;
+  NSString* accessibility_id;
+  int command_id;
+  int toolbar_types;
+  // |visibility| is applied if a menu item is included for a given
+  // |toolbar_types|. A value of 0 means the menu item is always visible for
+  // the given |toolbar_types|.
+  int visibility;
+  // Custom class, if any, for the menu item, or |nil|.
+  Class item_class;
+};
+
+// Flags for different toolbar types
+typedef NS_OPTIONS(NSUInteger, ToolbarType) {
+  // clang-format off
+  ToolbarTypeNone            = 0,
+  ToolbarTypeWebiPhone       = 1 << 0,
+  ToolbarTypeWebiPad         = 1 << 1,
+  ToolbarTypeNoTabsiPad      = 1 << 2,
+  ToolbarTypeSwitcheriPhone  = 1 << 3,
+  ToolbarTypeWebAll          = ToolbarTypeWebiPhone | ToolbarTypeWebiPad,
+  ToolbarTypeAll             = ToolbarTypeWebAll |
+                               ToolbarTypeSwitcheriPhone |
+                               ToolbarTypeNoTabsiPad,
+  // clang-format on
+};
+
+// All possible items.
+extern const MenuItemInfo itemInfoList[kToolsMenuNumberOfItems];
+
+// Returns true if a given item should be visible based on the Toolbar type
+// and if incognito mode or not.
+bool ToolsMenuItemShouldBeVisible(const MenuItemInfo& item,
+                                  bool incognito,
+                                  ToolbarType toolbarType);
+
+#endif  // IOS_CHROME_BROWSER_UI_TOOLS_MENU_TOOLS_MENU_MODEL_H_

diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_model.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_model.mm
new file mode 100644
index 0000000..5387390
--- /dev/null
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_model.mm

@@ -0,0 +1,102 @@
+// Copyright 2017 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 "ios/chrome/browser/ui/tools_menu/tools_menu_model.h"
+
+#include "components/reading_list/core/reading_list_switches.h"
+#include "components/strings/grit/components_strings.h"
+#include "ios/chrome/browser/experimental_flags.h"
+#include "ios/chrome/browser/ui/commands/ios_command_ids.h"
+#import "ios/chrome/browser/ui/tools_menu/reading_list_menu_view_item.h"
+#include "ios/chrome/browser/ui/ui_util.h"
+#include "ios/chrome/grit/ios_strings.h"
+#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
+#import "ios/public/provider/chrome/browser/user_feedback/user_feedback_provider.h"
+
+// Menu items can be marked as visible or not when Incognito is enabled.
+// The following bits are used for |visibility| field in |MenuItemInfo|.
+const NSInteger kVisibleIncognitoOnly = 1 << 0;
+const NSInteger kVisibleNotIncognitoOnly = 1 << 1;
+
+// Declare all the possible items.
+const MenuItemInfo itemInfoList[] = {
+    // clang-format off
+  { IDS_IOS_TOOLS_MENU_NEW_TAB,           kToolsMenuNewTabId,
+    IDC_NEW_TAB,                          ToolbarTypeAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_NEW_INCOGNITO_TAB, kToolsMenuNewIncognitoTabId,
+    IDC_NEW_INCOGNITO_TAB,                ToolbarTypeAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_CLOSE_ALL_TABS,    kToolsMenuCloseAllTabsId,
+    IDC_CLOSE_ALL_TABS,                   ToolbarTypeSwitcheriPhone,
+    kVisibleNotIncognitoOnly,             nil },
+  { IDS_IOS_TOOLS_MENU_CLOSE_ALL_INCOGNITO_TABS,
+    kToolsMenuCloseAllIncognitoTabsId,
+    IDC_CLOSE_ALL_INCOGNITO_TABS,         ToolbarTypeSwitcheriPhone,
+    kVisibleIncognitoOnly,                nil },
+  { IDS_IOS_TOOLS_MENU_BOOKMARKS,         kToolsMenuBookmarksId,
+    IDC_SHOW_BOOKMARK_MANAGER,            ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_READING_LIST,      kToolsMenuReadingListId,
+    IDC_SHOW_READING_LIST,                ToolbarTypeWebAll,
+    0,                                    [ReadingListMenuViewItem class] },
+  { IDS_IOS_TOOLS_MENU_SUGGESTIONS,       kToolsMenuSuggestionsId,
+    IDC_SHOW_SUGGESTIONS,                 ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_RECENT_TABS,       kToolsMenuOtherDevicesId,
+    IDC_SHOW_OTHER_DEVICES,               ToolbarTypeWebAll,
+    kVisibleNotIncognitoOnly,             nil },
+  { IDS_HISTORY_SHOW_HISTORY,             kToolsMenuHistoryId,
+    IDC_SHOW_HISTORY,                     ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_OPTIONS_REPORT_AN_ISSUE,      kToolsMenuReportAnIssueId,
+    IDC_REPORT_AN_ISSUE,                  ToolbarTypeAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_FIND_IN_PAGE,      kToolsMenuFindInPageId,
+    IDC_FIND,                             ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_REQUEST_DESKTOP_SITE, kToolsMenuRequestDesktopId,
+    IDC_REQUEST_DESKTOP_SITE,             ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_READER_MODE,       kToolsMenuReaderMode,
+    IDC_READER_MODE,                      ToolbarTypeWebAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_SETTINGS,          kToolsMenuSettingsId,
+    IDC_OPTIONS,                          ToolbarTypeAll,
+    0,                                    nil },
+  { IDS_IOS_TOOLS_MENU_HELP_MOBILE,           kToolsMenuHelpId,
+    IDC_HELP_PAGE_VIA_MENU,               ToolbarTypeWebAll,
+    0,                                    nil },
+    // clang-format on
+};
+
+bool ToolsMenuItemShouldBeVisible(const MenuItemInfo& item,
+                                  bool incognito,
+                                  ToolbarType toolbarType) {
+  if (!(item.toolbar_types & toolbarType))
+    return false;
+
+  if (incognito && (item.visibility & kVisibleNotIncognitoOnly))
+    return false;
+
+  if (!incognito && (item.visibility & kVisibleIncognitoOnly))
+    return false;
+
+  switch (item.title_id) {
+    case IDS_IOS_TOOLBAR_SHOW_TABS:
+      return IsIPadIdiom();
+    case IDS_IOS_TOOLS_MENU_READER_MODE:
+      return experimental_flags::IsReaderModeEnabled();
+    case IDS_IOS_TOOLS_MENU_READING_LIST:
+      return reading_list::switches::IsReadingListEnabled();
+    case IDS_IOS_TOOLS_MENU_SUGGESTIONS:
+      return experimental_flags::IsSuggestionsUIEnabled();
+    case IDS_IOS_OPTIONS_REPORT_AN_ISSUE:
+      return !ios::GetChromeBrowserProvider()
+                  ->GetUserFeedbackProvider()
+                  ->IsUserFeedbackEnabled();
+    default:
+      return true;
+  }
+}

diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h
index d1f4d50..1f79583 100644
--- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.h

@@ -32,6 +32,7 @@
 extern NSString* const kToolsMenuSettingsId;
 extern NSString* const kToolsMenuHelpId;
 extern NSString* const kToolsMenuSuggestionsId;
+extern NSString* const kToolsMenuReadingListId;
 
 // Tools Popup Table Delegate Protocol
 @protocol ToolsPopupTableDelegate<NSObject>

diff --git a/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc b/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc
index f58b4bb..c13cf55 100644
--- a/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc
+++ b/ios/chrome/browser/ui/webui/net_export/net_export_ui.cc

@@ -139,7 +139,9 @@
 
   net::NetLogCaptureMode capture_mode =
       net_log::NetLogFileWriter::CaptureModeFromString(capture_mode_string);
-  file_writer_->StartNetLog(base::FilePath(), capture_mode);
+  file_writer_->StartNetLog(
+      base::FilePath(), capture_mode,
+      {GetApplicationContext()->GetSystemURLRequestContext()});
 }
 
 void NetExportMessageHandler::OnStopNetLog(const base::ListValue* list) {

diff --git a/ios/chrome/browser/web/blocked_popup_tab_helper_unittest.mm b/ios/chrome/browser/web/blocked_popup_tab_helper_unittest.mm
index e56dd15..2e9050c 100644
--- a/ios/chrome/browser/web/blocked_popup_tab_helper_unittest.mm
+++ b/ios/chrome/browser/web/blocked_popup_tab_helper_unittest.mm

@@ -6,6 +6,7 @@
 
 #include "base/memory/ptr_util.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
@@ -39,6 +40,10 @@
   BlockedPopupTabHelper* GetBlockedPopupTabHelper() {
     return BlockedPopupTabHelper::FromWebState(&web_state_);
   }
+  // Returns InfoBarManager attached to |web_state_|.
+  infobars::InfoBarManager* GetInfobarManager() {
+    return InfoBarManagerImpl::FromWebState(&web_state_);
+  }
 
   web::TestWebState web_state_;
 };
@@ -71,6 +76,33 @@
   EXPECT_FALSE(GetBlockedPopupTabHelper()->ShouldBlockPopup(source_url2));
 }
 
+// Tests that allowing blocked popup calls |show_popup_handler| and allows
+// future popups for the source url.
+TEST_F(BlockedPopupTabHelperTest, AllowBlockedPopup) {
+  const GURL source_url("https://source-url");
+  ASSERT_TRUE(GetBlockedPopupTabHelper()->ShouldBlockPopup(source_url));
+
+  // Block popup.
+  const GURL target_url("https://target-url");
+  web::Referrer referrer(source_url, web::ReferrerPolicyDefault);
+  __block bool show_popup_handler_was_called = false;
+  web::BlockedPopupInfo popup_info(target_url, referrer, nil, ^{
+    show_popup_handler_was_called = true;
+  });
+  GetBlockedPopupTabHelper()->HandlePopup(popup_info);
+
+  // Allow blocked popup.
+  ASSERT_EQ(1U, GetInfobarManager()->infobar_count());
+  infobars::InfoBar* infobar = GetInfobarManager()->infobar_at(0);
+  auto delegate = infobar->delegate()->AsConfirmInfoBarDelegate();
+  ASSERT_TRUE(delegate);
+  delegate->Accept();
+
+  // Verify that handler was called and popups are allowed for |test_url|.
+  EXPECT_TRUE(show_popup_handler_was_called);
+  EXPECT_FALSE(GetBlockedPopupTabHelper()->ShouldBlockPopup(source_url));
+}
+
 // Tests that an infobar is added to the infobar manager when
 // BlockedPopupTabHelper::HandlePopup() is called.
 TEST_F(BlockedPopupTabHelperTest, ShowAndDismissInfoBar) {
@@ -78,19 +110,17 @@
   web::BlockedPopupInfo popup_info(test_url, web::Referrer(), nil, nil);
 
   // Check that there are no infobars showing and no registered observers.
-  infobars::InfoBarManager* infobar_manager =
-      InfoBarManagerImpl::FromWebState(&web_state_);
-  EXPECT_EQ(0U, infobar_manager->infobar_count());
+  EXPECT_EQ(0U, GetInfobarManager()->infobar_count());
   EXPECT_FALSE(IsObservingSources());
 
   // Call |HandlePopup| to show an infobar.
   GetBlockedPopupTabHelper()->HandlePopup(popup_info);
-  ASSERT_EQ(1U, infobar_manager->infobar_count());
+  ASSERT_EQ(1U, GetInfobarManager()->infobar_count());
   EXPECT_TRUE(IsObservingSources());
 
   // Dismiss the infobar and check that the tab helper no longer has any
   // registered observers.
-  infobar_manager->infobar_at(0)->RemoveSelf();
-  EXPECT_EQ(0U, infobar_manager->infobar_count());
+  GetInfobarManager()->infobar_at(0)->RemoveSelf();
+  EXPECT_EQ(0U, GetInfobarManager()->infobar_count());
   EXPECT_FALSE(IsObservingSources());
 }

diff --git a/ios/clean/chrome/browser/ui/actions/tab_strip_actions.h b/ios/clean/chrome/browser/ui/actions/tab_strip_actions.h
index bb46860..4dcd29be 100644
--- a/ios/clean/chrome/browser/ui/actions/tab_strip_actions.h
+++ b/ios/clean/chrome/browser/ui/actions/tab_strip_actions.h

@@ -14,8 +14,10 @@
 // Target/Action methods relating to the tab strip.
 @protocol TabStripActions
 @optional
-// Reveals or hides the tab strip.
-- (void)toggleTabStrip:(id)sender;
+// Shows the tab strip.
+- (void)showTabStrip:(id)sender;
+// Hides the tab strip.
+- (void)hideTabStrip:(id)sender;
 @end
 
 #endif  // IOS_CLEAN_CHROME_BROWSER_UI_ACTIONS_TAB_STRIP_ACTIONS_H_

diff --git a/ios/clean/chrome/browser/ui/tab/BUILD.gn b/ios/clean/chrome/browser/ui/tab/BUILD.gn
index a341ea1..b43a8c9 100644
--- a/ios/clean/chrome/browser/ui/tab/BUILD.gn
+++ b/ios/clean/chrome/browser/ui/tab/BUILD.gn

@@ -4,8 +4,6 @@
 
 source_set("tab") {
   sources = [
-    "tab_container_view_controller.h",
-    "tab_container_view_controller.mm",
     "tab_coordinator.h",
     "tab_coordinator.mm",
   ]
@@ -13,16 +11,30 @@
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
+    ":tab_ui",
     "//base",
     "//ios/clean/chrome/browser",
-    "//ios/clean/chrome/browser/ui",
     "//ios/clean/chrome/browser/ui/actions",
     "//ios/clean/chrome/browser/ui/animators",
     "//ios/clean/chrome/browser/ui/ntp",
-    "//ios/clean/chrome/browser/ui/presenters",
     "//ios/clean/chrome/browser/ui/toolbar",
     "//ios/clean/chrome/browser/ui/web_contents",
     "//ios/shared/chrome/browser/coordinator_context",
     "//ios/web",
   ]
 }
+
+source_set("tab_ui") {
+  sources = [
+    "tab_container_view_controller.h",
+    "tab_container_view_controller.mm",
+  ]
+  deps = [
+    "//ios/clean/chrome/browser/ui",
+    "//ios/clean/chrome/browser/ui/animators",
+    "//ios/clean/chrome/browser/ui/presenters",
+    "//ios/clean/chrome/browser/ui/tab_strip:tab_strip_ui",
+  ]
+  libs = [ "UIKit.framework" ]
+  configs += [ "//build/config/compiler:enable_arc" ]
+}

diff --git a/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm b/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm
index 06c398cd..792a6ab 100644
--- a/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tab/tab_container_view_controller.mm

@@ -8,6 +8,7 @@
 
 #import "ios/clean/chrome/browser/ui/tab/tab_container_view_controller.h"
 
+#import "ios/clean/chrome/browser/ui/tab_strip/tab_strip_events.h"
 #import "ios/clean/chrome/browser/ui/ui_types.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -224,10 +225,22 @@
 }
 
 #pragma mark - TabStripActions
+- (void)showTabStrip:(id)sender {
+  self.tabStripHeightConstraint.constant = kTabStripHeight;
+  // HACK: Remove fake action.
+  [[UIApplication sharedApplication] sendAction:@selector(tabStripDidShow:)
+                                             to:nil
+                                           from:sender
+                                       forEvent:nil];
+}
 
-- (void)toggleTabStrip:(id)sender {
-  self.tabStripHeightConstraint.constant =
-      self.tabStripHeightConstraint.constant > 0.0f ? 0.0f : kTabStripHeight;
+- (void)hideTabStrip:(id)sender {
+  self.tabStripHeightConstraint.constant = 0.0f;
+  // HACK: Remove fake action.
+  [[UIApplication sharedApplication] sendAction:@selector(tabStripDidHide:)
+                                             to:nil
+                                           from:sender
+                                       forEvent:nil];
 }
 
 #pragma mark - Abstract methods to be overriden by subclass

diff --git a/ios/clean/chrome/browser/ui/tab/tab_coordinator.mm b/ios/clean/chrome/browser/ui/tab/tab_coordinator.mm
index 9139cc9..3ccbaa6 100644
--- a/ios/clean/chrome/browser/ui/tab/tab_coordinator.mm
+++ b/ios/clean/chrome/browser/ui/tab/tab_coordinator.mm

@@ -14,6 +14,7 @@
 #include "base/memory/ptr_util.h"
 #import "ios/clean/chrome/browser/browser_coordinator+internal.h"
 #import "ios/clean/chrome/browser/ui/actions/tab_grid_actions.h"
+#import "ios/clean/chrome/browser/ui/actions/tab_strip_actions.h"
 #import "ios/clean/chrome/browser/ui/animators/zoom_transition_animator.h"
 #import "ios/clean/chrome/browser/ui/ntp/new_tab_page_coordinator.h"
 #import "ios/clean/chrome/browser/ui/tab/tab_container_view_controller.h"
@@ -77,9 +78,9 @@
   // controller.
   UIButton* button = [UIButton buttonWithType:UIButtonTypeCustom];
   [button addTarget:nil
-                action:@selector(showTabGrid:)
+                action:@selector(hideTabStrip:)
       forControlEvents:UIControlEventTouchUpInside];
-  [button setTitle:@"Tab grid" forState:UIControlStateNormal];
+  [button setTitle:@"Hide Strip" forState:UIControlStateNormal];
   button.frame = CGRectMake(10, 10, 100, 100);
 
   UIViewController* tabStripViewController = [[UIViewController alloc] init];

diff --git a/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn b/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn
index 606f7132..adfa7cfc 100644
--- a/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn
+++ b/ios/clean/chrome/browser/ui/tab_strip/BUILD.gn

@@ -24,6 +24,7 @@
   sources = [
     "tab_strip_container_view_controller.h",
     "tab_strip_container_view_controller.mm",
+    "tab_strip_events.h",
   ]
   deps = [
     "//base",

diff --git a/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm
index 5a8c92fd..fd1cc8d 100644
--- a/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_container_view_controller.mm

@@ -159,9 +159,12 @@
 #pragma mark - TabStripActions
 
 // Action to toggle visibility of tab strip.
-- (void)toggleTabStrip:(id)sender {
-  self.stripHeightConstraint.constant =
-      self.stripHeightConstraint.constant > 0 ? 0.0 : kStripHeight;
+- (void)showTabStrip:(id)sender {
+  self.stripHeightConstraint.constant = kStripHeight;
+}
+
+- (void)hideTabStrip:(id)sender {
+  self.stripHeightConstraint.constant = 0.0f;
 }
 
 #pragma mark - MenuPresentationDelegate

diff --git a/ios/clean/chrome/browser/ui/tab_strip/tab_strip_events.h b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_events.h
new file mode 100644
index 0000000..8c5c4f8
--- /dev/null
+++ b/ios/clean/chrome/browser/ui/tab_strip/tab_strip_events.h

@@ -0,0 +1,20 @@
+// Copyright 2017 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 IOS_CLEAN_CHROME_BROWSER_UI_TAB_STRIP_TAB_STRIP_EVENTS_H_
+#define IOS_CLEAN_CHROME_BROWSER_UI_TAB_STRIP_TAB_STRIP_EVENTS_H_
+
+#import <Foundation/Foundation.h>
+
+// PLACEHOLDER: TabStrip related events, this might change or be renamed once we
+// figure out the command architecture.
+@protocol TabStripEvents
+@optional
+// Event triggered when the TabStrip has been hidden.
+- (void)tabStripDidHide:(id)sender;
+// Event triggered when the TabStrip has been shown.
+- (void)tabStripDidShow:(id)sender;
+@end
+
+#endif  // IOS_CLEAN_CHROME_BROWSER_UI_TAB_STRIP_TAB_STRIP_EVENTS_H_

diff --git a/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h b/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h
index 274df273..f364c6e 100644
--- a/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h
+++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.h

@@ -17,8 +17,10 @@
 + (instancetype)backToolbarButton;
 // Forward ToolbarButton.
 + (instancetype)forwardToolbarButton;
-// Tab Switcher ToolbarButton.
-+ (instancetype)tabSwitcherToolbarButton;
+// Tab Switcher Strip ToolbarButton.
++ (instancetype)tabSwitcherStripToolbarButton;
+// Tab Switcher Grid ToolbarButton.
++ (instancetype)tabSwitcherGridToolbarButton;
 // Tools Menu ToolbarButton.
 + (instancetype)toolsMenuToolbarButton;
 // Share ToolbarButton.

diff --git a/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.mm b/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.mm
index b83728d3..a0fe3b0 100644
--- a/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.mm
+++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_button+factory.mm

@@ -43,13 +43,18 @@
   return forwardButton;
 }
 
-+ (instancetype)tabSwitcherToolbarButton {
-  ToolbarButton* tabSwitcherButton =
-      [self toolbarButtonWithImageForNormalState:
-                [UIImage imageNamed:@"tabswitcher_tab_switcher_button"]
-                        imageForHighlightedState:nil
-                           imageForDisabledState:nil];
-  return tabSwitcherButton;
++ (instancetype)tabSwitcherStripToolbarButton {
+  return [self toolbarButtonWithImageForNormalState:
+                   [UIImage imageNamed:@"tabswitcher_open_tabs"]
+                           imageForHighlightedState:nil
+                              imageForDisabledState:nil];
+}
+
++ (instancetype)tabSwitcherGridToolbarButton {
+  return [self toolbarButtonWithImageForNormalState:
+                   [UIImage imageNamed:@"tabswitcher_tab_switcher_button"]
+                           imageForHighlightedState:nil
+                              imageForDisabledState:nil];
 }
 
 + (instancetype)toolsMenuToolbarButton {

diff --git a/ios/clean/chrome/browser/ui/toolbar/toolbar_button.h b/ios/clean/chrome/browser/ui/toolbar/toolbar_button.h
index a145b83b..4a968b2 100644
--- a/ios/clean/chrome/browser/ui/toolbar/toolbar_button.h
+++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_button.h

@@ -16,7 +16,8 @@
 @property(nonatomic, assign) ToolbarComponentVisibility visibilityMask;
 // Returns true if the ToolbarButton should be hidden in the current SizeClass.
 @property(nonatomic, assign) BOOL hiddenInCurrentSizeClass;
-// Returns true if the ToolbarButton should be hidden due to a current WebState.
+// Returns true if the ToolbarButton should be hidden due to a current UI state
+// or WebState.
 @property(nonatomic, assign) BOOL hiddenInCurrentState;
 // Returns a ToolbarButton using the three images parameters for their
 // respective state.

diff --git a/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm b/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm
index 57335f8..35850be6 100644
--- a/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm
+++ b/ios/clean/chrome/browser/ui/toolbar/toolbar_view_controller.mm

@@ -10,6 +10,7 @@
 
 #import "base/mac/foundation_util.h"
 #import "ios/clean/chrome/browser/ui/actions/navigation_actions.h"
+#import "ios/clean/chrome/browser/ui/actions/tab_grid_actions.h"
 #import "ios/clean/chrome/browser/ui/actions/tab_strip_actions.h"
 #import "ios/clean/chrome/browser/ui/actions/tools_menu_actions.h"
 #import "ios/clean/chrome/browser/ui/commands/toolbar_commands.h"
@@ -32,7 +33,8 @@
 @property(nonatomic, strong) UIStackView* stackView;
 @property(nonatomic, strong) ToolbarButton* backButton;
 @property(nonatomic, strong) ToolbarButton* forwardButton;
-@property(nonatomic, strong) ToolbarButton* tabSwitcherButton;
+@property(nonatomic, strong) ToolbarButton* tabSwitchStripButton;
+@property(nonatomic, strong) ToolbarButton* tabSwitchGridButton;
 @property(nonatomic, strong) ToolbarButton* toolsMenuButton;
 @property(nonatomic, strong) ToolbarButton* shareButton;
 @property(nonatomic, strong) ToolbarButton* reloadButton;
@@ -45,7 +47,8 @@
 @synthesize omnibox = _omnibox;
 @synthesize backButton = _backButton;
 @synthesize forwardButton = _forwardButton;
-@synthesize tabSwitcherButton = _tabSwitcherButton;
+@synthesize tabSwitchStripButton = _tabSwitchStripButton;
+@synthesize tabSwitchGridButton = _tabSwitchGridButton;
 @synthesize toolsMenuButton = _toolsMenuButton;
 @synthesize shareButton = _shareButton;
 @synthesize reloadButton = _reloadButton;
@@ -66,8 +69,10 @@
   // Stack view to contain toolbar items.
   self.stackView = [[UIStackView alloc] initWithArrangedSubviews:@[
     self.backButton, self.forwardButton, self.reloadButton, self.stopButton,
-    omnibox, self.shareButton, self.tabSwitcherButton, self.toolsMenuButton
+    omnibox, self.shareButton, self.tabSwitchStripButton,
+    self.tabSwitchGridButton, self.toolsMenuButton
   ]];
+  [self updateAllButtonsVisibility];
   self.stackView.translatesAutoresizingMaskIntoConstraints = NO;
   self.stackView.spacing = 16.0;
   self.stackView.distribution = UIStackViewDistributionFillProportionally;
@@ -115,14 +120,24 @@
                          action:@selector(goForward:)
                forControlEvents:UIControlEventTouchUpInside];
 
-  // Tab switcher button.
-  self.tabSwitcherButton = [ToolbarButton tabSwitcherToolbarButton];
-  self.tabSwitcherButton.visibilityMask =
+  // Tab switcher Strip button.
+  self.tabSwitchStripButton = [ToolbarButton tabSwitcherStripToolbarButton];
+  self.tabSwitchStripButton.visibilityMask =
       ToolbarComponentVisibilityCompactWidth |
       ToolbarComponentVisibilityRegularWidth;
-  [self.tabSwitcherButton addTarget:nil
-                             action:@selector(toggleTabStrip:)
-                   forControlEvents:UIControlEventTouchUpInside];
+  [self.tabSwitchStripButton addTarget:nil
+                                action:@selector(showTabStrip:)
+                      forControlEvents:UIControlEventTouchUpInside];
+
+  // Tab switcher Grid button.
+  self.tabSwitchGridButton = [ToolbarButton tabSwitcherGridToolbarButton];
+  self.tabSwitchGridButton.visibilityMask =
+      ToolbarComponentVisibilityCompactWidth |
+      ToolbarComponentVisibilityRegularWidth;
+  [self.tabSwitchGridButton addTarget:nil
+                               action:@selector(showTabGrid:)
+                     forControlEvents:UIControlEventTouchUpInside];
+  self.tabSwitchGridButton.hiddenInCurrentState = YES;
 
   // Tools menu button.
   self.toolsMenuButton = [ToolbarButton toolsMenuToolbarButton];
@@ -194,6 +209,20 @@
   [self.toolbarCommandHandler closeToolsMenu];
 }
 
+#pragma mark - TabStripEvents
+
+- (void)tabStripDidShow:(id)sender {
+  self.tabSwitchStripButton.hiddenInCurrentState = YES;
+  self.tabSwitchGridButton.hiddenInCurrentState = NO;
+  [self updateAllButtonsVisibility];
+}
+
+- (void)tabStripDidHide:(id)sender {
+  self.tabSwitchStripButton.hiddenInCurrentState = NO;
+  self.tabSwitchGridButton.hiddenInCurrentState = YES;
+  [self updateAllButtonsVisibility];
+}
+
 #pragma mark - Helper Methods
 
 // PLACEHOLDER: We are not sure yet how WebState changes will affect Toolbar

diff --git a/ios/showcase/common/BUILD.gn b/ios/showcase/common/BUILD.gn
index 8a5dcd14..dac7a08 100644
--- a/ios/showcase/common/BUILD.gn
+++ b/ios/showcase/common/BUILD.gn

@@ -5,6 +5,7 @@
 source_set("common") {
   sources = [
     "coordinator.h",
+    "navigation_coordinator.h",
     "protocol_alerter.h",
     "protocol_alerter.mm",
   ]

diff --git a/ios/showcase/common/navigation_coordinator.h b/ios/showcase/common/navigation_coordinator.h
new file mode 100644
index 0000000..3ec8e58f
--- /dev/null
+++ b/ios/showcase/common/navigation_coordinator.h

@@ -0,0 +1,21 @@
+// Copyright 2017 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 IOS_SHOWCASE_COMMON_NAVIGATION_COORDINATOR_H_
+#define IOS_SHOWCASE_COMMON_NAVIGATION_COORDINATOR_H_
+
+#import <Foundation/Foundation.h>
+
+#import "ios/showcase/common/coordinator.h"
+
+// This protocol is a specialization of the Coordinator protocol when the driven
+// view controller is pushed on a navigation controller.
+@protocol NavigationCoordinator<Coordinator>
+
+// Redefined to be a UINavigationController.
+@property(nonatomic, weak) UINavigationController* baseViewController;
+
+@end
+
+#endif  // IOS_SHOWCASE_COMMON_NAVIGATION_COORDINATOR_H_

diff --git a/ios/showcase/common/protocol_alerter.h b/ios/showcase/common/protocol_alerter.h
index 02ad7645..4eb6afc 100644
--- a/ios/showcase/common/protocol_alerter.h
+++ b/ios/showcase/common/protocol_alerter.h

@@ -17,7 +17,7 @@
 // protocols in |protocols|.
 - (instancetype)initWithProtocols:(NSArray<Protocol*>*)protocols;
 
-// The view controller (if any)_ that will be used to present alerts.
+// The view controller (if any) that will be used to present alerts.
 @property(nonatomic, weak) UIViewController* baseViewController;
 
 @end

diff --git a/ios/showcase/settings/sc_settings_coordinator.h b/ios/showcase/settings/sc_settings_coordinator.h
index b611b7c..3a4cd8c5 100644
--- a/ios/showcase/settings/sc_settings_coordinator.h
+++ b/ios/showcase/settings/sc_settings_coordinator.h

@@ -7,13 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/showcase/common/coordinator.h"
+#import "ios/showcase/common/navigation_coordinator.h"
 
-@interface SCSettingsCoordinator : NSObject<Coordinator>
-
-// Redefined to be a UINavigationController.
-@property(nonatomic, weak) UINavigationController* baseViewController;
-
+@interface SCSettingsCoordinator : NSObject<NavigationCoordinator>
 @end
 
 #endif  // IOS_SHOWCASE_SETTINGS_SC_SETTINGS_COORDINATOR_H_

diff --git a/ios/showcase/suggestions/sc_suggestions_coordinator.h b/ios/showcase/suggestions/sc_suggestions_coordinator.h
index 695af48..d6700db 100644
--- a/ios/showcase/suggestions/sc_suggestions_coordinator.h
+++ b/ios/showcase/suggestions/sc_suggestions_coordinator.h

@@ -7,13 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/showcase/common/coordinator.h"
+#import "ios/showcase/common/navigation_coordinator.h"
 
-@interface SCSuggestionsCoordinator : NSObject<Coordinator>
-
-// Redefined to be a UINavigationController.
-@property(nonatomic, weak) UINavigationController* baseViewController;
-
+@interface SCSuggestionsCoordinator : NSObject<NavigationCoordinator>
 @end
 
 #endif  // IOS_SHOWCASE_SUGGESTIONS_SC_SUGGESTIONS_COORDINATOR_H_

diff --git a/ios/showcase/tab_grid/sc_tab_grid_coordinator.h b/ios/showcase/tab_grid/sc_tab_grid_coordinator.h
index 0ae9780..9ad6e4d 100644
--- a/ios/showcase/tab_grid/sc_tab_grid_coordinator.h
+++ b/ios/showcase/tab_grid/sc_tab_grid_coordinator.h

@@ -7,11 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/showcase/common/coordinator.h"
+#import "ios/showcase/common/navigation_coordinator.h"
 
-@interface SCTabGridCoordinator : NSObject<Coordinator>
-// Redefined to be a UINavigationController.
-@property(nonatomic, weak) UINavigationController* baseViewController;
+@interface SCTabGridCoordinator : NSObject<NavigationCoordinator>
 @end
 
 #endif  // IOS_SHOWCASE_TAB_GRID_SC_TAB_GRID_COORDINATOR_H_

diff --git a/ios/showcase/tab_strip/sc_tab_strip_coordinator.h b/ios/showcase/tab_strip/sc_tab_strip_coordinator.h
index 6a12493..9e4e781 100644
--- a/ios/showcase/tab_strip/sc_tab_strip_coordinator.h
+++ b/ios/showcase/tab_strip/sc_tab_strip_coordinator.h

@@ -7,11 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/showcase/common/coordinator.h"
+#import "ios/showcase/common/navigation_coordinator.h"
 
-@interface SCTabStripCoordinator : NSObject<Coordinator>
-// Redefined to be a UINavigationController.
-@property(nonatomic, weak) UINavigationController* baseViewController;
+@interface SCTabStripCoordinator : NSObject<NavigationCoordinator>
 @end
 
 #endif  // IOS_SHOWCASE_TAB_STRIP_SC_TAB_STRIP_COORDINATOR_H_

diff --git a/ios/showcase/tab_strip/sc_tab_strip_coordinator.mm b/ios/showcase/tab_strip/sc_tab_strip_coordinator.mm
index f6e5346..ab874040 100644
--- a/ios/showcase/tab_strip/sc_tab_strip_coordinator.mm
+++ b/ios/showcase/tab_strip/sc_tab_strip_coordinator.mm

@@ -25,7 +25,7 @@
 
   UIViewController* greenViewController =
       [self viewControllerWithButtonTitle:@"toggleStrip"
-                                   action:@selector(toggleTabStrip:)];
+                                   action:@selector(hideTabStrip:)];
   greenViewController.view.backgroundColor = [UIColor greenColor];
 
   self.viewController = [[TabStripContainerViewController alloc] init];

diff --git a/ios/showcase/toolbar/sc_toolbar_coordinator.h b/ios/showcase/toolbar/sc_toolbar_coordinator.h
index ff6fe19e..8f404f29 100644
--- a/ios/showcase/toolbar/sc_toolbar_coordinator.h
+++ b/ios/showcase/toolbar/sc_toolbar_coordinator.h

@@ -7,12 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/showcase/common/coordinator.h"
+#import "ios/showcase/common/navigation_coordinator.h"
 
-@interface SCToolbarCoordinator : NSObject<Coordinator>
-// Redefined to be a UINavigationController.
-@property(nonatomic, weak) UINavigationController* baseViewController;
-
+@interface SCToolbarCoordinator : NSObject<NavigationCoordinator>
 @end
 
 #endif  // IOS_SHOWCASE_TOOLBAR_SC_TOOLBAR_COORDINATOR_H_

diff --git a/ios/third_party/material_components_ios/README.chromium b/ios/third_party/material_components_ios/README.chromium
index 7ee04302..17211b8 100644
--- a/ios/third_party/material_components_ios/README.chromium
+++ b/ios/third_party/material_components_ios/README.chromium

@@ -1,7 +1,7 @@
 Name: Material Components for iOS
 URL: https://github.com/material-components/material-components-ios
 Version: 0
-Revision: 31d5812485c52a53074a971efb32438a2d5d241f
+Revision: 6752ec5219edd41b625a39f58793df3663cc5861
 License: Apache 2.0
 License File: LICENSE
 Security Critical: yes

diff --git a/ios/web/navigation/crw_session_controller.mm b/ios/web/navigation/crw_session_controller.mm
index d03bf94..7f7eec76 100644
--- a/ios/web/navigation/crw_session_controller.mm
+++ b/ios/web/navigation/crw_session_controller.mm

@@ -74,10 +74,6 @@
   // interval since 1970.
   NSTimeInterval _lastVisitedTimestamp;
 
-  // If |YES|, override |currentEntry.useDesktopUserAgent| and create the
-  // pending entry using the desktop user agent.
-  BOOL _useDesktopUserAgentForNextPendingItem;
-
   // The browser state associated with this CRWSessionController;
   web::BrowserState* _browserState;  // weak
 
@@ -496,11 +492,14 @@
                 transition:(ui::PageTransition)transition {
   DCHECK(![self pendingEntry]);
   DCHECK([self currentEntry]);
-  web::NavigationItem* currentItem = [self currentEntry].navigationItem;
-  CHECK(web::history_state_util::IsHistoryStateChangeValid(
-      currentItem->GetURL(), URL));
-  web::Referrer referrer(currentItem->GetURL(), web::ReferrerPolicyDefault);
 
+  web::NavigationItem* lastCommittedItem =
+      self.lastCommittedEntry.navigationItem;
+  CHECK(web::history_state_util::IsHistoryStateChangeValid(
+      lastCommittedItem->GetURL(), URL));
+
+  web::Referrer referrer(lastCommittedItem->GetURL(),
+                         web::ReferrerPolicyDefault);
   base::scoped_nsobject<CRWSessionEntry> pushedEntry([self
       sessionEntryWithURL:URL
                  referrer:referrer
@@ -508,11 +507,11 @@
            initiationType:web::NavigationInitiationType::USER_INITIATED]);
 
   web::NavigationItemImpl* pushedItem = [pushedEntry navigationItemImpl];
-  pushedItem->SetIsOverridingUserAgent(currentItem->IsOverridingUserAgent());
+  pushedItem->SetIsOverridingUserAgent(
+      lastCommittedItem->IsOverridingUserAgent());
   pushedItem->SetSerializedStateObject(stateObject);
   pushedItem->SetIsCreatedFromPushState(true);
-  web::SSLStatus& sslStatus = [self currentEntry].navigationItem->GetSSL();
-  pushedEntry.get().navigationItem->GetSSL() = sslStatus;
+  pushedItem->GetSSL() = lastCommittedItem->GetSSL();
 
   [self clearForwardItems];
   // Add the new entry at the end.

diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 6d0fb2c..3564aab 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm

@@ -458,9 +458,9 @@
 
 // Returns YES if the user interacted with the page recently.
 @property(nonatomic, readonly) BOOL userClickedRecently;
-// Returns whether the desktop user agent should be used when setting the user
-// agent.
-@property(nonatomic, readonly) BOOL useDesktopUserAgent;
+
+// Whether or not desktop user agent is used for the currentItem.
+@property(nonatomic, readonly) BOOL usesDesktopUserAgent;
 
 // Facade for Mojo API.
 @property(nonatomic, readonly) web::MojoFacade* mojoFacade;
@@ -2349,7 +2349,7 @@
   return rendererInitiatedWithoutInteraction || noNavigationItems;
 }
 
-- (BOOL)useDesktopUserAgent {
+- (BOOL)usesDesktopUserAgent {
   web::NavigationItem* item = [self currentNavItem];
   return item && item->IsOverridingUserAgent();
 }
@@ -4225,7 +4225,7 @@
   // delegate must be specified.
   return web::BuildWKWebView(CGRectZero, config,
                              self.webStateImpl->GetBrowserState(),
-                             [self useDesktopUserAgent]);
+                             self.usesDesktopUserAgent);
 }
 
 - (void)setWebView:(WKWebView*)webView {

diff --git a/ios/web/web_state/ui/crw_web_controller_unittest.mm b/ios/web/web_state/ui/crw_web_controller_unittest.mm
index 5f076056..3a52ccdc 100644
--- a/ios/web/web_state/ui/crw_web_controller_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_controller_unittest.mm

@@ -128,6 +128,9 @@
 
 namespace {
 
+// Syntactically invalid URL per rfc3986.
+const char kInvalidURL[] = "http://%3";
+
 const char kTestURLString[] = "http://www.google.com/";
 const char kTestAppSpecificURL[] = "testwebui://test/";
 
@@ -687,6 +690,28 @@
               web::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP);
 }
 
+// Real WKWebView is required for CRWWebControllerInvalidUrlTest.
+typedef web::WebTestWithWebState CRWWebControllerInvalidUrlTest;
+
+// Tests that web controller navigates to about:blank if invalid URL is loaded.
+TEST_F(CRWWebControllerInvalidUrlTest, LoadInvalidURL) {
+  GURL url(kInvalidURL);
+  ASSERT_FALSE(url.is_valid());
+  LoadHtml(@"<html><body></body></html>", url);
+  EXPECT_EQ(GURL(url::kAboutBlankURL), web_state()->GetLastCommittedURL());
+}
+
+// Tests that web controller does not navigate to about:blank if iframe src
+// has invalid url. Web controller loads about:blank if page navigates to
+// invalid url, but should do nothing if navigation is performed in iframe. This
+// test prevents crbug.com/694865 regression.
+TEST_F(CRWWebControllerInvalidUrlTest, IFrameWithInvalidURL) {
+  GURL url("http://chromium.test");
+  ASSERT_FALSE(GURL(kInvalidURL).is_valid());
+  LoadHtml([NSString stringWithFormat:@"<iframe src='%s'/>", kInvalidURL], url);
+  EXPECT_EQ(url, web_state()->GetLastCommittedURL());
+}
+
 // Real WKWebView is required for CRWWebControllerFormActivityTest.
 typedef web::WebTestWithWebController CRWWebControllerFormActivityTest;
 

diff --git a/ios/web_view/internal/BUILD.gn b/ios/web_view/internal/BUILD.gn
index 80111e55..afe83a3 100644
--- a/ios/web_view/internal/BUILD.gn
+++ b/ios/web_view/internal/BUILD.gn

@@ -9,25 +9,25 @@
   ]
 
   sources = [
-    "criwv.mm",
-    "criwv_browser_state.h",
-    "criwv_browser_state.mm",
-    "criwv_network_delegate.cc",
-    "criwv_network_delegate.h",
-    "criwv_url_request_context_getter.h",
-    "criwv_url_request_context_getter.mm",
-    "criwv_web_client.h",
-    "criwv_web_client.mm",
-    "criwv_web_main_delegate.h",
-    "criwv_web_main_delegate.mm",
-    "criwv_web_main_parts.h",
-    "criwv_web_main_parts.mm",
+    "cwv.mm",
     "cwv_web_view.mm",
     "cwv_web_view_configuration.mm",
     "cwv_website_data_store.mm",
     "cwv_website_data_store_internal.h",
     "pref_names.cc",
     "pref_names.h",
+    "web_view_browser_state.h",
+    "web_view_browser_state.mm",
+    "web_view_network_delegate.cc",
+    "web_view_network_delegate.h",
+    "web_view_url_request_context_getter.h",
+    "web_view_url_request_context_getter.mm",
+    "web_view_web_client.h",
+    "web_view_web_client.mm",
+    "web_view_web_main_delegate.h",
+    "web_view_web_main_delegate.mm",
+    "web_view_web_main_parts.h",
+    "web_view_web_main_parts.mm",
   ]
   deps = [
     "//base",

diff --git a/ios/web_view/internal/criwv.mm b/ios/web_view/internal/criwv.mm
deleted file mode 100644
index 825c829..0000000
--- a/ios/web_view/internal/criwv.mm
+++ /dev/null

@@ -1,74 +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.
-
-#import "ios/web_view/public/criwv.h"
-
-#include <memory>
-
-#include "base/location.h"
-#import "base/mac/bind_objc_block.h"
-#include "base/single_thread_task_runner.h"
-#include "ios/web/public/app/web_main.h"
-#include "ios/web/public/web_thread.h"
-#import "ios/web_view/internal/criwv_web_main_delegate.h"
-#import "ios/web_view/public/cwv_delegate.h"
-#import "ios/web_view/public/cwv_web_view.h"
-#import "ios/web_view/public/cwv_web_view_configuration.h"
-#import "ios/web_view/public/cwv_website_data_store.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-CRIWV* g_criwv = nil;
-}
-
-@interface CRIWV () {
-  std::unique_ptr<ios_web_view::CRIWVWebMainDelegate> _webMainDelegate;
-  std::unique_ptr<web::WebMain> _webMain;
-}
-
-@property(nonatomic, weak) id<CWVDelegate> delegate;
-
-- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate;
-@end
-
-@implementation CRIWV
-
-@synthesize delegate = _delegate;
-
-+ (void)configureWithDelegate:(id<CWVDelegate>)delegate {
-  g_criwv = [[CRIWV alloc] initWithDelegate:delegate];
-}
-
-+ (void)shutDown {
-  g_criwv = nil;
-}
-
-+ (CWVWebView*)webViewWithFrame:(CGRect)frame {
-  CWVWebViewConfiguration* configuration =
-      [[CWVWebViewConfiguration alloc] init];
-  configuration.websiteDataStore = [CWVWebsiteDataStore defaultDataStore];
-
-  return [[CWVWebView alloc] initWithFrame:frame configuration:configuration];
-}
-
-- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate {
-  self = [super init];
-  if (self) {
-    _delegate = delegate;
-    _webMainDelegate.reset(new ios_web_view::CRIWVWebMainDelegate(_delegate));
-    web::WebMainParams params(_webMainDelegate.get());
-    _webMain.reset(new web::WebMain(params));
-  }
-  return self;
-}
-
-- (void)dealloc {
-  _webMain.reset();
-  _webMainDelegate.reset();
-}
-
-@end

diff --git a/ios/web_view/internal/criwv_browser_state.h b/ios/web_view/internal/criwv_browser_state.h
deleted file mode 100644
index 9851667..0000000
--- a/ios/web_view/internal/criwv_browser_state.h
+++ /dev/null

@@ -1,62 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_BROWSER_STATE_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_BROWSER_STATE_H_
-
-#include <memory>
-
-#include "base/files/file_path.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "components/prefs/pref_service.h"
-#include "ios/web/public/browser_state.h"
-
-namespace user_prefs {
-class PrefRegistrySyncable;
-}
-
-namespace ios_web_view {
-
-class CRIWVURLRequestContextGetter;
-
-// CRIWV implementation of BrowserState.  Can only be called from the UI thread.
-class CRIWVBrowserState : public web::BrowserState {
- public:
-  explicit CRIWVBrowserState(bool off_the_record);
-  ~CRIWVBrowserState() override;
-
-  // web::BrowserState implementation.
-  bool IsOffTheRecord() const override;
-  base::FilePath GetStatePath() const override;
-  net::URLRequestContextGetter* GetRequestContext() override;
-
-  // Returns the associated PrefService.
-  PrefService* GetPrefs();
-
-  // Converts from web::BrowserState to CRIWVBrowserState.
-  static CRIWVBrowserState* FromBrowserState(web::BrowserState* browser_state);
-
- private:
-  // Registers the preferences for this BrowserState.
-  void RegisterPrefs(user_prefs::PrefRegistrySyncable* pref_registry);
-
-  // The path associated with this BrowserState object.
-  base::FilePath path_;
-
-  // Whether this BrowserState is incognito.
-  bool off_the_record_;
-
-  // The request context getter for this BrowserState object.
-  scoped_refptr<CRIWVURLRequestContextGetter> request_context_getter_;
-
-  // The PrefService associated with this BrowserState.
-  std::unique_ptr<PrefService> prefs_;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVBrowserState);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_BROWSER_STATE_H_

diff --git a/ios/web_view/internal/criwv_browser_state.mm b/ios/web_view/internal/criwv_browser_state.mm
deleted file mode 100644
index d581ab98..0000000
--- a/ios/web_view/internal/criwv_browser_state.mm
+++ /dev/null

@@ -1,97 +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 "ios/web_view/internal/criwv_browser_state.h"
-
-#include <memory>
-
-#include "base/base_paths.h"
-#include "base/files/file_path.h"
-#include "base/message_loop/message_loop.h"
-#include "base/path_service.h"
-#include "base/threading/thread_restrictions.h"
-#include "components/pref_registry/pref_registry_syncable.h"
-#include "components/prefs/json_pref_store.h"
-#include "components/prefs/pref_filter.h"
-#include "components/prefs/pref_service_factory.h"
-#include "components/translate/core/browser/translate_prefs.h"
-#include "components/translate/core/common/translate_pref_names.h"
-#include "ios/web/public/web_thread.h"
-#include "ios/web_view/internal/criwv_url_request_context_getter.h"
-#include "ios/web_view/internal/pref_names.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-const char kPreferencesFilename[] = FILE_PATH_LITERAL("Preferences");
-}
-
-namespace ios_web_view {
-
-CRIWVBrowserState::CRIWVBrowserState(bool off_the_record)
-    : web::BrowserState(), off_the_record_(off_the_record) {
-  CHECK(PathService::Get(base::DIR_APP_DATA, &path_));
-
-  request_context_getter_ = new CRIWVURLRequestContextGetter(
-      GetStatePath(),
-      web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
-      web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE),
-      web::WebThread::GetTaskRunnerForThread(web::WebThread::CACHE));
-
-  // Initialize prefs.
-  scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry =
-      new user_prefs::PrefRegistrySyncable;
-  RegisterPrefs(pref_registry.get());
-  scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner =
-      JsonPrefStore::GetTaskRunnerForFile(path_,
-                                          web::WebThread::GetBlockingPool());
-
-  scoped_refptr<PersistentPrefStore> user_pref_store = new JsonPrefStore(
-      path_.Append(kPreferencesFilename), sequenced_task_runner, nullptr);
-
-  PrefServiceFactory factory;
-  factory.set_user_prefs(user_pref_store);
-  prefs_ = factory.Create(pref_registry.get());
-}
-
-CRIWVBrowserState::~CRIWVBrowserState() {}
-
-PrefService* CRIWVBrowserState::GetPrefs() {
-  DCHECK(prefs_);
-  return prefs_.get();
-}
-
-// static
-CRIWVBrowserState* CRIWVBrowserState::FromBrowserState(
-    web::BrowserState* browser_state) {
-  return static_cast<CRIWVBrowserState*>(browser_state);
-}
-
-bool CRIWVBrowserState::IsOffTheRecord() const {
-  return off_the_record_;
-}
-
-base::FilePath CRIWVBrowserState::GetStatePath() const {
-  return path_;
-}
-
-net::URLRequestContextGetter* CRIWVBrowserState::GetRequestContext() {
-  return request_context_getter_.get();
-}
-
-void CRIWVBrowserState::RegisterPrefs(
-    user_prefs::PrefRegistrySyncable* pref_registry) {
-  // TODO(crbug.com/679895): Find a good value for the kAcceptLanguages pref.
-  // TODO(crbug.com/679895): Pass this value to the network stack somehow, for
-  // the HTTP header.
-  pref_registry->RegisterStringPref(prefs::kAcceptLanguages,
-                                    l10n_util::GetLocaleOverride());
-  pref_registry->RegisterBooleanPref(prefs::kEnableTranslate, true);
-  translate::TranslatePrefs::RegisterProfilePrefs(pref_registry);
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/criwv_network_delegate.cc b/ios/web_view/internal/criwv_network_delegate.cc
deleted file mode 100644
index 440e0c0..0000000
--- a/ios/web_view/internal/criwv_network_delegate.cc
+++ /dev/null

@@ -1,82 +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 "ios/web_view/internal/criwv_network_delegate.h"
-
-#include "net/base/net_errors.h"
-
-namespace ios_web_view {
-
-CRIWVNetworkDelegate::CRIWVNetworkDelegate() {}
-
-CRIWVNetworkDelegate::~CRIWVNetworkDelegate() {}
-
-int CRIWVNetworkDelegate::OnBeforeURLRequest(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    GURL* new_url) {
-  return net::OK;
-}
-
-int CRIWVNetworkDelegate::OnBeforeStartTransaction(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    net::HttpRequestHeaders* headers) {
-  return net::OK;
-}
-
-void CRIWVNetworkDelegate::OnStartTransaction(
-    net::URLRequest* request,
-    const net::HttpRequestHeaders& headers) {}
-
-int CRIWVNetworkDelegate::OnHeadersReceived(
-    net::URLRequest* request,
-    const net::CompletionCallback& callback,
-    const net::HttpResponseHeaders* original_response_headers,
-    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-    GURL* allowed_unsafe_redirect_url) {
-  return net::OK;
-}
-
-void CRIWVNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
-                                            const GURL& new_location) {}
-
-void CRIWVNetworkDelegate::OnResponseStarted(net::URLRequest* request) {}
-
-void CRIWVNetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
-                                                  int64_t bytes_received) {}
-
-void CRIWVNetworkDelegate::OnCompleted(net::URLRequest* request, bool started) {
-}
-
-void CRIWVNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {}
-
-void CRIWVNetworkDelegate::OnPACScriptError(int line_number,
-                                            const base::string16& error) {}
-
-CRIWVNetworkDelegate::AuthRequiredResponse CRIWVNetworkDelegate::OnAuthRequired(
-    net::URLRequest* request,
-    const net::AuthChallengeInfo& auth_info,
-    const AuthCallback& callback,
-    net::AuthCredentials* credentials) {
-  return AUTH_REQUIRED_RESPONSE_NO_ACTION;
-}
-
-bool CRIWVNetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
-                                           const net::CookieList& cookie_list) {
-  return true;
-}
-
-bool CRIWVNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
-                                          const std::string& cookie_line,
-                                          net::CookieOptions* options) {
-  return true;
-}
-
-bool CRIWVNetworkDelegate::OnCanAccessFile(const net::URLRequest& request,
-                                           const base::FilePath& path) const {
-  return true;
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/criwv_network_delegate.h b/ios/web_view/internal/criwv_network_delegate.h
deleted file mode 100644
index 29858074..0000000
--- a/ios/web_view/internal/criwv_network_delegate.h
+++ /dev/null

@@ -1,61 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_NETWORK_DELEGATE_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_NETWORK_DELEGATE_H_
-
-#include "base/macros.h"
-#include "net/base/network_delegate_impl.h"
-
-namespace ios_web_view {
-
-// CRIWV-specific implementation of NetworkDelegate.
-class CRIWVNetworkDelegate : public net::NetworkDelegateImpl {
- public:
-  CRIWVNetworkDelegate();
-  ~CRIWVNetworkDelegate() override;
-
- private:
-  // net::NetworkDelegate implementation.
-  int OnBeforeURLRequest(net::URLRequest* request,
-                         const net::CompletionCallback& callback,
-                         GURL* new_url) override;
-  int OnBeforeStartTransaction(net::URLRequest* request,
-                               const net::CompletionCallback& callback,
-                               net::HttpRequestHeaders* headers) override;
-  void OnStartTransaction(net::URLRequest* request,
-                          const net::HttpRequestHeaders& headers) override;
-  int OnHeadersReceived(
-      net::URLRequest* request,
-      const net::CompletionCallback& callback,
-      const net::HttpResponseHeaders* original_response_headers,
-      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
-      GURL* allowed_unsafe_redirect_url) override;
-  void OnBeforeRedirect(net::URLRequest* request,
-                        const GURL& new_location) override;
-  void OnResponseStarted(net::URLRequest* request) override;
-  void OnNetworkBytesReceived(net::URLRequest* request,
-                              int64_t bytes_received) override;
-  void OnCompleted(net::URLRequest* request, bool started) override;
-  void OnURLRequestDestroyed(net::URLRequest* request) override;
-  void OnPACScriptError(int line_number, const base::string16& error) override;
-  AuthRequiredResponse OnAuthRequired(
-      net::URLRequest* request,
-      const net::AuthChallengeInfo& auth_info,
-      const AuthCallback& callback,
-      net::AuthCredentials* credentials) override;
-  bool OnCanGetCookies(const net::URLRequest& request,
-                       const net::CookieList& cookie_list) override;
-  bool OnCanSetCookie(const net::URLRequest& request,
-                      const std::string& cookie_line,
-                      net::CookieOptions* options) override;
-  bool OnCanAccessFile(const net::URLRequest& request,
-                       const base::FilePath& path) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVNetworkDelegate);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_NETWORK_DELEGATE_H_

diff --git a/ios/web_view/internal/criwv_url_request_context_getter.h b/ios/web_view/internal/criwv_url_request_context_getter.h
deleted file mode 100644
index ad0f5cff..0000000
--- a/ios/web_view/internal/criwv_url_request_context_getter.h
+++ /dev/null

@@ -1,61 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_URL_REQUEST_CONTEXT_GETTER_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_URL_REQUEST_CONTEXT_GETTER_H_
-
-#include <memory>
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
-#include "net/url_request/url_request_context_getter.h"
-
-namespace net {
-class NetworkDelegate;
-class NetLog;
-class ProxyConfigService;
-class TransportSecurityPersister;
-class URLRequestContext;
-class URLRequestContextStorage;
-}
-
-namespace ios_web_view {
-
-// CRIWV-specific implementation of URLRequestContextGetter.
-class CRIWVURLRequestContextGetter : public net::URLRequestContextGetter {
- public:
-  CRIWVURLRequestContextGetter(
-      const base::FilePath& base_path,
-      const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
-      const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner,
-      const scoped_refptr<base::SingleThreadTaskRunner>& cache_task_runner);
-
-  // net::URLRequestContextGetter implementation.
-  net::URLRequestContext* GetURLRequestContext() override;
-  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
-      const override;
-
- protected:
-  ~CRIWVURLRequestContextGetter() override;
-
- private:
-  base::FilePath base_path_;
-  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
-  scoped_refptr<base::SingleThreadTaskRunner> cache_task_runner_;
-  std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
-  std::unique_ptr<net::NetworkDelegate> network_delegate_;
-  std::unique_ptr<net::URLRequestContextStorage> storage_;
-  std::unique_ptr<net::URLRequestContext> url_request_context_;
-  std::unique_ptr<net::NetLog> net_log_;
-  std::unique_ptr<net::TransportSecurityPersister>
-      transport_security_persister_;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVURLRequestContextGetter);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_URL_REQUEST_CONTEXT_GETTER_H_

diff --git a/ios/web_view/internal/criwv_url_request_context_getter.mm b/ios/web_view/internal/criwv_url_request_context_getter.mm
deleted file mode 100644
index 00ba2a5..0000000
--- a/ios/web_view/internal/criwv_url_request_context_getter.mm
+++ /dev/null

@@ -1,166 +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 "ios/web_view/internal/criwv_url_request_context_getter.h"
-
-#include <utility>
-
-#include "base/base_paths.h"
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "base/memory/ref_counted.h"
-#include "base/path_service.h"
-#include "base/threading/sequenced_worker_pool.h"
-#import "ios/net/cookies/cookie_store_ios_persistent.h"
-#import "ios/web/public/web_client.h"
-#include "ios/web/public/web_thread.h"
-#include "ios/web_view/internal/criwv_network_delegate.h"
-#include "net/base/cache_type.h"
-#include "net/cert/cert_verifier.h"
-#include "net/dns/host_resolver.h"
-#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_network_session.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/transport_security_persister.h"
-#include "net/http/transport_security_state.h"
-#include "net/proxy/proxy_config_service_ios.h"
-#include "net/proxy/proxy_service.h"
-#include "net/ssl/channel_id_service.h"
-#include "net/ssl/default_channel_id_store.h"
-#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/static_http_user_agent_settings.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_storage.h"
-#include "net/url_request/url_request_job_factory_impl.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace ios_web_view {
-
-CRIWVURLRequestContextGetter::CRIWVURLRequestContextGetter(
-    const base::FilePath& base_path,
-    const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
-    const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner,
-    const scoped_refptr<base::SingleThreadTaskRunner>& cache_task_runner)
-    : base_path_(base_path),
-      file_task_runner_(file_task_runner),
-      network_task_runner_(network_task_runner),
-      cache_task_runner_(cache_task_runner),
-      proxy_config_service_(new net::ProxyConfigServiceIOS),
-      net_log_(new net::NetLog()) {}
-
-CRIWVURLRequestContextGetter::~CRIWVURLRequestContextGetter() {}
-
-net::URLRequestContext* CRIWVURLRequestContextGetter::GetURLRequestContext() {
-  DCHECK(network_task_runner_->BelongsToCurrentThread());
-
-  if (!url_request_context_) {
-    url_request_context_.reset(new net::URLRequestContext());
-    url_request_context_->set_net_log(net_log_.get());
-    DCHECK(!network_delegate_.get());
-    network_delegate_.reset(new CRIWVNetworkDelegate);
-    url_request_context_->set_network_delegate(network_delegate_.get());
-
-    storage_.reset(
-        new net::URLRequestContextStorage(url_request_context_.get()));
-
-    // Setup the cookie store.
-    base::FilePath cookie_path;
-    bool cookie_path_found = PathService::Get(base::DIR_APP_DATA, &cookie_path);
-    DCHECK(cookie_path_found);
-    cookie_path = cookie_path.Append("WebShell").Append("Cookies");
-    scoped_refptr<net::CookieMonster::PersistentCookieStore> persistent_store =
-        new net::SQLitePersistentCookieStore(
-            cookie_path, network_task_runner_,
-            web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
-                web::WebThread::GetBlockingPool()->GetSequenceToken()),
-            true, nullptr);
-    std::unique_ptr<net::CookieStoreIOS> cookie_store(
-        new net::CookieStoreIOSPersistent(persistent_store.get()));
-    storage_->set_cookie_store(std::move(cookie_store));
-
-    std::string user_agent = web::GetWebClient()->GetUserAgent(false);
-
-    storage_->set_http_user_agent_settings(
-        base::MakeUnique<net::StaticHttpUserAgentSettings>("en-us,en",
-                                                           user_agent));
-    storage_->set_proxy_service(
-        net::ProxyService::CreateUsingSystemProxyResolver(
-            std::move(proxy_config_service_), 0,
-            url_request_context_->net_log()));
-    storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
-    storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
-
-    std::unique_ptr<net::TransportSecurityState> transport_security_state =
-        base::MakeUnique<net::TransportSecurityState>();
-    storage_->set_transport_security_state(std::move(transport_security_state));
-    transport_security_persister_.reset(new net::TransportSecurityPersister(
-        transport_security_state.get(), base_path_, file_task_runner_, false));
-    storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
-        new net::DefaultChannelIDStore(nullptr)));
-    storage_->set_http_server_properties(
-        std::unique_ptr<net::HttpServerProperties>(
-            new net::HttpServerPropertiesImpl()));
-
-    std::unique_ptr<net::HostResolver> host_resolver(
-        net::HostResolver::CreateDefaultResolver(
-            url_request_context_->net_log()));
-    storage_->set_http_auth_handler_factory(
-        net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
-    storage_->set_host_resolver(std::move(host_resolver));
-
-    net::HttpNetworkSession::Params network_session_params;
-    network_session_params.cert_verifier =
-        url_request_context_->cert_verifier();
-    network_session_params.transport_security_state =
-        url_request_context_->transport_security_state();
-    network_session_params.channel_id_service =
-        url_request_context_->channel_id_service();
-    network_session_params.net_log = url_request_context_->net_log();
-    network_session_params.proxy_service =
-        url_request_context_->proxy_service();
-    network_session_params.ssl_config_service =
-        url_request_context_->ssl_config_service();
-    network_session_params.http_auth_handler_factory =
-        url_request_context_->http_auth_handler_factory();
-    network_session_params.http_server_properties =
-        url_request_context_->http_server_properties();
-    network_session_params.host_resolver =
-        url_request_context_->host_resolver();
-
-    base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
-    std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
-        new net::HttpCache::DefaultBackend(net::DISK_CACHE,
-                                           net::CACHE_BACKEND_DEFAULT,
-                                           cache_path, 0, cache_task_runner_));
-
-    storage_->set_http_network_session(
-        base::MakeUnique<net::HttpNetworkSession>(network_session_params));
-    storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
-        storage_->http_network_session(), std::move(main_backend),
-        true /* set_up_quic_server_info */));
-
-    std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
-        new net::URLRequestJobFactoryImpl());
-    bool set_protocol = job_factory->SetProtocolHandler(
-        "data", base::MakeUnique<net::DataProtocolHandler>());
-    DCHECK(set_protocol);
-
-    storage_->set_job_factory(std::move(job_factory));
-  }
-
-  return url_request_context_.get();
-}
-
-scoped_refptr<base::SingleThreadTaskRunner>
-CRIWVURLRequestContextGetter::GetNetworkTaskRunner() const {
-  return network_task_runner_;
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/criwv_web_client.h b/ios/web_view/internal/criwv_web_client.h
deleted file mode 100644
index 71cd52c4..0000000
--- a/ios/web_view/internal/criwv_web_client.h
+++ /dev/null

@@ -1,47 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_CLIENT_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_CLIENT_H_
-
-#include <memory>
-#include "base/compiler_specific.h"
-#import "ios/web/public/web_client.h"
-
-@protocol CWVDelegate;
-
-namespace ios_web_view {
-class CRIWVBrowserState;
-class CRIWVWebMainParts;
-
-// CRIWV-specific implementation of WebClient.  Delegates some functionality to
-// CWVDelegate.
-class CRIWVWebClient : public web::WebClient {
- public:
-  explicit CRIWVWebClient(id<CWVDelegate> delegate);
-  ~CRIWVWebClient() override;
-
-  // WebClient implementation.
-  web::WebMainParts* CreateWebMainParts() override;
-  std::string GetProduct() const override;
-  std::string GetUserAgent(bool desktop_user_agent) const override;
-
-  // Normal browser state associated with the receiver.
-  CRIWVBrowserState* browser_state() const;
-  // Off the record browser state  associated with the receiver.
-  CRIWVBrowserState* off_the_record_browser_state() const;
-
- private:
-  // This object's delegate.
-  __weak id<CWVDelegate> delegate_;
-
-  // The WebMainParts created by |CreateWebMainParts()|.
-  CRIWVWebMainParts* web_main_parts_;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVWebClient);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_CLIENT_H_

diff --git a/ios/web_view/internal/criwv_web_client.mm b/ios/web_view/internal/criwv_web_client.mm
deleted file mode 100644
index 87bef98..0000000
--- a/ios/web_view/internal/criwv_web_client.mm
+++ /dev/null

@@ -1,46 +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.
-
-#import "ios/web_view/internal/criwv_web_client.h"
-
-#include "base/strings/sys_string_conversions.h"
-#include "ios/web/public/user_agent.h"
-#include "ios/web_view/internal/criwv_browser_state.h"
-#import "ios/web_view/internal/criwv_web_main_parts.h"
-#import "ios/web_view/public/cwv_delegate.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace ios_web_view {
-
-CRIWVWebClient::CRIWVWebClient(id<CWVDelegate> delegate)
-    : delegate_(delegate), web_main_parts_(nullptr) {}
-
-CRIWVWebClient::~CRIWVWebClient() {}
-
-web::WebMainParts* CRIWVWebClient::CreateWebMainParts() {
-  web_main_parts_ = new CRIWVWebMainParts(delegate_);
-  return web_main_parts_;
-}
-
-CRIWVBrowserState* CRIWVWebClient::browser_state() const {
-  return web_main_parts_->browser_state();
-}
-
-CRIWVBrowserState* CRIWVWebClient::off_the_record_browser_state() const {
-  return web_main_parts_->off_the_record_browser_state();
-}
-
-std::string CRIWVWebClient::GetProduct() const {
-  return base::SysNSStringToUTF8([delegate_ partialUserAgent]);
-}
-
-std::string CRIWVWebClient::GetUserAgent(bool desktop_user_agent) const {
-  std::string product = GetProduct();
-  return web::BuildUserAgentFromProduct(product);
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/criwv_web_main_delegate.h b/ios/web_view/internal/criwv_web_main_delegate.h
deleted file mode 100644
index cc38796..0000000
--- a/ios/web_view/internal/criwv_web_main_delegate.h
+++ /dev/null

@@ -1,38 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_DELEGATE_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_DELEGATE_H_
-
-#include <memory>
-#include "base/macros.h"
-#include "ios/web/public/app/web_main_delegate.h"
-
-@protocol CWVDelegate;
-
-namespace ios_web_view {
-class CRIWVWebClient;
-
-// CRIWV-specific implementation of WebMainDelegate.
-class CRIWVWebMainDelegate : public web::WebMainDelegate {
- public:
-  explicit CRIWVWebMainDelegate(id<CWVDelegate> delegate);
-  ~CRIWVWebMainDelegate() override;
-
-  // WebMainDelegate implementation.
-  void BasicStartupComplete() override;
-
- private:
-  // This object's delegate.
-  __weak id<CWVDelegate> delegate_;
-
-  // The content and web clients registered by this object.
-  std::unique_ptr<CRIWVWebClient> web_client_;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVWebMainDelegate);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_DELEGATE_H_

diff --git a/ios/web_view/internal/criwv_web_main_delegate.mm b/ios/web_view/internal/criwv_web_main_delegate.mm
deleted file mode 100644
index 335d0d68..0000000
--- a/ios/web_view/internal/criwv_web_main_delegate.mm
+++ /dev/null

@@ -1,27 +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.
-
-#import "ios/web_view/internal/criwv_web_main_delegate.h"
-
-#include "base/memory/ptr_util.h"
-#import "ios/web_view/internal/criwv_web_client.h"
-#import "ios/web_view/public/cwv_delegate.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace ios_web_view {
-
-CRIWVWebMainDelegate::CRIWVWebMainDelegate(id<CWVDelegate> delegate)
-    : delegate_(delegate) {}
-
-CRIWVWebMainDelegate::~CRIWVWebMainDelegate() {}
-
-void CRIWVWebMainDelegate::BasicStartupComplete() {
-  web_client_ = base::MakeUnique<CRIWVWebClient>(delegate_);
-  web::SetWebClient(web_client_.get());
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/criwv_web_main_parts.h b/ios/web_view/internal/criwv_web_main_parts.h
deleted file mode 100644
index 18885e26..0000000
--- a/ios/web_view/internal/criwv_web_main_parts.h
+++ /dev/null

@@ -1,47 +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 IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_PARTS_H_
-#define IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_PARTS_H_
-
-#include "ios/web/public/app/web_main_parts.h"
-
-#include <memory>
-
-@protocol CWVDelegate;
-
-namespace ios_web_view {
-class CRIWVBrowserState;
-
-// CRIWV-specific implementation of WebMainParts.
-class CRIWVWebMainParts : public web::WebMainParts {
- public:
-  explicit CRIWVWebMainParts(id<CWVDelegate> delegate);
-  ~CRIWVWebMainParts() override;
-
-  // WebMainParts implementation.
-  void PreMainMessageLoopRun() override;
-
-  // Returns the CRIWVBrowserState for this embedder.
-  CRIWVBrowserState* browser_state() const { return browser_state_.get(); }
-
-  // Returns the off the record CRIWVBrowserState for this embedder.
-  CRIWVBrowserState* off_the_record_browser_state() const {
-    return off_the_record_browser_state_.get();
-  }
-
- private:
-  // This object's delegate.
-  __weak id<CWVDelegate> delegate_;
-
-  // The BrowserState for this embedder.
-  std::unique_ptr<CRIWVBrowserState> browser_state_;
-
-  // The BrowserState for this embedder.
-  std::unique_ptr<CRIWVBrowserState> off_the_record_browser_state_;
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_CRIWV_WEB_MAIN_PARTS_H_

diff --git a/ios/web_view/internal/criwv_web_main_parts.mm b/ios/web_view/internal/criwv_web_main_parts.mm
deleted file mode 100644
index 666b4502..0000000
--- a/ios/web_view/internal/criwv_web_main_parts.mm
+++ /dev/null

@@ -1,52 +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.
-
-#import "ios/web_view/internal/criwv_web_main_parts.h"
-
-#include "base/base_paths.h"
-#include "base/memory/ptr_util.h"
-#include "base/path_service.h"
-#include "components/translate/core/browser/translate_download_manager.h"
-#include "ios/web_view/internal/criwv_browser_state.h"
-#import "ios/web_view/public/cwv_delegate.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-#include "ui/base/resource/resource_bundle.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace ios_web_view {
-
-CRIWVWebMainParts::CRIWVWebMainParts(id<CWVDelegate> delegate) {
-  delegate_ = delegate;
-}
-
-CRIWVWebMainParts::~CRIWVWebMainParts() {}
-
-void CRIWVWebMainParts::PreMainMessageLoopRun() {
-  // Initialize resources.
-  l10n_util::OverrideLocaleWithCocoaLocale();
-  ui::ResourceBundle::InitSharedInstanceWithLocale(
-      std::string(), nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-  base::FilePath pak_file;
-  PathService::Get(base::DIR_MODULE, &pak_file);
-  pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak"));
-  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
-      pak_file, ui::SCALE_FACTOR_NONE);
-
-  browser_state_ = base::MakeUnique<CRIWVBrowserState>(false);
-  off_the_record_browser_state_ = base::MakeUnique<CRIWVBrowserState>(true);
-
-  // Initialize translate.
-  translate::TranslateDownloadManager* download_manager =
-      translate::TranslateDownloadManager::GetInstance();
-  // TODO(crbug.com/679895): See if we need the system request context here.
-  download_manager->set_request_context(browser_state_->GetRequestContext());
-  // TODO(crbug.com/679895): Bring up application locale correctly.
-  download_manager->set_application_locale(l10n_util::GetLocaleOverride());
-  download_manager->language_list()->SetResourceRequestsAllowed(true);
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/cwv.mm b/ios/web_view/internal/cwv.mm
new file mode 100644
index 0000000..e24120c
--- /dev/null
+++ b/ios/web_view/internal/cwv.mm

@@ -0,0 +1,76 @@
+// 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.
+
+#import "ios/web_view/public/cwv.h"
+
+#include <memory>
+
+#include "base/location.h"
+#import "base/mac/bind_objc_block.h"
+#include "base/memory/ptr_util.h"
+#include "base/single_thread_task_runner.h"
+#include "ios/web/public/app/web_main.h"
+#include "ios/web/public/web_thread.h"
+#import "ios/web_view/internal/web_view_web_main_delegate.h"
+#import "ios/web_view/public/cwv_delegate.h"
+#import "ios/web_view/public/cwv_web_view.h"
+#import "ios/web_view/public/cwv_web_view_configuration.h"
+#import "ios/web_view/public/cwv_website_data_store.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+CWV* g_criwv = nil;
+}
+
+@interface CWV () {
+  std::unique_ptr<ios_web_view::WebViewWebMainDelegate> _webMainDelegate;
+  std::unique_ptr<web::WebMain> _webMain;
+}
+
+@property(nonatomic, weak) id<CWVDelegate> delegate;
+
+- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate;
+@end
+
+@implementation CWV
+
+@synthesize delegate = _delegate;
+
++ (void)configureWithDelegate:(id<CWVDelegate>)delegate {
+  g_criwv = [[CWV alloc] initWithDelegate:delegate];
+}
+
++ (void)shutDown {
+  g_criwv = nil;
+}
+
++ (CWVWebView*)webViewWithFrame:(CGRect)frame {
+  CWVWebViewConfiguration* configuration =
+      [[CWVWebViewConfiguration alloc] init];
+  configuration.websiteDataStore = [CWVWebsiteDataStore defaultDataStore];
+
+  return [[CWVWebView alloc] initWithFrame:frame configuration:configuration];
+}
+
+- (instancetype)initWithDelegate:(id<CWVDelegate>)delegate {
+  self = [super init];
+  if (self) {
+    _delegate = delegate;
+    _webMainDelegate =
+        base::MakeUnique<ios_web_view::WebViewWebMainDelegate>(_delegate);
+    web::WebMainParams params(_webMainDelegate.get());
+    _webMain = base::MakeUnique<web::WebMain>(params);
+  }
+  return self;
+}
+
+- (void)dealloc {
+  _webMain.reset();
+  _webMainDelegate.reset();
+}
+
+@end

diff --git a/ios/web_view/internal/cwv_web_view.mm b/ios/web_view/internal/cwv_web_view.mm
index 5fc03bf..648cbfac 100644
--- a/ios/web_view/internal/cwv_web_view.mm
+++ b/ios/web_view/internal/cwv_web_view.mm

@@ -17,9 +17,9 @@
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_delegate_bridge.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
-#include "ios/web_view/internal/criwv_browser_state.h"
 #import "ios/web_view/internal/cwv_website_data_store_internal.h"
-#import "ios/web_view/internal/translate/criwv_translate_client.h"
+#import "ios/web_view/internal/translate/web_view_translate_client.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
 #import "ios/web_view/public/cwv_web_view_configuration.h"
 #import "ios/web_view/public/cwv_web_view_delegate.h"
 #import "ios/web_view/public/cwv_website_data_store.h"
@@ -63,7 +63,7 @@
     _webState->SetDelegate(_webStateDelegate.get());
 
     // Initialize Translate.
-    ios_web_view::CRIWVTranslateClient::CreateForWebState(_webState.get());
+    ios_web_view::WebViewTranslateClient::CreateForWebState(_webState.get());
   }
   return self;
 }
@@ -143,8 +143,8 @@
   _delegate = delegate;
 
   // Set up the translate delegate.
-  ios_web_view::CRIWVTranslateClient* translateClient =
-      ios_web_view::CRIWVTranslateClient::FromWebState(_webState.get());
+  ios_web_view::WebViewTranslateClient* translateClient =
+      ios_web_view::WebViewTranslateClient::FromWebState(_webState.get());
   id<CWVTranslateDelegate> translateDelegate = nil;
   if ([_delegate respondsToSelector:@selector(translateDelegate)])
     translateDelegate = [_delegate translateDelegate];

diff --git a/ios/web_view/internal/cwv_website_data_store.mm b/ios/web_view/internal/cwv_website_data_store.mm
index 520da83..df1c3b3 100644
--- a/ios/web_view/internal/cwv_website_data_store.mm
+++ b/ios/web_view/internal/cwv_website_data_store.mm

@@ -6,8 +6,8 @@
 
 #include <memory.h>
 
-#include "ios/web_view/internal/criwv_browser_state.h"
-#import "ios/web_view/internal/criwv_web_client.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
+#import "ios/web_view/internal/web_view_web_client.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -15,26 +15,26 @@
 
 @implementation CWVWebsiteDataStore
 // TODO(crbug.com/690182): CWVWebsiteDataStore should own _browserState.
-ios_web_view::CRIWVBrowserState* _browserState;
+ios_web_view::WebViewBrowserState* _browserState;
 
 - (BOOL)isPersistent {
   return !_browserState->IsOffTheRecord();
 }
 
-- (ios_web_view::CRIWVBrowserState*)browserState {
+- (ios_web_view::WebViewBrowserState*)browserState {
   return _browserState;
 }
 
 - (void)setBrowserState:
-    (ios_web_view::CRIWVBrowserState* _Nonnull)browserState {
+    (ios_web_view::WebViewBrowserState* _Nonnull)browserState {
   _browserState = browserState;
 }
 
 + (instancetype)defaultDataStore {
   CWVWebsiteDataStore* dataStore = [[CWVWebsiteDataStore alloc] init];
 
-  ios_web_view::CRIWVWebClient* client =
-      static_cast<ios_web_view::CRIWVWebClient*>(web::GetWebClient());
+  ios_web_view::WebViewWebClient* client =
+      static_cast<ios_web_view::WebViewWebClient*>(web::GetWebClient());
   [dataStore setBrowserState:client->browser_state()];
 
   return dataStore;
@@ -43,8 +43,8 @@
 + (instancetype)nonPersistentDataStore {
   CWVWebsiteDataStore* dataStore = [[CWVWebsiteDataStore alloc] init];
 
-  ios_web_view::CRIWVWebClient* client =
-      static_cast<ios_web_view::CRIWVWebClient*>(web::GetWebClient());
+  ios_web_view::WebViewWebClient* client =
+      static_cast<ios_web_view::WebViewWebClient*>(web::GetWebClient());
   [dataStore setBrowserState:client->off_the_record_browser_state()];
 
   return dataStore;

diff --git a/ios/web_view/internal/cwv_website_data_store_internal.h b/ios/web_view/internal/cwv_website_data_store_internal.h
index e826994f..31035e1 100644
--- a/ios/web_view/internal/cwv_website_data_store_internal.h
+++ b/ios/web_view/internal/cwv_website_data_store_internal.h

@@ -8,14 +8,14 @@
 #import "ios/web_view/public/cwv_website_data_store.h"
 
 namespace ios_web_view {
-class CRIWVBrowserState;
+class WebViewBrowserState;
 }  // namespace ios_web_view
 
 @interface CWVWebsiteDataStore ()
 
 // The browser state associated with this website data store.
 @property(nonatomic, readonly, nonnull)
-    ios_web_view::CRIWVBrowserState* browserState;
+    ios_web_view::WebViewBrowserState* browserState;
 
 @end
 

diff --git a/ios/web_view/internal/translate/BUILD.gn b/ios/web_view/internal/translate/BUILD.gn
index 337277f..3c0d86a 100644
--- a/ios/web_view/internal/translate/BUILD.gn
+++ b/ios/web_view/internal/translate/BUILD.gn

@@ -9,12 +9,12 @@
   ]
 
   sources = [
-    "criwv_translate_accept_languages_factory.cc",
-    "criwv_translate_accept_languages_factory.h",
-    "criwv_translate_client.h",
-    "criwv_translate_client.mm",
-    "criwv_translate_manager_impl.h",
-    "criwv_translate_manager_impl.mm",
+    "cwv_translate_manager_impl.h",
+    "cwv_translate_manager_impl.mm",
+    "web_view_translate_accept_languages_factory.cc",
+    "web_view_translate_accept_languages_factory.h",
+    "web_view_translate_client.h",
+    "web_view_translate_client.mm",
   ]
   deps = [
     "//base",

diff --git a/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.cc b/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.cc
deleted file mode 100644
index fe64d96f..0000000
--- a/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.cc
+++ /dev/null

@@ -1,78 +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 "ios/web_view/internal/translate/criwv_translate_accept_languages_factory.h"
-
-#include "base/memory/ptr_util.h"
-#include "base/memory/singleton.h"
-#include "components/keyed_service/core/keyed_service.h"
-#include "components/keyed_service/ios/browser_state_dependency_manager.h"
-#include "components/prefs/pref_service.h"
-#include "components/translate/core/browser/translate_accept_languages.h"
-#include "ios/web_view/internal/criwv_browser_state.h"
-#include "ios/web_view/internal/pref_names.h"
-
-namespace {
-
-// TranslateAcceptLanguagesService is a thin container for
-// TranslateAcceptLanguages to enable associating it with a BrowserState.
-class TranslateAcceptLanguagesService : public KeyedService {
- public:
-  explicit TranslateAcceptLanguagesService(PrefService* prefs);
-  ~TranslateAcceptLanguagesService() override;
-
-  // Returns the associated TranslateAcceptLanguages.
-  translate::TranslateAcceptLanguages& accept_languages() {
-    return accept_languages_;
-  }
-
- private:
-  translate::TranslateAcceptLanguages accept_languages_;
-
-  DISALLOW_COPY_AND_ASSIGN(TranslateAcceptLanguagesService);
-};
-
-TranslateAcceptLanguagesService::TranslateAcceptLanguagesService(
-    PrefService* prefs)
-    : accept_languages_(prefs, prefs::kAcceptLanguages) {}
-
-TranslateAcceptLanguagesService::~TranslateAcceptLanguagesService() {}
-
-}  // namespace
-
-namespace ios_web_view {
-
-// static
-CRIWVTranslateAcceptLanguagesFactory*
-CRIWVTranslateAcceptLanguagesFactory::GetInstance() {
-  return base::Singleton<CRIWVTranslateAcceptLanguagesFactory>::get();
-}
-
-// static
-translate::TranslateAcceptLanguages*
-CRIWVTranslateAcceptLanguagesFactory::GetForBrowserState(
-    CRIWVBrowserState* state) {
-  TranslateAcceptLanguagesService* service =
-      static_cast<TranslateAcceptLanguagesService*>(
-          GetInstance()->GetServiceForBrowserState(state, true));
-  return &service->accept_languages();
-}
-
-CRIWVTranslateAcceptLanguagesFactory::CRIWVTranslateAcceptLanguagesFactory()
-    : BrowserStateKeyedServiceFactory(
-          "TranslateAcceptLanguagesService",
-          BrowserStateDependencyManager::GetInstance()) {}
-
-CRIWVTranslateAcceptLanguagesFactory::~CRIWVTranslateAcceptLanguagesFactory() {}
-
-std::unique_ptr<KeyedService>
-CRIWVTranslateAcceptLanguagesFactory::BuildServiceInstanceFor(
-    web::BrowserState* context) const {
-  CRIWVBrowserState* criwv_browser_state =
-      CRIWVBrowserState::FromBrowserState(context);
-  return base::MakeUnique<TranslateAcceptLanguagesService>(
-      criwv_browser_state->GetPrefs());
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.h b/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.h
deleted file mode 100644
index 15254504..0000000
--- a/ios/web_view/internal/translate/criwv_translate_accept_languages_factory.h
+++ /dev/null

@@ -1,50 +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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_
-#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_
-
-#include <memory>
-#include "base/macros.h"
-#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
-
-namespace base {
-template <typename T>
-struct DefaultSingletonTraits;
-}  // namespace base
-
-namespace translate {
-class TranslateAcceptLanguages;
-}
-
-namespace ios_web_view {
-
-class CRIWVBrowserState;
-
-// TranslateAcceptLanguagesFactory is a way to associate a
-// TranslateAcceptLanguages instance to a BrowserState.
-class CRIWVTranslateAcceptLanguagesFactory
-    : public BrowserStateKeyedServiceFactory {
- public:
-  static translate::TranslateAcceptLanguages* GetForBrowserState(
-      CRIWVBrowserState* browser_state);
-  static CRIWVTranslateAcceptLanguagesFactory* GetInstance();
-
- private:
-  friend struct base::DefaultSingletonTraits<
-      CRIWVTranslateAcceptLanguagesFactory>;
-
-  CRIWVTranslateAcceptLanguagesFactory();
-  ~CRIWVTranslateAcceptLanguagesFactory() override;
-
-  // BrowserStateKeyedServiceFactory implementation.
-  std::unique_ptr<KeyedService> BuildServiceInstanceFor(
-      web::BrowserState* context) const override;
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVTranslateAcceptLanguagesFactory);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_

diff --git a/ios/web_view/internal/translate/criwv_translate_client.h b/ios/web_view/internal/translate/criwv_translate_client.h
deleted file mode 100644
index 6fbdfac..0000000
--- a/ios/web_view/internal/translate/criwv_translate_client.h
+++ /dev/null

@@ -1,82 +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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_CLIENT_H_
-#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_CLIENT_H_
-
-#include <memory>
-#include <string>
-
-#include "components/translate/core/browser/translate_client.h"
-#include "components/translate/core/browser/translate_step.h"
-#include "components/translate/core/common/translate_errors.h"
-#import "components/translate/ios/browser/ios_translate_driver.h"
-#include "ios/web/public/web_state/web_state_observer.h"
-#import "ios/web/public/web_state/web_state_user_data.h"
-
-@protocol CWVTranslateDelegate;
-class PrefService;
-
-namespace translate {
-class TranslateAcceptLanguages;
-class TranslatePrefs;
-class TranslateManager;
-}  // namespace translate
-
-namespace web {
-class WebState;
-}
-
-namespace ios_web_view {
-
-class CRIWVTranslateClient
-    : public translate::TranslateClient,
-      public web::WebStateObserver,
-      public web::WebStateUserData<CRIWVTranslateClient> {
- public:
-  // Sets the delegate passed by the embedder.
-  // |delegate| is assumed to outlive this CRIWVTranslateClient.
-  void set_translate_delegate(id<CWVTranslateDelegate> delegate) {
-    delegate_ = delegate;
-  }
-
- private:
-  friend class web::WebStateUserData<CRIWVTranslateClient>;
-
-  // The lifetime of CRIWVTranslateClient is managed by WebStateUserData.
-  explicit CRIWVTranslateClient(web::WebState* web_state);
-  ~CRIWVTranslateClient() override;
-
-  // TranslateClient implementation.
-  translate::TranslateDriver* GetTranslateDriver() override;
-  PrefService* GetPrefs() override;
-  std::unique_ptr<translate::TranslatePrefs> GetTranslatePrefs() override;
-  translate::TranslateAcceptLanguages* GetTranslateAcceptLanguages() override;
-  int GetInfobarIconID() const override;
-  std::unique_ptr<infobars::InfoBar> CreateInfoBar(
-      std::unique_ptr<translate::TranslateInfoBarDelegate> delegate)
-      const override;
-  void ShowTranslateUI(translate::TranslateStep step,
-                       const std::string& source_language,
-                       const std::string& target_language,
-                       translate::TranslateErrors::Type error_type,
-                       bool triggered_from_menu) override;
-  bool IsTranslatableURL(const GURL& url) override;
-  void ShowReportLanguageDetectionErrorUI(const GURL& report_url) override;
-
-  // web::WebStateObserver implementation.
-  void WebStateDestroyed() override;
-
-  std::unique_ptr<translate::TranslateManager> translate_manager_;
-  translate::IOSTranslateDriver translate_driver_;
-
-  // Delegate provided by the embedder.
-  id<CWVTranslateDelegate> delegate_;  // Weak.
-
-  DISALLOW_COPY_AND_ASSIGN(CRIWVTranslateClient);
-};
-
-}  // namespace ios_web_view
-
-#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_CLIENT_H_

diff --git a/ios/web_view/internal/translate/criwv_translate_client.mm b/ios/web_view/internal/translate/criwv_translate_client.mm
deleted file mode 100644
index 1f42200..0000000
--- a/ios/web_view/internal/translate/criwv_translate_client.mm
+++ /dev/null

@@ -1,146 +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.
-
-#import "ios/web_view/internal/translate/criwv_translate_client.h"
-
-#include <vector>
-
-#include "base/logging.h"
-#import "base/mac/scoped_nsobject.h"
-#include "base/memory/ptr_util.h"
-#include "components/infobars/core/infobar.h"
-#include "components/prefs/pref_service.h"
-#include "components/translate/core/browser/page_translated_details.h"
-#include "components/translate/core/browser/translate_accept_languages.h"
-#include "components/translate/core/browser/translate_infobar_delegate.h"
-#include "components/translate/core/browser/translate_manager.h"
-#include "components/translate/core/browser/translate_prefs.h"
-#include "components/translate/core/browser/translate_step.h"
-#include "ios/web/public/browser_state.h"
-#import "ios/web/public/web_state/web_state.h"
-#include "ios/web_view/internal/criwv_browser_state.h"
-#include "ios/web_view/internal/pref_names.h"
-#include "ios/web_view/internal/translate/criwv_translate_accept_languages_factory.h"
-#import "ios/web_view/internal/translate/criwv_translate_manager_impl.h"
-#import "ios/web_view/public/cwv_translate_delegate.h"
-#include "url/gurl.h"
-
-DEFINE_WEB_STATE_USER_DATA_KEY(ios_web_view::CRIWVTranslateClient);
-
-namespace ios_web_view {
-
-CRIWVTranslateClient::CRIWVTranslateClient(web::WebState* web_state)
-    : web::WebStateObserver(web_state),
-      translate_manager_(base::MakeUnique<translate::TranslateManager>(
-          this,
-          prefs::kAcceptLanguages)),
-      translate_driver_(web_state,
-                        web_state->GetNavigationManager(),
-                        translate_manager_.get()) {}
-
-CRIWVTranslateClient::~CRIWVTranslateClient() {}
-
-// TranslateClient implementation:
-
-std::unique_ptr<infobars::InfoBar> CRIWVTranslateClient::CreateInfoBar(
-    std::unique_ptr<translate::TranslateInfoBarDelegate> delegate) const {
-  NOTREACHED();
-  return nullptr;
-}
-
-void CRIWVTranslateClient::ShowTranslateUI(
-    translate::TranslateStep step,
-    const std::string& source_language,
-    const std::string& target_language,
-    translate::TranslateErrors::Type error_type,
-    bool triggered_from_menu) {
-  if (!delegate_)
-    return;
-
-  if (error_type != translate::TranslateErrors::NONE)
-    step = translate::TRANSLATE_STEP_TRANSLATE_ERROR;
-
-  translate_manager_->GetLanguageState().SetTranslateEnabled(true);
-
-  if (step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE &&
-      !translate_manager_->GetLanguageState().HasLanguageChanged()) {
-    return;
-  }
-
-  base::scoped_nsobject<CRIWVTranslateManagerImpl> criwv_manager(
-      [[CRIWVTranslateManagerImpl alloc]
-          initWithTranslateManager:translate_manager_.get()
-                    sourceLanguage:source_language
-                    targetLanguage:target_language]);
-
-  CRIWVTransateStep criwv_step;
-  switch (step) {
-    case translate::TRANSLATE_STEP_BEFORE_TRANSLATE:
-      criwv_step = CRIWVTransateStepBeforeTranslate;
-      break;
-    case translate::TRANSLATE_STEP_TRANSLATING:
-      criwv_step = CRIWVTransateStepTranslating;
-      break;
-    case translate::TRANSLATE_STEP_AFTER_TRANSLATE:
-      criwv_step = CRIWVTransateStepAfterTranslate;
-      break;
-    case translate::TRANSLATE_STEP_TRANSLATE_ERROR:
-      criwv_step = CRIWVTransateStepError;
-      break;
-    case translate::TRANSLATE_STEP_NEVER_TRANSLATE:
-      NOTREACHED() << "Never translate is not supported yet in web_view.";
-      criwv_step = CRIWVTransateStepError;
-      break;
-  }
-  [delegate_ translateStepChanged:criwv_step manager:criwv_manager.get()];
-}
-
-translate::TranslateDriver* CRIWVTranslateClient::GetTranslateDriver() {
-  return &translate_driver_;
-}
-
-PrefService* CRIWVTranslateClient::GetPrefs() {
-  DCHECK(web_state());
-  return CRIWVBrowserState::FromBrowserState(web_state()->GetBrowserState())
-      ->GetPrefs();
-}
-
-std::unique_ptr<translate::TranslatePrefs>
-CRIWVTranslateClient::GetTranslatePrefs() {
-  DCHECK(web_state());
-  return base::MakeUnique<translate::TranslatePrefs>(
-      GetPrefs(), prefs::kAcceptLanguages, nullptr);
-}
-
-translate::TranslateAcceptLanguages*
-CRIWVTranslateClient::GetTranslateAcceptLanguages() {
-  translate::TranslateAcceptLanguages* accept_languages =
-      CRIWVTranslateAcceptLanguagesFactory::GetForBrowserState(
-          CRIWVBrowserState::FromBrowserState(web_state()->GetBrowserState()));
-  DCHECK(accept_languages);
-  return accept_languages;
-}
-
-int CRIWVTranslateClient::GetInfobarIconID() const {
-  NOTREACHED();
-  return 0;
-}
-
-bool CRIWVTranslateClient::IsTranslatableURL(const GURL& url) {
-  return !url.is_empty() && !url.SchemeIs(url::kFtpScheme);
-}
-
-void CRIWVTranslateClient::ShowReportLanguageDetectionErrorUI(
-    const GURL& report_url) {
-  NOTREACHED();
-}
-
-void CRIWVTranslateClient::WebStateDestroyed() {
-  // Translation process can be interrupted.
-  // Destroying the TranslateManager now guarantees that it never has to deal
-  // with nullptr WebState.
-  translate_manager_.reset();
-}
-
-}  // namespace ios_web_view

diff --git a/ios/web_view/internal/translate/criwv_translate_manager_impl.h b/ios/web_view/internal/translate/criwv_translate_manager_impl.h
deleted file mode 100644
index beb4275..0000000
--- a/ios/web_view/internal/translate/criwv_translate_manager_impl.h
+++ /dev/null

@@ -1,30 +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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_MANAGER_IMPL_H_
-#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_MANAGER_IMPL_H_
-
-#include <string>
-
-#import "ios/web_view/public/criwv_translate_manager.h"
-
-namespace translate {
-class TranslateManager;
-}
-
-// CRIWVTranslateManagerImpl is mostly an Objective-C wrapper around
-// translate::TranslateUIDelegate.
-@interface CRIWVTranslateManagerImpl : NSObject<CRIWVTranslateManager>
-
-- (instancetype)init NS_UNAVAILABLE;
-
-// |manager| is expexted to outlive this CRIWVTranslateManagerImpl.
-- (instancetype)initWithTranslateManager:(translate::TranslateManager*)manager
-                          sourceLanguage:(const std::string&)source
-                          targetLanguage:(const std::string&)target
-    NS_DESIGNATED_INITIALIZER;
-
-@end
-
-#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_CRIWV_TRANSLATE_MANAGER_IMPL_H_

diff --git a/ios/web_view/internal/translate/criwv_translate_manager_impl.mm b/ios/web_view/internal/translate/criwv_translate_manager_impl.mm
deleted file mode 100644
index 8d7f768..0000000
--- a/ios/web_view/internal/translate/criwv_translate_manager_impl.mm
+++ /dev/null

@@ -1,37 +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.
-
-#import "ios/web_view/internal/translate/criwv_translate_manager_impl.h"
-
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "components/translate/core/browser/translate_manager.h"
-#include "components/translate/core/browser/translate_ui_delegate.h"
-
-@implementation CRIWVTranslateManagerImpl {
-  std::unique_ptr<translate::TranslateUIDelegate> _translateUIDelegate;
-}
-
-- (instancetype)initWithTranslateManager:(translate::TranslateManager*)manager
-                          sourceLanguage:(const std::string&)source
-                          targetLanguage:(const std::string&)target {
-  if ((self = [super init])) {
-    DCHECK(manager);
-    _translateUIDelegate = base::MakeUnique<translate::TranslateUIDelegate>(
-        manager->GetWeakPtr(), source, target);
-  }
-  return self;
-}
-
-#pragma mark CRIWVTranslateManager methods
-
-- (void)translate {
-  _translateUIDelegate->Translate();
-}
-
-- (void)revertTranslation {
-  _translateUIDelegate->RevertTranslation();
-}
-
-@end

diff --git a/ios/web_view/internal/translate/cwv_translate_manager_impl.h b/ios/web_view/internal/translate/cwv_translate_manager_impl.h
new file mode 100644
index 0000000..9d2f2ee
--- /dev/null
+++ b/ios/web_view/internal/translate/cwv_translate_manager_impl.h

@@ -0,0 +1,30 @@
+// 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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_CWV_TRANSLATE_MANAGER_IMPL_H_
+#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_CWV_TRANSLATE_MANAGER_IMPL_H_
+
+#include <string>
+
+#import "ios/web_view/public/criwv_translate_manager.h"
+
+namespace translate {
+class TranslateManager;
+}
+
+// CWVTranslateManagerImpl is mostly an Objective-C wrapper around
+// translate::TranslateUIDelegate.
+@interface CWVTranslateManagerImpl : NSObject<CRIWVTranslateManager>
+
+- (instancetype)init NS_UNAVAILABLE;
+
+// |manager| is expexted to outlive this CWVTranslateManagerImpl.
+- (instancetype)initWithTranslateManager:(translate::TranslateManager*)manager
+                          sourceLanguage:(const std::string&)source
+                          targetLanguage:(const std::string&)target
+    NS_DESIGNATED_INITIALIZER;
+
+@end
+
+#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_CWV_TRANSLATE_MANAGER_IMPL_H_

diff --git a/ios/web_view/internal/translate/cwv_translate_manager_impl.mm b/ios/web_view/internal/translate/cwv_translate_manager_impl.mm
new file mode 100644
index 0000000..25e60df8
--- /dev/null
+++ b/ios/web_view/internal/translate/cwv_translate_manager_impl.mm

@@ -0,0 +1,37 @@
+// 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.
+
+#import "ios/web_view/internal/translate/cwv_translate_manager_impl.h"
+
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "components/translate/core/browser/translate_manager.h"
+#include "components/translate/core/browser/translate_ui_delegate.h"
+
+@implementation CWVTranslateManagerImpl {
+  std::unique_ptr<translate::TranslateUIDelegate> _translateUIDelegate;
+}
+
+- (instancetype)initWithTranslateManager:(translate::TranslateManager*)manager
+                          sourceLanguage:(const std::string&)source
+                          targetLanguage:(const std::string&)target {
+  if ((self = [super init])) {
+    DCHECK(manager);
+    _translateUIDelegate = base::MakeUnique<translate::TranslateUIDelegate>(
+        manager->GetWeakPtr(), source, target);
+  }
+  return self;
+}
+
+#pragma mark CRIWVTranslateManager methods
+
+- (void)translate {
+  _translateUIDelegate->Translate();
+}
+
+- (void)revertTranslation {
+  _translateUIDelegate->RevertTranslation();
+}
+
+@end

diff --git a/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.cc b/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.cc
new file mode 100644
index 0000000..1e24463
--- /dev/null
+++ b/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.cc

@@ -0,0 +1,79 @@
+// 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 "ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h"
+
+#include "base/memory/ptr_util.h"
+#include "base/memory/singleton.h"
+#include "components/keyed_service/core/keyed_service.h"
+#include "components/keyed_service/ios/browser_state_dependency_manager.h"
+#include "components/prefs/pref_service.h"
+#include "components/translate/core/browser/translate_accept_languages.h"
+#include "ios/web_view/internal/pref_names.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
+
+namespace {
+
+// TranslateAcceptLanguagesService is a thin container for
+// TranslateAcceptLanguages to enable associating it with a BrowserState.
+class TranslateAcceptLanguagesService : public KeyedService {
+ public:
+  explicit TranslateAcceptLanguagesService(PrefService* prefs);
+  ~TranslateAcceptLanguagesService() override;
+
+  // Returns the associated TranslateAcceptLanguages.
+  translate::TranslateAcceptLanguages& accept_languages() {
+    return accept_languages_;
+  }
+
+ private:
+  translate::TranslateAcceptLanguages accept_languages_;
+
+  DISALLOW_COPY_AND_ASSIGN(TranslateAcceptLanguagesService);
+};
+
+TranslateAcceptLanguagesService::TranslateAcceptLanguagesService(
+    PrefService* prefs)
+    : accept_languages_(prefs, prefs::kAcceptLanguages) {}
+
+TranslateAcceptLanguagesService::~TranslateAcceptLanguagesService() = default;
+
+}  // namespace
+
+namespace ios_web_view {
+
+// static
+WebViewTranslateAcceptLanguagesFactory*
+WebViewTranslateAcceptLanguagesFactory::GetInstance() {
+  return base::Singleton<WebViewTranslateAcceptLanguagesFactory>::get();
+}
+
+// static
+translate::TranslateAcceptLanguages*
+WebViewTranslateAcceptLanguagesFactory::GetForBrowserState(
+    WebViewBrowserState* browser_state) {
+  TranslateAcceptLanguagesService* service =
+      static_cast<TranslateAcceptLanguagesService*>(
+          GetInstance()->GetServiceForBrowserState(browser_state, true));
+  return &service->accept_languages();
+}
+
+WebViewTranslateAcceptLanguagesFactory::WebViewTranslateAcceptLanguagesFactory()
+    : BrowserStateKeyedServiceFactory(
+          "TranslateAcceptLanguagesService",
+          BrowserStateDependencyManager::GetInstance()) {}
+
+WebViewTranslateAcceptLanguagesFactory::
+    ~WebViewTranslateAcceptLanguagesFactory() {}
+
+std::unique_ptr<KeyedService>
+WebViewTranslateAcceptLanguagesFactory::BuildServiceInstanceFor(
+    web::BrowserState* context) const {
+  WebViewBrowserState* browser_state =
+      WebViewBrowserState::FromBrowserState(context);
+  return base::MakeUnique<TranslateAcceptLanguagesService>(
+      browser_state->GetPrefs());
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h b/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h
new file mode 100644
index 0000000..424af04
--- /dev/null
+++ b/ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h

@@ -0,0 +1,50 @@
+// 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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_
+#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_
+
+#include <memory>
+#include "base/macros.h"
+#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
+
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}  // namespace base
+
+namespace translate {
+class TranslateAcceptLanguages;
+}
+
+namespace ios_web_view {
+
+class WebViewBrowserState;
+
+// TranslateAcceptLanguagesFactory is a way to associate a
+// TranslateAcceptLanguages instance to a BrowserState.
+class WebViewTranslateAcceptLanguagesFactory
+    : public BrowserStateKeyedServiceFactory {
+ public:
+  static translate::TranslateAcceptLanguages* GetForBrowserState(
+      WebViewBrowserState* browser_state);
+  static WebViewTranslateAcceptLanguagesFactory* GetInstance();
+
+ private:
+  friend struct base::DefaultSingletonTraits<
+      WebViewTranslateAcceptLanguagesFactory>;
+
+  WebViewTranslateAcceptLanguagesFactory();
+  ~WebViewTranslateAcceptLanguagesFactory() override;
+
+  // BrowserStateKeyedServiceFactory implementation.
+  std::unique_ptr<KeyedService> BuildServiceInstanceFor(
+      web::BrowserState* context) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewTranslateAcceptLanguagesFactory);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_ACCEPT_LANGUAGES_FACTORY_H_

diff --git a/ios/web_view/internal/translate/web_view_translate_client.h b/ios/web_view/internal/translate/web_view_translate_client.h
new file mode 100644
index 0000000..ea80696
--- /dev/null
+++ b/ios/web_view/internal/translate/web_view_translate_client.h

@@ -0,0 +1,82 @@
+// 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 IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_CLIENT_H_
+#define IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_CLIENT_H_
+
+#include <memory>
+#include <string>
+
+#include "components/translate/core/browser/translate_client.h"
+#include "components/translate/core/browser/translate_step.h"
+#include "components/translate/core/common/translate_errors.h"
+#import "components/translate/ios/browser/ios_translate_driver.h"
+#include "ios/web/public/web_state/web_state_observer.h"
+#import "ios/web/public/web_state/web_state_user_data.h"
+
+@protocol CWVTranslateDelegate;
+class PrefService;
+
+namespace translate {
+class TranslateAcceptLanguages;
+class TranslatePrefs;
+class TranslateManager;
+}  // namespace translate
+
+namespace web {
+class WebState;
+}
+
+namespace ios_web_view {
+
+class WebViewTranslateClient
+    : public translate::TranslateClient,
+      public web::WebStateObserver,
+      public web::WebStateUserData<WebViewTranslateClient> {
+ public:
+  // Sets the delegate passed by the embedder.
+  // |delegate| is assumed to outlive this WebViewTranslateClient.
+  void set_translate_delegate(id<CWVTranslateDelegate> delegate) {
+    delegate_ = delegate;
+  }
+
+ private:
+  friend class web::WebStateUserData<WebViewTranslateClient>;
+
+  // The lifetime of WebViewTranslateClient is managed by WebStateUserData.
+  explicit WebViewTranslateClient(web::WebState* web_state);
+  ~WebViewTranslateClient() override;
+
+  // TranslateClient implementation.
+  translate::TranslateDriver* GetTranslateDriver() override;
+  PrefService* GetPrefs() override;
+  std::unique_ptr<translate::TranslatePrefs> GetTranslatePrefs() override;
+  translate::TranslateAcceptLanguages* GetTranslateAcceptLanguages() override;
+  int GetInfobarIconID() const override;
+  std::unique_ptr<infobars::InfoBar> CreateInfoBar(
+      std::unique_ptr<translate::TranslateInfoBarDelegate> delegate)
+      const override;
+  void ShowTranslateUI(translate::TranslateStep step,
+                       const std::string& source_language,
+                       const std::string& target_language,
+                       translate::TranslateErrors::Type error_type,
+                       bool triggered_from_menu) override;
+  bool IsTranslatableURL(const GURL& url) override;
+  void ShowReportLanguageDetectionErrorUI(const GURL& report_url) override;
+
+  // web::WebStateObserver implementation.
+  void WebStateDestroyed() override;
+
+  std::unique_ptr<translate::TranslateManager> translate_manager_;
+  translate::IOSTranslateDriver translate_driver_;
+
+  // Delegate provided by the embedder.
+  id<CWVTranslateDelegate> delegate_;  // Weak.
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewTranslateClient);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_TRANSLATE_WEB_VIEW_TRANSLATE_CLIENT_H_

diff --git a/ios/web_view/internal/translate/web_view_translate_client.mm b/ios/web_view/internal/translate/web_view_translate_client.mm
new file mode 100644
index 0000000..188e9de
--- /dev/null
+++ b/ios/web_view/internal/translate/web_view_translate_client.mm

@@ -0,0 +1,147 @@
+// 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.
+
+#import "ios/web_view/internal/translate/web_view_translate_client.h"
+
+#include <vector>
+
+#include "base/logging.h"
+#import "base/mac/scoped_nsobject.h"
+#include "base/memory/ptr_util.h"
+#include "components/infobars/core/infobar.h"
+#include "components/prefs/pref_service.h"
+#include "components/translate/core/browser/page_translated_details.h"
+#include "components/translate/core/browser/translate_accept_languages.h"
+#include "components/translate/core/browser/translate_infobar_delegate.h"
+#include "components/translate/core/browser/translate_manager.h"
+#include "components/translate/core/browser/translate_prefs.h"
+#include "components/translate/core/browser/translate_step.h"
+#include "ios/web/public/browser_state.h"
+#import "ios/web/public/web_state/web_state.h"
+#include "ios/web_view/internal/pref_names.h"
+#import "ios/web_view/internal/translate/cwv_translate_manager_impl.h"
+#include "ios/web_view/internal/translate/web_view_translate_accept_languages_factory.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
+#import "ios/web_view/public/cwv_translate_delegate.h"
+#include "url/gurl.h"
+
+DEFINE_WEB_STATE_USER_DATA_KEY(ios_web_view::WebViewTranslateClient);
+
+namespace ios_web_view {
+
+WebViewTranslateClient::WebViewTranslateClient(web::WebState* web_state)
+    : web::WebStateObserver(web_state),
+      translate_manager_(base::MakeUnique<translate::TranslateManager>(
+          this,
+          prefs::kAcceptLanguages)),
+      translate_driver_(web_state,
+                        web_state->GetNavigationManager(),
+                        translate_manager_.get()) {}
+
+WebViewTranslateClient::~WebViewTranslateClient() = default;
+
+// TranslateClient implementation:
+
+std::unique_ptr<infobars::InfoBar> WebViewTranslateClient::CreateInfoBar(
+    std::unique_ptr<translate::TranslateInfoBarDelegate> delegate) const {
+  NOTREACHED();
+  return nullptr;
+}
+
+void WebViewTranslateClient::ShowTranslateUI(
+    translate::TranslateStep step,
+    const std::string& source_language,
+    const std::string& target_language,
+    translate::TranslateErrors::Type error_type,
+    bool triggered_from_menu) {
+  if (!delegate_)
+    return;
+
+  if (error_type != translate::TranslateErrors::NONE)
+    step = translate::TRANSLATE_STEP_TRANSLATE_ERROR;
+
+  translate_manager_->GetLanguageState().SetTranslateEnabled(true);
+
+  if (step == translate::TRANSLATE_STEP_BEFORE_TRANSLATE &&
+      !translate_manager_->GetLanguageState().HasLanguageChanged()) {
+    return;
+  }
+
+  base::scoped_nsobject<CWVTranslateManagerImpl> criwv_manager(
+      [[CWVTranslateManagerImpl alloc]
+          initWithTranslateManager:translate_manager_.get()
+                    sourceLanguage:source_language
+                    targetLanguage:target_language]);
+
+  CRIWVTransateStep criwv_step;
+  switch (step) {
+    case translate::TRANSLATE_STEP_BEFORE_TRANSLATE:
+      criwv_step = CRIWVTransateStepBeforeTranslate;
+      break;
+    case translate::TRANSLATE_STEP_TRANSLATING:
+      criwv_step = CRIWVTransateStepTranslating;
+      break;
+    case translate::TRANSLATE_STEP_AFTER_TRANSLATE:
+      criwv_step = CRIWVTransateStepAfterTranslate;
+      break;
+    case translate::TRANSLATE_STEP_TRANSLATE_ERROR:
+      criwv_step = CRIWVTransateStepError;
+      break;
+    case translate::TRANSLATE_STEP_NEVER_TRANSLATE:
+      NOTREACHED() << "Never translate is not supported yet in web_view.";
+      criwv_step = CRIWVTransateStepError;
+      break;
+  }
+  [delegate_ translateStepChanged:criwv_step manager:criwv_manager.get()];
+}
+
+translate::TranslateDriver* WebViewTranslateClient::GetTranslateDriver() {
+  return &translate_driver_;
+}
+
+PrefService* WebViewTranslateClient::GetPrefs() {
+  DCHECK(web_state());
+  return WebViewBrowserState::FromBrowserState(web_state()->GetBrowserState())
+      ->GetPrefs();
+}
+
+std::unique_ptr<translate::TranslatePrefs>
+WebViewTranslateClient::GetTranslatePrefs() {
+  DCHECK(web_state());
+  return base::MakeUnique<translate::TranslatePrefs>(
+      GetPrefs(), prefs::kAcceptLanguages, nullptr);
+}
+
+translate::TranslateAcceptLanguages*
+WebViewTranslateClient::GetTranslateAcceptLanguages() {
+  translate::TranslateAcceptLanguages* accept_languages =
+      WebViewTranslateAcceptLanguagesFactory::GetForBrowserState(
+          WebViewBrowserState::FromBrowserState(
+              web_state()->GetBrowserState()));
+  DCHECK(accept_languages);
+  return accept_languages;
+}
+
+int WebViewTranslateClient::GetInfobarIconID() const {
+  NOTREACHED();
+  return 0;
+}
+
+bool WebViewTranslateClient::IsTranslatableURL(const GURL& url) {
+  return !url.is_empty() && !url.SchemeIs(url::kFtpScheme);
+}
+
+void WebViewTranslateClient::ShowReportLanguageDetectionErrorUI(
+    const GURL& report_url) {
+  NOTREACHED();
+}
+
+void WebViewTranslateClient::WebStateDestroyed() {
+  // Translation process can be interrupted.
+  // Destroying the TranslateManager now guarantees that it never has to deal
+  // with nullptr WebState.
+  translate_manager_.reset();
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_browser_state.h b/ios/web_view/internal/web_view_browser_state.h
new file mode 100644
index 0000000..3c321b0c
--- /dev/null
+++ b/ios/web_view/internal/web_view_browser_state.h

@@ -0,0 +1,64 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_BROWSER_STATE_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_BROWSER_STATE_H_
+
+#include <memory>
+
+#include "base/files/file_path.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "components/prefs/pref_service.h"
+#include "ios/web/public/browser_state.h"
+
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
+namespace ios_web_view {
+
+class WebViewURLRequestContextGetter;
+
+// WebView implementation of BrowserState.  Can only be used only on the UI
+// thread.
+class WebViewBrowserState : public web::BrowserState {
+ public:
+  explicit WebViewBrowserState(bool off_the_record);
+  ~WebViewBrowserState() override;
+
+  // web::BrowserState implementation.
+  bool IsOffTheRecord() const override;
+  base::FilePath GetStatePath() const override;
+  net::URLRequestContextGetter* GetRequestContext() override;
+
+  // Returns the associated PrefService.
+  PrefService* GetPrefs();
+
+  // Converts from web::BrowserState to WebViewBrowserState.
+  static WebViewBrowserState* FromBrowserState(
+      web::BrowserState* browser_state);
+
+ private:
+  // Registers the preferences for this BrowserState.
+  void RegisterPrefs(user_prefs::PrefRegistrySyncable* pref_registry);
+
+  // The path associated with this BrowserState object.
+  base::FilePath path_;
+
+  // Whether this BrowserState is incognito.
+  bool off_the_record_;
+
+  // The request context getter for this BrowserState object.
+  scoped_refptr<WebViewURLRequestContextGetter> request_context_getter_;
+
+  // The PrefService associated with this BrowserState.
+  std::unique_ptr<PrefService> prefs_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewBrowserState);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_BROWSER_STATE_H_

diff --git a/ios/web_view/internal/web_view_browser_state.mm b/ios/web_view/internal/web_view_browser_state.mm
new file mode 100644
index 0000000..6a34819d
--- /dev/null
+++ b/ios/web_view/internal/web_view_browser_state.mm

@@ -0,0 +1,97 @@
+// 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 "ios/web_view/internal/web_view_browser_state.h"
+
+#include <memory>
+
+#include "base/base_paths.h"
+#include "base/files/file_path.h"
+#include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
+#include "base/threading/thread_restrictions.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/json_pref_store.h"
+#include "components/prefs/pref_filter.h"
+#include "components/prefs/pref_service_factory.h"
+#include "components/translate/core/browser/translate_prefs.h"
+#include "components/translate/core/common/translate_pref_names.h"
+#include "ios/web/public/web_thread.h"
+#include "ios/web_view/internal/pref_names.h"
+#include "ios/web_view/internal/web_view_url_request_context_getter.h"
+#include "ui/base/l10n/l10n_util_mac.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+const char kPreferencesFilename[] = FILE_PATH_LITERAL("Preferences");
+}
+
+namespace ios_web_view {
+
+WebViewBrowserState::WebViewBrowserState(bool off_the_record)
+    : web::BrowserState(), off_the_record_(off_the_record) {
+  CHECK(PathService::Get(base::DIR_APP_DATA, &path_));
+
+  request_context_getter_ = new WebViewURLRequestContextGetter(
+      GetStatePath(),
+      web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
+      web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE),
+      web::WebThread::GetTaskRunnerForThread(web::WebThread::CACHE));
+
+  // Initialize prefs.
+  scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry =
+      new user_prefs::PrefRegistrySyncable;
+  RegisterPrefs(pref_registry.get());
+  scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner =
+      JsonPrefStore::GetTaskRunnerForFile(path_,
+                                          web::WebThread::GetBlockingPool());
+
+  scoped_refptr<PersistentPrefStore> user_pref_store = new JsonPrefStore(
+      path_.Append(kPreferencesFilename), sequenced_task_runner, nullptr);
+
+  PrefServiceFactory factory;
+  factory.set_user_prefs(user_pref_store);
+  prefs_ = factory.Create(pref_registry.get());
+}
+
+WebViewBrowserState::~WebViewBrowserState() = default;
+
+PrefService* WebViewBrowserState::GetPrefs() {
+  DCHECK(prefs_);
+  return prefs_.get();
+}
+
+// static
+WebViewBrowserState* WebViewBrowserState::FromBrowserState(
+    web::BrowserState* browser_state) {
+  return static_cast<WebViewBrowserState*>(browser_state);
+}
+
+bool WebViewBrowserState::IsOffTheRecord() const {
+  return off_the_record_;
+}
+
+base::FilePath WebViewBrowserState::GetStatePath() const {
+  return path_;
+}
+
+net::URLRequestContextGetter* WebViewBrowserState::GetRequestContext() {
+  return request_context_getter_.get();
+}
+
+void WebViewBrowserState::RegisterPrefs(
+    user_prefs::PrefRegistrySyncable* pref_registry) {
+  // TODO(crbug.com/679895): Find a good value for the kAcceptLanguages pref.
+  // TODO(crbug.com/679895): Pass this value to the network stack somehow, for
+  // the HTTP header.
+  pref_registry->RegisterStringPref(prefs::kAcceptLanguages,
+                                    l10n_util::GetLocaleOverride());
+  pref_registry->RegisterBooleanPref(prefs::kEnableTranslate, true);
+  translate::TranslatePrefs::RegisterProfilePrefs(pref_registry);
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_network_delegate.cc b/ios/web_view/internal/web_view_network_delegate.cc
new file mode 100644
index 0000000..761aa7b
--- /dev/null
+++ b/ios/web_view/internal/web_view_network_delegate.cc

@@ -0,0 +1,83 @@
+// 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 "ios/web_view/internal/web_view_network_delegate.h"
+
+#include "net/base/net_errors.h"
+
+namespace ios_web_view {
+
+WebViewNetworkDelegate::WebViewNetworkDelegate() {}
+
+WebViewNetworkDelegate::~WebViewNetworkDelegate() = default;
+
+int WebViewNetworkDelegate::OnBeforeURLRequest(
+    net::URLRequest* request,
+    const net::CompletionCallback& callback,
+    GURL* new_url) {
+  return net::OK;
+}
+
+int WebViewNetworkDelegate::OnBeforeStartTransaction(
+    net::URLRequest* request,
+    const net::CompletionCallback& callback,
+    net::HttpRequestHeaders* headers) {
+  return net::OK;
+}
+
+void WebViewNetworkDelegate::OnStartTransaction(
+    net::URLRequest* request,
+    const net::HttpRequestHeaders& headers) {}
+
+int WebViewNetworkDelegate::OnHeadersReceived(
+    net::URLRequest* request,
+    const net::CompletionCallback& callback,
+    const net::HttpResponseHeaders* original_response_headers,
+    scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
+    GURL* allowed_unsafe_redirect_url) {
+  return net::OK;
+}
+
+void WebViewNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
+                                              const GURL& new_location) {}
+
+void WebViewNetworkDelegate::OnResponseStarted(net::URLRequest* request) {}
+
+void WebViewNetworkDelegate::OnNetworkBytesReceived(net::URLRequest* request,
+                                                    int64_t bytes_received) {}
+
+void WebViewNetworkDelegate::OnCompleted(net::URLRequest* request,
+                                         bool started) {}
+
+void WebViewNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {}
+
+void WebViewNetworkDelegate::OnPACScriptError(int line_number,
+                                              const base::string16& error) {}
+
+WebViewNetworkDelegate::AuthRequiredResponse
+WebViewNetworkDelegate::OnAuthRequired(net::URLRequest* request,
+                                       const net::AuthChallengeInfo& auth_info,
+                                       const AuthCallback& callback,
+                                       net::AuthCredentials* credentials) {
+  return AUTH_REQUIRED_RESPONSE_NO_ACTION;
+}
+
+bool WebViewNetworkDelegate::OnCanGetCookies(
+    const net::URLRequest& request,
+    const net::CookieList& cookie_list) {
+  return true;
+}
+
+bool WebViewNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
+                                            const std::string& cookie_line,
+                                            net::CookieOptions* options) {
+  return true;
+}
+
+bool WebViewNetworkDelegate::OnCanAccessFile(const net::URLRequest& request,
+                                             const base::FilePath& path) const {
+  return true;
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_network_delegate.h b/ios/web_view/internal/web_view_network_delegate.h
new file mode 100644
index 0000000..bcc1253
--- /dev/null
+++ b/ios/web_view/internal/web_view_network_delegate.h

@@ -0,0 +1,61 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_NETWORK_DELEGATE_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_NETWORK_DELEGATE_H_
+
+#include "base/macros.h"
+#include "net/base/network_delegate_impl.h"
+
+namespace ios_web_view {
+
+// WebView implementation of NetworkDelegate.
+class WebViewNetworkDelegate : public net::NetworkDelegateImpl {
+ public:
+  WebViewNetworkDelegate();
+  ~WebViewNetworkDelegate() override;
+
+ private:
+  // net::NetworkDelegate implementation.
+  int OnBeforeURLRequest(net::URLRequest* request,
+                         const net::CompletionCallback& callback,
+                         GURL* new_url) override;
+  int OnBeforeStartTransaction(net::URLRequest* request,
+                               const net::CompletionCallback& callback,
+                               net::HttpRequestHeaders* headers) override;
+  void OnStartTransaction(net::URLRequest* request,
+                          const net::HttpRequestHeaders& headers) override;
+  int OnHeadersReceived(
+      net::URLRequest* request,
+      const net::CompletionCallback& callback,
+      const net::HttpResponseHeaders* original_response_headers,
+      scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
+      GURL* allowed_unsafe_redirect_url) override;
+  void OnBeforeRedirect(net::URLRequest* request,
+                        const GURL& new_location) override;
+  void OnResponseStarted(net::URLRequest* request) override;
+  void OnNetworkBytesReceived(net::URLRequest* request,
+                              int64_t bytes_received) override;
+  void OnCompleted(net::URLRequest* request, bool started) override;
+  void OnURLRequestDestroyed(net::URLRequest* request) override;
+  void OnPACScriptError(int line_number, const base::string16& error) override;
+  AuthRequiredResponse OnAuthRequired(
+      net::URLRequest* request,
+      const net::AuthChallengeInfo& auth_info,
+      const AuthCallback& callback,
+      net::AuthCredentials* credentials) override;
+  bool OnCanGetCookies(const net::URLRequest& request,
+                       const net::CookieList& cookie_list) override;
+  bool OnCanSetCookie(const net::URLRequest& request,
+                      const std::string& cookie_line,
+                      net::CookieOptions* options) override;
+  bool OnCanAccessFile(const net::URLRequest& request,
+                       const base::FilePath& path) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewNetworkDelegate);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_NETWORK_DELEGATE_H_

diff --git a/ios/web_view/internal/web_view_url_request_context_getter.h b/ios/web_view/internal/web_view_url_request_context_getter.h
new file mode 100644
index 0000000..c82c8d4c8
--- /dev/null
+++ b/ios/web_view/internal/web_view_url_request_context_getter.h

@@ -0,0 +1,61 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_URL_REQUEST_CONTEXT_GETTER_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_URL_REQUEST_CONTEXT_GETTER_H_
+
+#include <memory>
+#include "base/compiler_specific.h"
+#include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
+#include "net/url_request/url_request_context_getter.h"
+
+namespace net {
+class NetworkDelegate;
+class NetLog;
+class ProxyConfigService;
+class TransportSecurityPersister;
+class URLRequestContext;
+class URLRequestContextStorage;
+}
+
+namespace ios_web_view {
+
+// WebView implementation of URLRequestContextGetter.
+class WebViewURLRequestContextGetter : public net::URLRequestContextGetter {
+ public:
+  WebViewURLRequestContextGetter(
+      const base::FilePath& base_path,
+      const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
+      const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner,
+      const scoped_refptr<base::SingleThreadTaskRunner>& cache_task_runner);
+
+  // net::URLRequestContextGetter implementation.
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
+
+ protected:
+  ~WebViewURLRequestContextGetter() override;
+
+ private:
+  base::FilePath base_path_;
+  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> cache_task_runner_;
+  std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
+  std::unique_ptr<net::NetworkDelegate> network_delegate_;
+  std::unique_ptr<net::URLRequestContextStorage> storage_;
+  std::unique_ptr<net::URLRequestContext> url_request_context_;
+  std::unique_ptr<net::NetLog> net_log_;
+  std::unique_ptr<net::TransportSecurityPersister>
+      transport_security_persister_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewURLRequestContextGetter);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_URL_REQUEST_CONTEXT_GETTER_H_

diff --git a/ios/web_view/internal/web_view_url_request_context_getter.mm b/ios/web_view/internal/web_view_url_request_context_getter.mm
new file mode 100644
index 0000000..e336e3e
--- /dev/null
+++ b/ios/web_view/internal/web_view_url_request_context_getter.mm

@@ -0,0 +1,166 @@
+// 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 "ios/web_view/internal/web_view_url_request_context_getter.h"
+
+#include <utility>
+
+#include "base/base_paths.h"
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
+#include "base/path_service.h"
+#include "base/threading/sequenced_worker_pool.h"
+#import "ios/net/cookies/cookie_store_ios_persistent.h"
+#import "ios/web/public/web_client.h"
+#include "ios/web/public/web_thread.h"
+#include "ios/web_view/internal/web_view_network_delegate.h"
+#include "net/base/cache_type.h"
+#include "net/cert/cert_verifier.h"
+#include "net/dns/host_resolver.h"
+#include "net/extras/sqlite/sqlite_persistent_cookie_store.h"
+#include "net/http/http_auth_handler_factory.h"
+#include "net/http/http_cache.h"
+#include "net/http/http_network_session.h"
+#include "net/http/http_server_properties_impl.h"
+#include "net/http/transport_security_persister.h"
+#include "net/http/transport_security_state.h"
+#include "net/proxy/proxy_config_service_ios.h"
+#include "net/proxy/proxy_service.h"
+#include "net/ssl/channel_id_service.h"
+#include "net/ssl/default_channel_id_store.h"
+#include "net/ssl/ssl_config_service_defaults.h"
+#include "net/url_request/data_protocol_handler.h"
+#include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_job_factory_impl.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace ios_web_view {
+
+WebViewURLRequestContextGetter::WebViewURLRequestContextGetter(
+    const base::FilePath& base_path,
+    const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& cache_task_runner)
+    : base_path_(base_path),
+      file_task_runner_(file_task_runner),
+      network_task_runner_(network_task_runner),
+      cache_task_runner_(cache_task_runner),
+      proxy_config_service_(new net::ProxyConfigServiceIOS),
+      net_log_(new net::NetLog()) {}
+
+WebViewURLRequestContextGetter::~WebViewURLRequestContextGetter() = default;
+
+net::URLRequestContext* WebViewURLRequestContextGetter::GetURLRequestContext() {
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
+
+  if (!url_request_context_) {
+    url_request_context_.reset(new net::URLRequestContext());
+    url_request_context_->set_net_log(net_log_.get());
+    DCHECK(!network_delegate_.get());
+    network_delegate_ = base::MakeUnique<WebViewNetworkDelegate>();
+    url_request_context_->set_network_delegate(network_delegate_.get());
+
+    storage_.reset(
+        new net::URLRequestContextStorage(url_request_context_.get()));
+
+    // Setup the cookie store.
+    base::FilePath cookie_path;
+    bool cookie_path_found = PathService::Get(base::DIR_APP_DATA, &cookie_path);
+    DCHECK(cookie_path_found);
+    cookie_path = cookie_path.Append("WebShell").Append("Cookies");
+    scoped_refptr<net::CookieMonster::PersistentCookieStore> persistent_store =
+        new net::SQLitePersistentCookieStore(
+            cookie_path, network_task_runner_,
+            web::WebThread::GetBlockingPool()->GetSequencedTaskRunner(
+                web::WebThread::GetBlockingPool()->GetSequenceToken()),
+            true, nullptr);
+    std::unique_ptr<net::CookieStoreIOS> cookie_store(
+        new net::CookieStoreIOSPersistent(persistent_store.get()));
+    storage_->set_cookie_store(std::move(cookie_store));
+
+    std::string user_agent = web::GetWebClient()->GetUserAgent(false);
+
+    storage_->set_http_user_agent_settings(
+        base::MakeUnique<net::StaticHttpUserAgentSettings>("en-us,en",
+                                                           user_agent));
+    storage_->set_proxy_service(
+        net::ProxyService::CreateUsingSystemProxyResolver(
+            std::move(proxy_config_service_), 0,
+            url_request_context_->net_log()));
+    storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
+    storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
+
+    std::unique_ptr<net::TransportSecurityState> transport_security_state =
+        base::MakeUnique<net::TransportSecurityState>();
+    storage_->set_transport_security_state(std::move(transport_security_state));
+    transport_security_persister_.reset(new net::TransportSecurityPersister(
+        transport_security_state.get(), base_path_, file_task_runner_, false));
+    storage_->set_channel_id_service(base::MakeUnique<net::ChannelIDService>(
+        new net::DefaultChannelIDStore(nullptr)));
+    storage_->set_http_server_properties(
+        std::unique_ptr<net::HttpServerProperties>(
+            new net::HttpServerPropertiesImpl()));
+
+    std::unique_ptr<net::HostResolver> host_resolver(
+        net::HostResolver::CreateDefaultResolver(
+            url_request_context_->net_log()));
+    storage_->set_http_auth_handler_factory(
+        net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
+    storage_->set_host_resolver(std::move(host_resolver));
+
+    net::HttpNetworkSession::Params network_session_params;
+    network_session_params.cert_verifier =
+        url_request_context_->cert_verifier();
+    network_session_params.transport_security_state =
+        url_request_context_->transport_security_state();
+    network_session_params.channel_id_service =
+        url_request_context_->channel_id_service();
+    network_session_params.net_log = url_request_context_->net_log();
+    network_session_params.proxy_service =
+        url_request_context_->proxy_service();
+    network_session_params.ssl_config_service =
+        url_request_context_->ssl_config_service();
+    network_session_params.http_auth_handler_factory =
+        url_request_context_->http_auth_handler_factory();
+    network_session_params.http_server_properties =
+        url_request_context_->http_server_properties();
+    network_session_params.host_resolver =
+        url_request_context_->host_resolver();
+
+    base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
+    std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
+        new net::HttpCache::DefaultBackend(net::DISK_CACHE,
+                                           net::CACHE_BACKEND_DEFAULT,
+                                           cache_path, 0, cache_task_runner_));
+
+    storage_->set_http_network_session(
+        base::MakeUnique<net::HttpNetworkSession>(network_session_params));
+    storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
+        storage_->http_network_session(), std::move(main_backend),
+        true /* set_up_quic_server_info */));
+
+    std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
+        new net::URLRequestJobFactoryImpl());
+    bool set_protocol = job_factory->SetProtocolHandler(
+        "data", base::MakeUnique<net::DataProtocolHandler>());
+    DCHECK(set_protocol);
+
+    storage_->set_job_factory(std::move(job_factory));
+  }
+
+  return url_request_context_.get();
+}
+
+scoped_refptr<base::SingleThreadTaskRunner>
+WebViewURLRequestContextGetter::GetNetworkTaskRunner() const {
+  return network_task_runner_;
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_web_client.h b/ios/web_view/internal/web_view_web_client.h
new file mode 100644
index 0000000..f8d22f3c
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_client.h

@@ -0,0 +1,46 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_CLIENT_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_CLIENT_H_
+
+#include <memory>
+#include "base/compiler_specific.h"
+#import "ios/web/public/web_client.h"
+
+@protocol CWVDelegate;
+
+namespace ios_web_view {
+class WebViewBrowserState;
+class WebViewWebMainParts;
+
+// WebView implementation of WebClient.
+class WebViewWebClient : public web::WebClient {
+ public:
+  explicit WebViewWebClient(id<CWVDelegate> delegate);
+  ~WebViewWebClient() override;
+
+  // WebClient implementation.
+  web::WebMainParts* CreateWebMainParts() override;
+  std::string GetProduct() const override;
+  std::string GetUserAgent(bool desktop_user_agent) const override;
+
+  // Normal browser state associated with the receiver.
+  WebViewBrowserState* browser_state() const;
+  // Off the record browser state  associated with the receiver.
+  WebViewBrowserState* off_the_record_browser_state() const;
+
+ private:
+  // This object's delegate.
+  __weak id<CWVDelegate> delegate_;
+
+  // The WebMainParts created by |CreateWebMainParts()|.
+  WebViewWebMainParts* web_main_parts_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewWebClient);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_CLIENT_H_

diff --git a/ios/web_view/internal/web_view_web_client.mm b/ios/web_view/internal/web_view_web_client.mm
new file mode 100644
index 0000000..7e5082d
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_client.mm

@@ -0,0 +1,45 @@
+// 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.
+
+#import "ios/web_view/internal/web_view_web_client.h"
+
+#include "base/strings/sys_string_conversions.h"
+#include "ios/web/public/user_agent.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
+#import "ios/web_view/internal/web_view_web_main_parts.h"
+#import "ios/web_view/public/cwv_delegate.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace ios_web_view {
+
+WebViewWebClient::WebViewWebClient(id<CWVDelegate> delegate)
+    : delegate_(delegate), web_main_parts_(nullptr) {}
+
+WebViewWebClient::~WebViewWebClient() = default;
+
+web::WebMainParts* WebViewWebClient::CreateWebMainParts() {
+  web_main_parts_ = new WebViewWebMainParts(delegate_);
+  return web_main_parts_;
+}
+
+WebViewBrowserState* WebViewWebClient::browser_state() const {
+  return web_main_parts_->browser_state();
+}
+
+WebViewBrowserState* WebViewWebClient::off_the_record_browser_state() const {
+  return web_main_parts_->off_the_record_browser_state();
+}
+
+std::string WebViewWebClient::GetProduct() const {
+  return base::SysNSStringToUTF8([delegate_ partialUserAgent]);
+}
+
+std::string WebViewWebClient::GetUserAgent(bool desktop_user_agent) const {
+  return web::BuildUserAgentFromProduct(GetProduct());
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_web_main_delegate.h b/ios/web_view/internal/web_view_web_main_delegate.h
new file mode 100644
index 0000000..8620560
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_main_delegate.h

@@ -0,0 +1,38 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_DELEGATE_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_DELEGATE_H_
+
+#include <memory>
+#include "base/macros.h"
+#include "ios/web/public/app/web_main_delegate.h"
+
+@protocol CWVDelegate;
+
+namespace ios_web_view {
+class WebViewWebClient;
+
+// WebView implementation of WebMainDelegate.
+class WebViewWebMainDelegate : public web::WebMainDelegate {
+ public:
+  explicit WebViewWebMainDelegate(id<CWVDelegate> delegate);
+  ~WebViewWebMainDelegate() override;
+
+  // WebMainDelegate implementation.
+  void BasicStartupComplete() override;
+
+ private:
+  // This object's delegate.
+  __weak id<CWVDelegate> delegate_;
+
+  // The content and web clients registered by this object.
+  std::unique_ptr<WebViewWebClient> web_client_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebViewWebMainDelegate);
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_DELEGATE_H_

diff --git a/ios/web_view/internal/web_view_web_main_delegate.mm b/ios/web_view/internal/web_view_web_main_delegate.mm
new file mode 100644
index 0000000..47983b4
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_main_delegate.mm

@@ -0,0 +1,27 @@
+// 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.
+
+#import "ios/web_view/internal/web_view_web_main_delegate.h"
+
+#include "base/memory/ptr_util.h"
+#import "ios/web_view/internal/web_view_web_client.h"
+#import "ios/web_view/public/cwv_delegate.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace ios_web_view {
+
+WebViewWebMainDelegate::WebViewWebMainDelegate(id<CWVDelegate> delegate)
+    : delegate_(delegate) {}
+
+WebViewWebMainDelegate::~WebViewWebMainDelegate() = default;
+
+void WebViewWebMainDelegate::BasicStartupComplete() {
+  web_client_ = base::MakeUnique<WebViewWebClient>(delegate_);
+  web::SetWebClient(web_client_.get());
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/internal/web_view_web_main_parts.h b/ios/web_view/internal/web_view_web_main_parts.h
new file mode 100644
index 0000000..0feebc7
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_main_parts.h

@@ -0,0 +1,47 @@
+// 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 IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_PARTS_H_
+#define IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_PARTS_H_
+
+#include "ios/web/public/app/web_main_parts.h"
+
+#include <memory>
+
+@protocol CWVDelegate;
+
+namespace ios_web_view {
+class WebViewBrowserState;
+
+// WebView implementation of WebMainParts.
+class WebViewWebMainParts : public web::WebMainParts {
+ public:
+  explicit WebViewWebMainParts(id<CWVDelegate> delegate);
+  ~WebViewWebMainParts() override;
+
+  // WebMainParts implementation.
+  void PreMainMessageLoopRun() override;
+
+  // Returns the WebViewBrowserState for this embedder.
+  WebViewBrowserState* browser_state() const { return browser_state_.get(); }
+
+  // Returns the off the record WebViewBrowserState for this embedder.
+  WebViewBrowserState* off_the_record_browser_state() const {
+    return off_the_record_browser_state_.get();
+  }
+
+ private:
+  // This object's delegate.
+  __weak id<CWVDelegate> delegate_;
+
+  // The BrowserState for this embedder.
+  std::unique_ptr<WebViewBrowserState> browser_state_;
+
+  // Off The Record BrowserState for this embedder.
+  std::unique_ptr<WebViewBrowserState> off_the_record_browser_state_;
+};
+
+}  // namespace ios_web_view
+
+#endif  // IOS_WEB_VIEW_INTERNAL_WEB_VIEW_WEB_MAIN_PARTS_H_

diff --git a/ios/web_view/internal/web_view_web_main_parts.mm b/ios/web_view/internal/web_view_web_main_parts.mm
new file mode 100644
index 0000000..3b98e727
--- /dev/null
+++ b/ios/web_view/internal/web_view_web_main_parts.mm

@@ -0,0 +1,52 @@
+// 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.
+
+#import "ios/web_view/internal/web_view_web_main_parts.h"
+
+#include "base/base_paths.h"
+#include "base/memory/ptr_util.h"
+#include "base/path_service.h"
+#include "components/translate/core/browser/translate_download_manager.h"
+#include "ios/web_view/internal/web_view_browser_state.h"
+#import "ios/web_view/public/cwv_delegate.h"
+#include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/base/resource/resource_bundle.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace ios_web_view {
+
+WebViewWebMainParts::WebViewWebMainParts(id<CWVDelegate> delegate) {
+  delegate_ = delegate;
+}
+
+WebViewWebMainParts::~WebViewWebMainParts() = default;
+
+void WebViewWebMainParts::PreMainMessageLoopRun() {
+  // Initialize resources.
+  l10n_util::OverrideLocaleWithCocoaLocale();
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      std::string(), nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
+  base::FilePath pak_file;
+  PathService::Get(base::DIR_MODULE, &pak_file);
+  pak_file = pak_file.Append(FILE_PATH_LITERAL("web_view_resources.pak"));
+  ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+      pak_file, ui::SCALE_FACTOR_NONE);
+
+  browser_state_ = base::MakeUnique<WebViewBrowserState>(false);
+  off_the_record_browser_state_ = base::MakeUnique<WebViewBrowserState>(true);
+
+  // Initialize translate.
+  translate::TranslateDownloadManager* download_manager =
+      translate::TranslateDownloadManager::GetInstance();
+  // TODO(crbug.com/679895): See if we need the system request context here.
+  download_manager->set_request_context(browser_state_->GetRequestContext());
+  // TODO(crbug.com/679895): Bring up application locale correctly.
+  download_manager->set_application_locale(l10n_util::GetLocaleOverride());
+  download_manager->language_list()->SetResourceRequestsAllowed(true);
+}
+
+}  // namespace ios_web_view

diff --git a/ios/web_view/public/BUILD.gn b/ios/web_view/public/BUILD.gn
index 15a18fc..fd7d921 100644
--- a/ios/web_view/public/BUILD.gn
+++ b/ios/web_view/public/BUILD.gn

@@ -9,8 +9,8 @@
   ]
 
   sources = [
-    "criwv.h",
     "criwv_translate_manager.h",
+    "cwv.h",
     "cwv_delegate.h",
     "cwv_translate_delegate.h",
     "cwv_web_view.h",

diff --git a/ios/web_view/public/criwv.h b/ios/web_view/public/criwv.h
deleted file mode 100644
index b700569..0000000
--- a/ios/web_view/public/criwv.h
+++ /dev/null

@@ -1,31 +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 IOS_WEB_VIEW_PUBLIC_CRIWV_H_
-#define IOS_WEB_VIEW_PUBLIC_CRIWV_H_
-
-#import <CoreGraphics/CoreGraphics.h>
-#import <Foundation/Foundation.h>
-
-@protocol CWVDelegate;
-@class CWVWebView;
-
-// Main interface for the CRIWV library.
-__attribute__((visibility("default")))
-@interface CRIWV : NSObject
-
-// Initializes the CRIWV library.  This function should be called from
-// |application:didFinishLaunchingWithOptions:|.
-+ (void)configureWithDelegate:(id<CWVDelegate>)delegate;
-
-// Shuts down the CRIWV library.  This function should be called from
-// |applicationwillTerminate:|.
-+ (void)shutDown;
-
-// Creates and returns a web view.
-+ (CWVWebView*)webViewWithFrame:(CGRect)frame;
-
-@end
-
-#endif  // IOS_WEB_VIEW_PUBLIC_CRIWV_H_

diff --git a/ios/web_view/public/cwv.h b/ios/web_view/public/cwv.h
new file mode 100644
index 0000000..503d5f7
--- /dev/null
+++ b/ios/web_view/public/cwv.h

@@ -0,0 +1,30 @@
+// 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 IOS_WEB_VIEW_PUBLIC_CWV_H_
+#define IOS_WEB_VIEW_PUBLIC_CWV_H_
+
+#import <CoreGraphics/CoreGraphics.h>
+#import <Foundation/Foundation.h>
+
+@protocol CWVDelegate;
+@class CWVWebView;
+
+// Main interface for the CWV library.
+__attribute__((visibility("default"))) @interface CWV : NSObject
+
+// Initializes the CWV library. This function should be called from
+// |application:didFinishLaunchingWithOptions:|.
++ (void)configureWithDelegate:(id<CWVDelegate>)delegate;
+
+// Shuts down the CWV library.  This function should be called from
+// |applicationwillTerminate:|.
++ (void)shutDown;
+
+// Creates and returns a web view.
++ (CWVWebView*)webViewWithFrame:(CGRect)frame;
+
+@end
+
+#endif  // IOS_WEB_VIEW_PUBLIC_CWV_H_

diff --git a/ios/web_view/public/cwv_delegate.h b/ios/web_view/public/cwv_delegate.h
index cd09b9c..8000a2e 100644
--- a/ios/web_view/public/cwv_delegate.h
+++ b/ios/web_view/public/cwv_delegate.h

@@ -6,7 +6,7 @@
 
 @class NSString;
 
-// Delegate interface for the CRIWV library.  Embedders can implement the
+// Delegate interface for the CWV library.  Embedders can implement the
 // functions in order to customize library behavior.
 @protocol CWVDelegate
 

diff --git a/ios/web_view/public/cwv_web_view.h b/ios/web_view/public/cwv_web_view.h
index 81a54a3..09a916c 100644
--- a/ios/web_view/public/cwv_web_view.h
+++ b/ios/web_view/public/cwv_web_view.h

@@ -15,7 +15,7 @@
 // In addition to WKWebView features, it allows Translate, Find In Page,
 // Customizable Context Menus, and maybe more.
 //
-// Concrete instances can be created through CRIWV.
+// Concrete instances can be created through CWV.
 @interface CWVWebView : UIView
 
 // The view used to display web content.

diff --git a/ios/web_view/shell/shell_app_delegate.m b/ios/web_view/shell/shell_app_delegate.m
index 28a4b7d..d69c6232 100644
--- a/ios/web_view/shell/shell_app_delegate.m
+++ b/ios/web_view/shell/shell_app_delegate.m

@@ -4,7 +4,7 @@
 
 #import "ios/web_view/shell/shell_app_delegate.h"
 
-#import "ios/web_view/public/criwv.h"
+#import "ios/web_view/public/cwv.h"
 #import "ios/web_view/shell/shell_delegate.h"
 #import "ios/web_view/shell/shell_view_controller.h"
 
@@ -27,7 +27,7 @@
   self.window.backgroundColor = [UIColor whiteColor];
 
   self.delegate = [[ShellDelegate alloc] init];
-  [CRIWV configureWithDelegate:_delegate];
+  [CWV configureWithDelegate:_delegate];
 
   [self.window makeKeyAndVisible];
 
@@ -50,7 +50,7 @@
 }
 
 - (void)applicationWillTerminate:(UIApplication*)application {
-  [CRIWV shutDown];
+  [CWV shutDown];
 }
 
 @end

diff --git a/ios/web_view/shell/shell_view_controller.m b/ios/web_view/shell/shell_view_controller.m
index f1b5f89..c95398b1 100644
--- a/ios/web_view/shell/shell_view_controller.m
+++ b/ios/web_view/shell/shell_view_controller.m

@@ -4,7 +4,7 @@
 
 #import "ios/web_view/shell/shell_view_controller.h"
 
-#import "ios/web_view/public/criwv.h"
+#import "ios/web_view/public/cwv.h"
 #import "ios/web_view/public/cwv_web_view.h"
 #import "ios/web_view/shell/translate_controller.h"
 
@@ -19,7 +19,7 @@
 @property(nonatomic, strong) UITextField* field;
 // Toolbar containing navigation buttons and |field|.
 @property(nonatomic, strong) UIToolbar* toolbar;
-// CRIWV view which renders the web page.
+// CWV view which renders the web page.
 @property(nonatomic, strong) CWVWebView* webView;
 // Handles the translation of the content displayed in |webView|.
 @property(nonatomic, strong) TranslateController* translateController;
@@ -120,7 +120,7 @@
   [_toolbar addSubview:stop];
   [_toolbar addSubview:_field];
 
-  self.webView = [CRIWV webViewWithFrame:[_containerView bounds]];
+  self.webView = [CWV webViewWithFrame:[_containerView bounds]];
   [_webView setDelegate:self];
   [_webView setAutoresizingMask:UIViewAutoresizingFlexibleWidth |
                                 UIViewAutoresizingFlexibleHeight];

diff --git a/mash/common/BUILD.gn b/mash/common/BUILD.gn
index 3f285f0..44d2bbc 100644
--- a/mash/common/BUILD.gn
+++ b/mash/common/BUILD.gn

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
+
 source_set("common") {
   sources = [
     "config.cc",
@@ -11,4 +13,8 @@
   deps = [
     "//base",
   ]
+
+  if (use_ash) {
+    deps += [ "//ash/public/interfaces" ]
+  }
 }

diff --git a/mash/common/config.cc b/mash/common/config.cc
index f4e14f7..b13e15f 100644
--- a/mash/common/config.cc
+++ b/mash/common/config.cc

@@ -6,6 +6,10 @@
 
 #include "base/command_line.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/public/interfaces/constants.mojom.h"  // nogncheck
+#endif
+
 namespace mash {
 namespace common {
 
@@ -18,8 +22,13 @@
             kWindowManagerSwitch);
     return service_name;
   }
-  // TODO(beng): move this constant to a mojom file in //ash.
-  return "ash";
+#if defined(OS_CHROMEOS)
+  return ash::mojom::kServiceName;
+#else
+  LOG(FATAL)
+      << "You must specify a window manager e.g. --window-manager=simple_wm";
+  return std::string();
+#endif
 }
 
 }  // namespace common

diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 37c9658..436d4ee7 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc

@@ -293,6 +293,46 @@
   return GetDefaultDevice(device, false);
 }
 
+// Returns the total number of channels on a device; regardless of what the
+// device's preferred rendering layout looks like. Should only be used for the
+// channel count when a device has more than kMaxConcurrentChannels.
+static bool GetDeviceTotalChannelCount(AudioDeviceID device,
+                                       AudioObjectPropertyScope scope,
+                                       int* channels) {
+  DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
+  CHECK(channels);
+
+  // Get the stream configuration of the device in an AudioBufferList (with the
+  // buffer pointers set to nullptr) which describes the list of streams and the
+  // number of channels in each stream.
+  AudioObjectPropertyAddress pa = {kAudioDevicePropertyStreamConfiguration,
+                                   scope, kAudioObjectPropertyElementMaster};
+
+  UInt32 size;
+  OSStatus result = AudioObjectGetPropertyDataSize(device, &pa, 0, 0, &size);
+  if (result != noErr || !size)
+    return false;
+
+  std::unique_ptr<uint8_t[]> list_storage(new uint8_t[size]);
+  AudioBufferList* buffer_list =
+      reinterpret_cast<AudioBufferList*>(list_storage.get());
+
+  result = AudioObjectGetPropertyData(device, &pa, 0, 0, &size, buffer_list);
+  if (result != noErr)
+    return false;
+
+  // Determine number of channels based on the AudioBufferList.
+  // |mNumberBuffers] is the  number of interleaved channels in the buffer.
+  // If the number is 1, the buffer is noninterleaved.
+  *channels = 0;
+  for (UInt32 i = 0; i < buffer_list->mNumberBuffers; ++i)
+    *channels += buffer_list->mBuffers[i].mNumberChannels;
+
+  DVLOG(1) << (scope == kAudioDevicePropertyScopeInput ? "Input" : "Output")
+           << " total channels: " << *channels;
+  return true;
+}
+
 class AudioManagerMac::AudioPowerObserver : public base::PowerObserver {
  public:
   AudioPowerObserver()
@@ -401,41 +441,77 @@
                                         int* channels) {
   DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
   CHECK(channels);
-  const bool is_input = (scope == kAudioDevicePropertyScopeInput);
-  DVLOG(1) << "GetDeviceChannels(id=0x" << std::hex << device
-           << ", is_input=" << is_input << ")";
 
-  // Get the stream configuration of the device in an AudioBufferList (with the
-  // buffer pointers set to NULL) which describes the list of streams and the
-  // number of channels in each stream.
-  AudioObjectPropertyAddress pa;
-  pa.mSelector = kAudioDevicePropertyStreamConfiguration;
-  pa.mScope = scope;
-  pa.mElement = kAudioObjectPropertyElementMaster;
+  // If the device has more channels than possible for layouts to express, use
+  // the total count of channels on the device; as of this writing, macOS will
+  // only return up to 8 channels in any layout. To allow WebAudio to work with
+  // > 8 channel devices, we must use the total channel count instead of the
+  // channel count of the preferred layout.
+  if (GetDeviceTotalChannelCount(device, scope, channels) &&
+      *channels > kMaxConcurrentChannels) {
+    return true;
+  }
 
+  AudioObjectPropertyAddress pa = {kAudioDevicePropertyPreferredChannelLayout,
+                                   scope, kAudioObjectPropertyElementMaster};
   UInt32 size;
   OSStatus result = AudioObjectGetPropertyDataSize(device, &pa, 0, 0, &size);
   if (result != noErr || !size)
     return false;
 
-  std::unique_ptr<uint8_t[]> list_storage(new uint8_t[size]);
-  AudioBufferList& buffer_list =
-      *reinterpret_cast<AudioBufferList*>(list_storage.get());
-
-  result = AudioObjectGetPropertyData(device, &pa, 0, 0, &size, &buffer_list);
+  std::unique_ptr<uint8_t[]> layout_storage(new uint8_t[size]);
+  AudioChannelLayout* layout =
+      reinterpret_cast<AudioChannelLayout*>(layout_storage.get());
+  result = AudioObjectGetPropertyData(device, &pa, 0, 0, &size, layout);
   if (result != noErr)
     return false;
 
-  // Determine number of channels based on the AudioBufferList.
-  // |mNumberBuffers] is the  number of interleaved channels in the buffer.
-  // If the number is 1, the buffer is noninterleaved.
-  // TODO(henrika): add UMA stats to track utilized hardware configurations.
-  int num_channels = 0;
-  for (UInt32 i = 0; i < buffer_list.mNumberBuffers; ++i) {
-    num_channels += buffer_list.mBuffers[i].mNumberChannels;
+  // We don't want to have to know about all channel layout tags, so force OSX
+  // to give us the channel descriptions from the bitmap or tag if necessary.
+  const AudioChannelLayoutTag tag = layout->mChannelLayoutTag;
+  if (tag != kAudioChannelLayoutTag_UseChannelDescriptions) {
+    const bool is_bitmap = tag == kAudioChannelLayoutTag_UseChannelBitmap;
+    const AudioFormatPropertyID fa =
+        is_bitmap ? kAudioFormatProperty_ChannelLayoutForBitmap
+                  : kAudioFormatProperty_ChannelLayoutForTag;
+
+    if (is_bitmap) {
+      result = AudioFormatGetPropertyInfo(fa, sizeof(UInt32),
+                                          &layout->mChannelBitmap, &size);
+    } else {
+      result = AudioFormatGetPropertyInfo(fa, sizeof(AudioChannelLayoutTag),
+                                          &tag, &size);
+    }
+    if (result != noErr || !size)
+      return false;
+
+    layout_storage.reset(new uint8_t[size]);
+    layout = reinterpret_cast<AudioChannelLayout*>(layout_storage.get());
+    if (is_bitmap) {
+      result = AudioFormatGetProperty(fa, sizeof(UInt32),
+                                      &layout->mChannelBitmap, &size, layout);
+    } else {
+      result = AudioFormatGetProperty(fa, sizeof(AudioChannelLayoutTag), &tag,
+                                      &size, layout);
+    }
+    if (result != noErr)
+      return false;
   }
-  *channels = num_channels;
-  DVLOG(1) << "#channels: " << *channels;
+
+  // There is no channel info for stereo, assume so for mono as well.
+  if (layout->mNumberChannelDescriptions <= 2) {
+    *channels = layout->mNumberChannelDescriptions;
+  } else {
+    *channels = 0;
+    for (UInt32 i = 0; i < layout->mNumberChannelDescriptions; ++i) {
+      if (layout->mChannelDescriptions[i].mChannelLabel !=
+          kAudioChannelLabel_Unknown)
+        (*channels)++;
+    }
+  }
+
+  DVLOG(1) << (scope == kAudioDevicePropertyScopeInput ? "Input" : "Output")
+           << " channels: " << *channels;
   return true;
 }
 

diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc
index 33450a3..3dbb7d6b 100644
--- a/media/audio/win/audio_low_latency_output_win.cc
+++ b/media/audio/win/audio_low_latency_output_win.cc

@@ -416,11 +416,16 @@
   }
 
   if (playing && error) {
+    LOG(ERROR) << "WASAPI rendering failed.";
+
     // Stop audio rendering since something has gone wrong in our main thread
     // loop. Note that, we are still in a "started" state, hence a Stop() call
     // is required to join the thread properly.
     audio_client_->Stop();
-    PLOG(ERROR) << "WASAPI rendering failed.";
+
+    // Notify clients that something has gone wrong and that this stream should
+    // be destroyed instead of reused in the future.
+    source_->OnError(this);
   }
 
   // Disable MMCSS.

diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc
index 253c82b..225f19a 100644
--- a/media/base/audio_decoder_config.cc
+++ b/media/base/audio_decoder_config.cc

@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "media/base/limits.h"
+#include "media/base/media_util.h"
 
 namespace media {
 
@@ -95,4 +96,19 @@
   return s.str();
 }
 
+void AudioDecoderConfig::SetIsEncrypted(bool is_encrypted) {
+  if (!is_encrypted) {
+    DCHECK(encryption_scheme_.is_encrypted()) << "Config is already clear.";
+    encryption_scheme_ = Unencrypted();
+  } else {
+    DCHECK(!encryption_scheme_.is_encrypted())
+        << "Config is already encrypted.";
+    // TODO(xhwang): This is only used to guide decoder selection, so set
+    // a common encryption scheme that should be supported by all decrypting
+    // decoders. We should be able to remove this when we support switching
+    // decoders at run time. See http://crbug.com/695595
+    encryption_scheme_ = AesCtrEncryptionScheme();
+  }
+}
+
 }  // namespace media

diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 266de82..675eb87 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h

@@ -87,6 +87,12 @@
     return encryption_scheme_;
   }
 
+  // Sets the config to be encrypted or not encrypted manually. This can be
+  // useful for decryptors that decrypts an encrypted stream to a clear stream,
+  // or for decoder selectors that wants to select decrypting decoders instead
+  // of clear decoders.
+  void SetIsEncrypted(bool is_encrypted);
+
  private:
   AudioCodec codec_;
   SampleFormat sample_format_;

diff --git a/media/base/channel_layout.cc b/media/base/channel_layout.cc
index 9d85842..7d3e754 100644
--- a/media/base/channel_layout.cc
+++ b/media/base/channel_layout.cc

@@ -160,6 +160,7 @@
 
 int ChannelLayoutToChannelCount(ChannelLayout layout) {
   DCHECK_LT(static_cast<size_t>(layout), arraysize(kLayoutToChannels));
+  DCHECK_LE(kLayoutToChannels[layout], kMaxConcurrentChannels);
   return kLayoutToChannels[layout];
 }
 

diff --git a/media/base/channel_layout.h b/media/base/channel_layout.h
index 33575882..aaecf6b9 100644
--- a/media/base/channel_layout.h
+++ b/media/base/channel_layout.h

@@ -129,6 +129,10 @@
   CHANNELS_MAX = SIDE_RIGHT, // Must always equal the largest value ever logged.
 };
 
+// The maximum number of concurrently active channels for all possible layouts.
+// ChannelLayoutToChannelCount() will never return a value higher than this.
+constexpr int kMaxConcurrentChannels = 8;
+
 // Returns the expected channel position in an interleaved stream.  Values of -1
 // mean the channel at that index is not used for that layout.  Values range
 // from 0 to ChannelLayoutToChannelCount(layout) - 1.

diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc
index adfde410..45b44991 100644
--- a/media/base/demuxer_perftest.cc
+++ b/media/base/demuxer_perftest.cc

@@ -103,7 +103,7 @@
 StreamReader::StreamReader(media::Demuxer* demuxer,
                            bool enable_bitstream_converter) {
   std::vector<media::DemuxerStream*> streams = demuxer->GetAllStreams();
-  for (const auto& stream : streams) {
+  for (auto* stream : streams) {
     streams_.push_back(stream);
     end_of_stream_.push_back(false);
     last_read_timestamp_.push_back(media::kNoTimestamp);

diff --git a/media/base/media_resource.cc b/media/base/media_resource.cc
index 07431e6..8068a190 100644
--- a/media/base/media_resource.cc
+++ b/media/base/media_resource.cc

@@ -21,7 +21,7 @@
 
 DemuxerStream* MediaResource::GetFirstStream(DemuxerStream::Type type) {
   const auto& streams = GetAllStreams();
-  for (const auto& stream : streams) {
+  for (auto* stream : streams) {
     if (stream->type() == type)
       return stream;
   }

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index b94cfcf..bb3a0d61 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc

@@ -144,7 +144,7 @@
 
 // Enables H264 HW encode acceleration using Media Foundation for Windows.
 const base::Feature kMediaFoundationH264Encoding{
-    "MediaFoundationH264Encoding", base::FEATURE_DISABLED_BY_DEFAULT};
+    "MediaFoundationH264Encoding", base::FEATURE_ENABLED_BY_DEFAULT};
 #endif  // defined(OS_WIN)
 
 // Use new audio rendering mixer.

diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 9fd8093..f8761f4 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc

@@ -916,7 +916,7 @@
       metadata.timeline_offset = demuxer_->GetTimelineOffset();
       // TODO(servolk): What should we do about metadata for multiple streams?
       streams = demuxer_->GetAllStreams();
-      for (const auto& stream : streams) {
+      for (auto* stream : streams) {
         if (stream->type() == DemuxerStream::VIDEO && !metadata.has_video) {
           metadata.has_video = true;
           metadata.natural_size = GetRotatedVideoSize(

diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
index a9dbcd21..6e0c61f 100644
--- a/media/base/video_decoder_config.cc
+++ b/media/base/video_decoder_config.cc

@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "base/logging.h"
+#include "media/base/media_util.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_types.h"
 
@@ -158,4 +159,19 @@
   extra_data_ = extra_data;
 }
 
+void VideoDecoderConfig::SetIsEncrypted(bool is_encrypted) {
+  if (!is_encrypted) {
+    DCHECK(encryption_scheme_.is_encrypted()) << "Config is already clear.";
+    encryption_scheme_ = Unencrypted();
+  } else {
+    DCHECK(!encryption_scheme_.is_encrypted())
+        << "Config is already encrypted.";
+    // TODO(xhwang): This is only used to guide decoder selection, so set
+    // a common encryption scheme that should be supported by all decrypting
+    // decoders. We should be able to remove this when we support switching
+    // decoders at run time. See http://crbug.com/695595
+    encryption_scheme_ = AesCtrEncryptionScheme();
+  }
+}
+
 }  // namespace media

diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h
index 2d3d3fe..3ed8d4c 100644
--- a/media/base/video_decoder_config.h
+++ b/media/base/video_decoder_config.h

@@ -119,6 +119,12 @@
   void set_hdr_metadata(const HDRMetadata& hdr_metadata);
   base::Optional<HDRMetadata> hdr_metadata() const;
 
+  // Sets the config to be encrypted or not encrypted manually. This can be
+  // useful for decryptors that decrypts an encrypted stream to a clear stream,
+  // or for decoder selectors that wants to select decrypting decoders instead
+  // of clear decoders.
+  void SetIsEncrypted(bool is_encrypted);
+
  private:
   VideoCodec codec_;
   VideoCodecProfile profile_;

diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 7c395746..d604641b 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc

@@ -240,6 +240,7 @@
           params.max_keyframe_distance_to_disable_background_video()),
       enable_instant_source_buffer_gc_(
           params.enable_instant_source_buffer_gc()) {
+  DVLOG(1) << __func__;
   DCHECK(!adjust_allocated_memory_cb_.is_null());
   DCHECK(renderer_factory_);
   DCHECK(client_);
@@ -272,8 +273,15 @@
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
+  DVLOG(1) << __func__;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
+  if (set_cdm_result_) {
+    DVLOG(2) << "Resolve pending SetCdm() when media player is destroyed.";
+    set_cdm_result_->complete();
+    set_cdm_result_.reset();
+  }
+
   suppress_destruction_errors_ = true;
 
   delegate_->PlayerGone(delegate_id_);
@@ -301,6 +309,7 @@
 void WebMediaPlayerImpl::load(LoadType load_type,
                               const blink::WebMediaPlayerSource& source,
                               CORSMode cors_mode) {
+  DVLOG(1) << __func__;
   // Only URL or MSE blob URL is supported.
   DCHECK(source.isURL());
   blink::WebURL url = source.getAsURL();
@@ -968,6 +977,7 @@
 void WebMediaPlayerImpl::setContentDecryptionModule(
     blink::WebContentDecryptionModule* cdm,
     blink::WebContentDecryptionModuleResult result) {
+  DVLOG(1) << __func__ << ": cdm = " << cdm;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // Once the CDM is set it can't be cleared as there may be frames being
@@ -1072,6 +1082,7 @@
 }
 
 void WebMediaPlayerImpl::OnCdmAttached(bool success) {
+  DVLOG(1) << __func__ << ": success = " << success;
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK(pending_cdm_);
 
@@ -1325,13 +1336,11 @@
     // Buffering has underflowed.
     DCHECK_EQ(state, BUFFERING_HAVE_NOTHING);
 
-    // Report the number of times we've entered the underflow state. Only report
-    // for src= playback since for MSE it's out of our control. Ensure we only
-    // report the value when transitioning from HAVE_ENOUGH to HAVE_NOTHING.
-    if (data_source_ &&
-        ready_state_ == WebMediaPlayer::ReadyStateHaveEnoughData) {
+    // Report the number of times we've entered the underflow state. Ensure we
+    // only report the value when transitioning from HAVE_ENOUGH to
+    // HAVE_NOTHING.
+    if (ready_state_ == WebMediaPlayer::ReadyStateHaveEnoughData)
       underflow_timer_.reset(new base::ElapsedTimer());
-    }
 
     // It shouldn't be possible to underflow if we've not advanced past
     // HAVE_CURRENT_DATA.

diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc
index 7e46f68..ba59bb4 100644
--- a/media/capture/video/fake_video_capture_device.cc
+++ b/media/capture/video/fake_video_capture_device.cc

@@ -23,7 +23,6 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace media {
@@ -47,6 +46,9 @@
 static const int kSupportedSizesCount =
     arraysize(kSupportedSizesOrderedByIncreasingWidth);
 
+static const VideoPixelFormat kSupportedPixelFormats[] = {
+    PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_ARGB};
+
 static gfx::Size SnapToSupportedSize(const gfx::Size& requested_size) {
   for (const gfx::Size& supported_size :
        kSupportedSizesOrderedByIncreasingWidth) {
@@ -72,8 +74,11 @@
 // as a frame count and timer.
 class PacmanFramePainter {
  public:
-  enum class Format { I420, SK_N32, Y16 };
-  PacmanFramePainter(Format pixel_format,
+  // Currently, only the following values are supported for |pixel_format|:
+  //   PIXEL_FORMAT_I420
+  //   PIXEL_FORMAT_Y16
+  //   PIXEL_FORMAT_ARGB
+  PacmanFramePainter(VideoPixelFormat pixel_format,
                      const FakeDeviceState* fake_device_state);
 
   void PaintFrame(base::TimeDelta elapsed_time, uint8_t* target_buffer);
@@ -84,7 +89,7 @@
 
   void DrawPacman(base::TimeDelta elapsed_time, uint8_t* target_buffer);
 
-  const Format pixel_format_;
+  const VideoPixelFormat pixel_format_;
   const FakeDeviceState* fake_device_state_ = nullptr;
 };
 
@@ -96,14 +101,8 @@
   virtual ~FrameDeliverer() {}
   virtual void Initialize(VideoPixelFormat pixel_format,
                           std::unique_ptr<VideoCaptureDevice::Client> client,
-                          const FakeDeviceState* device_state) {
-    client_ = std::move(client);
-    device_state_ = device_state;
-  }
-  virtual void Uninitialize() {
-    client_.reset();
-    device_state_ = nullptr;
-  }
+                          const FakeDeviceState* device_state) = 0;
+  virtual void Uninitialize() = 0;
   virtual void PaintAndDeliverNextFrame(base::TimeDelta timestamp_to_paint) = 0;
 
  protected:
@@ -113,14 +112,11 @@
     return now - first_ref_time_;
   }
 
-  PacmanFramePainter* frame_painter() { return frame_painter_.get(); }
-  const FakeDeviceState* device_state() { return device_state_; }
-  VideoCaptureDevice::Client* client() { return client_.get(); }
-
- private:
   const std::unique_ptr<PacmanFramePainter> frame_painter_;
   const FakeDeviceState* device_state_ = nullptr;
   std::unique_ptr<VideoCaptureDevice::Client> client_;
+
+ private:
   base::TimeTicks first_ref_time_;
 };
 
@@ -149,27 +145,17 @@
   ~ClientBufferFrameDeliverer() override;
 
   // Implementation of FrameDeliverer
-  void PaintAndDeliverNextFrame(base::TimeDelta timestamp_to_paint) override;
-};
-
-class JpegEncodingFrameDeliverer : public FrameDeliverer {
- public:
-  JpegEncodingFrameDeliverer(std::unique_ptr<PacmanFramePainter> frame_painter);
-  ~JpegEncodingFrameDeliverer() override;
-
-  // Implementation of FrameDeliveryStrategy
+  void Initialize(VideoPixelFormat pixel_format,
+                  std::unique_ptr<VideoCaptureDevice::Client> client,
+                  const FakeDeviceState* device_state) override;
   void Uninitialize() override;
   void PaintAndDeliverNextFrame(base::TimeDelta timestamp_to_paint) override;
-
- private:
-  std::vector<uint8_t> sk_n32_buffer_;
-  std::vector<unsigned char> jpeg_buffer_;
 };
 
 // Implements the photo functionality of a VideoCaptureDevice
 class FakePhotoDevice {
  public:
-  FakePhotoDevice(std::unique_ptr<PacmanFramePainter> painter,
+  FakePhotoDevice(std::unique_ptr<PacmanFramePainter> argb_painter,
                   const FakeDeviceState* fake_device_state);
   ~FakePhotoDevice();
 
@@ -179,7 +165,7 @@
                  base::TimeDelta elapsed_time);
 
  private:
-  const std::unique_ptr<PacmanFramePainter> painter_;
+  const std::unique_ptr<PacmanFramePainter> argb_painter_;
   const FakeDeviceState* const fake_device_state_;
 };
 
@@ -238,51 +224,40 @@
 
 // static
 std::unique_ptr<VideoCaptureDevice> FakeVideoCaptureDeviceMaker::MakeInstance(
-    PixelFormat pixel_format,
+    VideoPixelFormat pixel_format,
     DeliveryMode delivery_mode,
     float frame_rate) {
-  auto device_state = base::MakeUnique<FakeDeviceState>(
-      kInitialZoom, frame_rate,
-      static_cast<media::VideoPixelFormat>(pixel_format));
-  PacmanFramePainter::Format painter_format;
-  switch (pixel_format) {
-    case PixelFormat::I420:
-      painter_format = PacmanFramePainter::Format::I420;
+  bool pixel_format_supported = false;
+  for (const auto& supported_pixel_format : kSupportedPixelFormats) {
+    if (pixel_format == supported_pixel_format) {
+      pixel_format_supported = true;
       break;
-    case PixelFormat::Y16:
-      painter_format = PacmanFramePainter::Format::Y16;
-      break;
-    case PixelFormat::MJPEG:
-      painter_format = PacmanFramePainter::Format::SK_N32;
-      break;
+    }
   }
-  auto video_frame_painter =
-      base::MakeUnique<PacmanFramePainter>(painter_format, device_state.get());
+  if (!pixel_format_supported) {
+    DLOG(ERROR) << "Requested an unsupported pixel format "
+                << VideoPixelFormatToString(pixel_format);
+    return nullptr;
+  }
 
+  auto device_state =
+      base::MakeUnique<FakeDeviceState>(kInitialZoom, frame_rate, pixel_format);
+  auto video_frame_painter =
+      base::MakeUnique<PacmanFramePainter>(pixel_format, device_state.get());
   std::unique_ptr<FrameDeliverer> frame_delivery_strategy;
   switch (delivery_mode) {
     case DeliveryMode::USE_DEVICE_INTERNAL_BUFFERS:
-      if (pixel_format == PixelFormat::MJPEG) {
-        frame_delivery_strategy = base::MakeUnique<JpegEncodingFrameDeliverer>(
-            std::move(video_frame_painter));
-      } else {
-        frame_delivery_strategy = base::MakeUnique<OwnBufferFrameDeliverer>(
-            std::move(video_frame_painter));
-      }
+      frame_delivery_strategy = base::MakeUnique<OwnBufferFrameDeliverer>(
+          std::move(video_frame_painter));
       break;
     case DeliveryMode::USE_CLIENT_PROVIDED_BUFFERS:
-      if (pixel_format == PixelFormat::MJPEG) {
-        DLOG(ERROR) << "PixelFormat::MJPEG cannot be used in combination with "
-                    << "USE_CLIENT_PROVIDED_BUFFERS.";
-        return nullptr;
-      }
       frame_delivery_strategy = base::MakeUnique<ClientBufferFrameDeliverer>(
           std::move(video_frame_painter));
       break;
   }
 
   auto photo_frame_painter = base::MakeUnique<PacmanFramePainter>(
-      PacmanFramePainter::Format::SK_N32, device_state.get());
+      PIXEL_FORMAT_ARGB, device_state.get());
   auto photo_device = base::MakeUnique<FakePhotoDevice>(
       std::move(photo_frame_painter), device_state.get());
 
@@ -291,9 +266,12 @@
       std::move(device_state));
 }
 
-PacmanFramePainter::PacmanFramePainter(Format pixel_format,
+PacmanFramePainter::PacmanFramePainter(VideoPixelFormat pixel_format,
                                        const FakeDeviceState* fake_device_state)
-    : pixel_format_(pixel_format), fake_device_state_(fake_device_state) {}
+    : pixel_format_(pixel_format), fake_device_state_(fake_device_state) {
+  DCHECK(pixel_format == PIXEL_FORMAT_I420 ||
+         pixel_format == PIXEL_FORMAT_Y16 || pixel_format == PIXEL_FORMAT_ARGB);
+}
 
 void PacmanFramePainter::PaintFrame(base::TimeDelta elapsed_time,
                                     uint8_t* target_buffer) {
@@ -327,16 +305,16 @@
             static_cast<unsigned int>(start + (x + y) * color_step) & 0xFFFF;
         size_t offset = (y * width) + x;
         switch (pixel_format_) {
-          case Format::Y16:
+          case PIXEL_FORMAT_Y16:
             target_buffer[offset * sizeof(uint16_t)] = value & 0xFF;
             target_buffer[offset * sizeof(uint16_t) + 1] = value >> 8;
             break;
-          case Format::SK_N32:
+          case PIXEL_FORMAT_ARGB:
             target_buffer[offset * sizeof(uint32_t) + 1] = value >> 8;
             target_buffer[offset * sizeof(uint32_t) + 2] = value >> 8;
             target_buffer[offset * sizeof(uint32_t) + 3] = value >> 8;
             break;
-          case Format::I420:
+          default:
             target_buffer[offset] = value >> 8;
             break;
         }
@@ -350,30 +328,12 @@
   const int width = fake_device_state_->format.frame_size.width();
   const int height = fake_device_state_->format.frame_size.height();
 
-  SkColorType colorspace = kAlpha_8_SkColorType;
-  switch (pixel_format_) {
-    case Format::I420:
-      // Skia doesn't support painting in I420. Instead, paint an 8bpp
-      // monochrome image to the beginning of |target_buffer|. This section of
-      // |target_buffer| corresponds to the Y-plane of the YUV image. Do not
-      // touch the U or V planes of |target_buffer|. Assuming they have been
-      // initialized to 0, which corresponds to a green color tone, the result
-      // will be an green-ish monochrome frame.
-      colorspace = kAlpha_8_SkColorType;
-      break;
-    case Format::SK_N32:
-      // SkColorType is RGBA on some platforms and BGRA on others.
-      colorspace = kN32_SkColorType;
-      break;
-    case Format::Y16:
-      // Skia doesn't support painting in Y16. Instead, paint an 8bpp monochrome
-      // image to the beginning of |target_buffer|. Later, move the 8bit pixel
-      // values to a position corresponding to the high byte values of 16bit
-      // pixel values (assuming the byte order is little-endian).
-      colorspace = kAlpha_8_SkColorType;
-      break;
-  }
-
+  // |kN32_SkColorType| stands for the appropriate RGBA/BGRA format.
+  const SkColorType colorspace = (pixel_format_ == PIXEL_FORMAT_ARGB)
+                                     ? kN32_SkColorType
+                                     : kAlpha_8_SkColorType;
+  // Skia doesn't support 16 bit alpha rendering, so we 8 bit alpha and then use
+  // this as high byte values in 16 bit pixels.
   const SkImageInfo info =
       SkImageInfo::Make(width, height, colorspace, kOpaque_SkAlphaType);
   SkBitmap bitmap;
@@ -388,14 +348,13 @@
   matrix.setScale(unscaled_zoom, unscaled_zoom, width / 2, height / 2);
   canvas.setMatrix(matrix);
 
-  // For the SK_N32 case, match the green color tone produced by the
-  // I420 case.
-  if (pixel_format_ == Format::SK_N32) {
+  // Equalize Alpha_8 that has light green background while RGBA has white.
+  if (pixel_format_ == PIXEL_FORMAT_ARGB) {
     const SkRect full_frame = SkRect::MakeWH(width, height);
     paint.setARGB(255, 0, 127, 0);
     canvas.drawRect(full_frame, paint);
-    paint.setColor(SK_ColorGREEN);
   }
+  paint.setColor(SK_ColorGREEN);
 
   // Draw a sweeping circle to show an animation.
   const float end_angle =
@@ -419,7 +378,7 @@
   canvas.scale(3, 3);
   canvas.drawText(time_string.data(), time_string.length(), 30, 20, paint);
 
-  if (pixel_format_ == Format::Y16) {
+  if (pixel_format_ == PIXEL_FORMAT_Y16) {
     // Use 8 bit bitmap rendered to first half of the buffer as high byte values
     // for the whole buffer. Low byte values are not important.
     for (int i = (width * height) - 1; i >= 0; --i)
@@ -427,31 +386,27 @@
   }
 }
 
-FakePhotoDevice::FakePhotoDevice(std::unique_ptr<PacmanFramePainter> painter,
-                                 const FakeDeviceState* fake_device_state)
-    : painter_(std::move(painter)), fake_device_state_(fake_device_state) {}
+FakePhotoDevice::FakePhotoDevice(
+    std::unique_ptr<PacmanFramePainter> argb_painter,
+    const FakeDeviceState* fake_device_state)
+    : argb_painter_(std::move(argb_painter)),
+      fake_device_state_(fake_device_state) {}
 
 FakePhotoDevice::~FakePhotoDevice() = default;
 
 void FakePhotoDevice::TakePhoto(VideoCaptureDevice::TakePhotoCallback callback,
                                 base::TimeDelta elapsed_time) {
   // Create a PNG-encoded frame and send it back to |callback|.
-  auto required_sk_n32_buffer_size = VideoFrame::AllocationSize(
-      PIXEL_FORMAT_ARGB, fake_device_state_->format.frame_size);
-  std::unique_ptr<uint8_t[]> buffer(new uint8_t[required_sk_n32_buffer_size]);
-  memset(buffer.get(), 0, required_sk_n32_buffer_size);
-  painter_->PaintFrame(elapsed_time, buffer.get());
+  std::unique_ptr<uint8_t[]> buffer(new uint8_t[VideoFrame::AllocationSize(
+      PIXEL_FORMAT_ARGB, fake_device_state_->format.frame_size)]);
+  argb_painter_->PaintFrame(elapsed_time, buffer.get());
   mojom::BlobPtr blob = mojom::Blob::New();
-  const gfx::PNGCodec::ColorFormat encoding_source_format =
-      (kN32_SkColorType == kRGBA_8888_SkColorType) ? gfx::PNGCodec::FORMAT_RGBA
-                                                   : gfx::PNGCodec::FORMAT_BGRA;
-  const bool result = gfx::PNGCodec::Encode(
-      buffer.get(), encoding_source_format,
-      fake_device_state_->format.frame_size,
-      VideoFrame::RowBytes(0 /* plane */, PIXEL_FORMAT_ARGB,
-                           fake_device_state_->format.frame_size.width()),
-      true /* discard_transparency */, std::vector<gfx::PNGCodec::Comment>(),
-      &blob->data);
+  const bool result =
+      gfx::PNGCodec::Encode(buffer.get(), gfx::PNGCodec::FORMAT_RGBA,
+                            fake_device_state_->format.frame_size,
+                            fake_device_state_->format.frame_size.width() * 4,
+                            true /* discard_transparency */,
+                            std::vector<gfx::PNGCodec::Comment>(), &blob->data);
   DCHECK(result);
 
   blob->mime_type = "image/png";
@@ -569,27 +524,29 @@
     VideoPixelFormat pixel_format,
     std::unique_ptr<VideoCaptureDevice::Client> client,
     const FakeDeviceState* device_state) {
-  FrameDeliverer::Initialize(pixel_format, std::move(client), device_state);
+  client_ = std::move(client);
+  device_state_ = device_state;
   buffer_.reset(new uint8_t[VideoFrame::AllocationSize(
-      pixel_format, device_state->format.frame_size)]);
+      pixel_format, device_state_->format.frame_size)]);
 }
 
 void OwnBufferFrameDeliverer::Uninitialize() {
-  FrameDeliverer::Uninitialize();
+  client_.reset();
+  device_state_ = nullptr;
   buffer_.reset();
 }
 
 void OwnBufferFrameDeliverer::PaintAndDeliverNextFrame(
     base::TimeDelta timestamp_to_paint) {
-  if (!client())
+  if (!client_)
     return;
-  const size_t frame_size = device_state()->format.ImageAllocationSize();
+  const size_t frame_size = device_state_->format.ImageAllocationSize();
   memset(buffer_.get(), 0, frame_size);
-  frame_painter()->PaintFrame(timestamp_to_paint, buffer_.get());
+  frame_painter_->PaintFrame(timestamp_to_paint, buffer_.get());
   base::TimeTicks now = base::TimeTicks::Now();
-  client()->OnIncomingCapturedData(buffer_.get(), frame_size,
-                                   device_state()->format, 0 /* rotation */,
-                                   now, CalculateTimeSinceFirstInvocation(now));
+  client_->OnIncomingCapturedData(buffer_.get(), frame_size,
+                                  device_state_->format, 0 /* rotation */, now,
+                                  CalculateTimeSinceFirstInvocation(now));
 }
 
 ClientBufferFrameDeliverer::ClientBufferFrameDeliverer(
@@ -598,79 +555,44 @@
 
 ClientBufferFrameDeliverer::~ClientBufferFrameDeliverer() = default;
 
+void ClientBufferFrameDeliverer::Initialize(
+    VideoPixelFormat,
+    std::unique_ptr<VideoCaptureDevice::Client> client,
+    const FakeDeviceState* device_state) {
+  client_ = std::move(client);
+  device_state_ = device_state;
+}
+
+void ClientBufferFrameDeliverer::Uninitialize() {
+  client_.reset();
+  device_state_ = nullptr;
+}
+
 void ClientBufferFrameDeliverer::PaintAndDeliverNextFrame(
     base::TimeDelta timestamp_to_paint) {
-  if (!client())
+  if (client_ == nullptr)
     return;
 
   const int arbitrary_frame_feedback_id = 0;
-  auto capture_buffer = client()->ReserveOutputBuffer(
-      device_state()->format.frame_size, device_state()->format.pixel_format,
-      device_state()->format.pixel_storage, arbitrary_frame_feedback_id);
+  auto capture_buffer = client_->ReserveOutputBuffer(
+      device_state_->format.frame_size, device_state_->format.pixel_format,
+      device_state_->format.pixel_storage, arbitrary_frame_feedback_id);
   DLOG_IF(ERROR, !capture_buffer.is_valid())
       << "Couldn't allocate Capture Buffer";
   auto buffer_access =
       capture_buffer.handle_provider->GetHandleForInProcessAccess();
   DCHECK(buffer_access->data()) << "Buffer has NO backing memory";
 
-  DCHECK_EQ(PIXEL_STORAGE_CPU, device_state()->format.pixel_storage);
+  DCHECK_EQ(PIXEL_STORAGE_CPU, device_state_->format.pixel_storage);
 
   uint8_t* data_ptr = buffer_access->data();
   memset(data_ptr, 0, buffer_access->mapped_size());
-  frame_painter()->PaintFrame(timestamp_to_paint, data_ptr);
+  frame_painter_->PaintFrame(timestamp_to_paint, data_ptr);
 
   base::TimeTicks now = base::TimeTicks::Now();
-  client()->OnIncomingCapturedBuffer(std::move(capture_buffer),
-                                     device_state()->format, now,
-                                     CalculateTimeSinceFirstInvocation(now));
-}
-
-JpegEncodingFrameDeliverer::JpegEncodingFrameDeliverer(
-    std::unique_ptr<PacmanFramePainter> frame_painter)
-    : FrameDeliverer(std::move(frame_painter)) {}
-
-JpegEncodingFrameDeliverer::~JpegEncodingFrameDeliverer() = default;
-
-void JpegEncodingFrameDeliverer::Uninitialize() {
-  FrameDeliverer::Uninitialize();
-  sk_n32_buffer_.clear();
-  jpeg_buffer_.clear();
-}
-
-void JpegEncodingFrameDeliverer::PaintAndDeliverNextFrame(
-    base::TimeDelta timestamp_to_paint) {
-  if (!client())
-    return;
-
-  auto required_sk_n32_buffer_size = VideoFrame::AllocationSize(
-      PIXEL_FORMAT_ARGB, device_state()->format.frame_size);
-  sk_n32_buffer_.resize(required_sk_n32_buffer_size);
-  memset(&sk_n32_buffer_[0], 0, required_sk_n32_buffer_size);
-
-  frame_painter()->PaintFrame(timestamp_to_paint, &sk_n32_buffer_[0]);
-
-  static const int kQuality = 75;
-  const gfx::JPEGCodec::ColorFormat encoding_source_format =
-      (kN32_SkColorType == kRGBA_8888_SkColorType)
-          ? gfx::JPEGCodec::FORMAT_RGBA
-          : gfx::JPEGCodec::FORMAT_BGRA;
-  bool success = gfx::JPEGCodec::Encode(
-      &sk_n32_buffer_[0], encoding_source_format,
-      device_state()->format.frame_size.width(),
-      device_state()->format.frame_size.height(),
-      VideoFrame::RowBytes(0 /* plane */, PIXEL_FORMAT_ARGB,
-                           device_state()->format.frame_size.width()),
-      kQuality, &jpeg_buffer_);
-  if (!success) {
-    DLOG(ERROR) << "Jpeg encoding failed";
-    return;
-  }
-
-  const size_t frame_size = jpeg_buffer_.size();
-  base::TimeTicks now = base::TimeTicks::Now();
-  client()->OnIncomingCapturedData(&jpeg_buffer_[0], frame_size,
-                                   device_state()->format, 0 /* rotation */,
-                                   now, CalculateTimeSinceFirstInvocation(now));
+  client_->OnIncomingCapturedBuffer(std::move(capture_buffer),
+                                    device_state_->format, now,
+                                    CalculateTimeSinceFirstInvocation(now));
 }
 
 void FakeVideoCaptureDevice::BeepAndScheduleNextCapture(
@@ -697,10 +619,9 @@
       std::max(current_time, expected_execution_time + frame_interval);
   const base::TimeDelta delay = next_execution_time - current_time;
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&FakeVideoCaptureDevice::OnNextFrameDue,
-                 weak_factory_.GetWeakPtr(), next_execution_time,
-                 current_session_id_),
+      FROM_HERE, base::Bind(&FakeVideoCaptureDevice::OnNextFrameDue,
+                            weak_factory_.GetWeakPtr(), next_execution_time,
+                            current_session_id_),
       delay);
 }
 

diff --git a/media/capture/video/fake_video_capture_device.h b/media/capture/video/fake_video_capture_device.h
index 7919e9f6..c853b4d 100644
--- a/media/capture/video/fake_video_capture_device.h
+++ b/media/capture/video/fake_video_capture_device.h

@@ -18,11 +18,6 @@
 // on a given target OutputMode and frame rate.
 class CAPTURE_EXPORT FakeVideoCaptureDeviceMaker {
  public:
-  enum class PixelFormat {
-    I420 = media::PIXEL_FORMAT_I420,
-    Y16 = media::PIXEL_FORMAT_Y16,
-    MJPEG = media::PIXEL_FORMAT_MJPEG
-  };
   enum class DeliveryMode {
     USE_DEVICE_INTERNAL_BUFFERS,
     USE_CLIENT_PROVIDED_BUFFERS
@@ -31,7 +26,7 @@
   static void GetSupportedSizes(std::vector<gfx::Size>* supported_sizes);
 
   static std::unique_ptr<VideoCaptureDevice> MakeInstance(
-      PixelFormat pixel_format,
+      VideoPixelFormat pixel_format,
       DeliveryMode delivery_mode,
       float frame_rate);
 };

diff --git a/media/capture/video/fake_video_capture_device_factory.cc b/media/capture/video/fake_video_capture_device_factory.cc
index 5b850e6..49df8e6 100644
--- a/media/capture/video/fake_video_capture_device_factory.cc
+++ b/media/capture/video/fake_video_capture_device_factory.cc

@@ -13,10 +13,19 @@
 #include "build/build_config.h"
 #include "media/base/media_switches.h"
 
-namespace media {
 namespace {
 
 static const size_t kDepthDeviceIndex = 1;
+static const char kDepthDeviceId[] = "/dev/video1";
+
+media::VideoPixelFormat GetPixelFormatFromDeviceId(
+    const std::string& device_id) {
+  return (device_id == kDepthDeviceId) ? media::PIXEL_FORMAT_Y16
+                                       : media::PIXEL_FORMAT_I420;
+}
+}
+
+namespace media {
 
 // Cap the frame rate command line input to reasonable values.
 static const float kFakeCaptureMinFrameRate = 5.0f;
@@ -27,17 +36,6 @@
 static const int kFakeCaptureMinDeviceCount = 1;
 static const int kFakeCaptureMaxDeviceCount = 10;
 
-FakeVideoCaptureDeviceMaker::PixelFormat GetPixelFormatFromDeviceId(
-    const std::string& device_id) {
-  if (device_id == "/dev/video1")
-    return FakeVideoCaptureDeviceMaker::PixelFormat::Y16;
-  if (device_id == "/dev/video2")
-    return FakeVideoCaptureDeviceMaker::PixelFormat::MJPEG;
-  return FakeVideoCaptureDeviceMaker::PixelFormat::I420;
-}
-
-}  // anonymous namespace
-
 FakeVideoCaptureDeviceFactory::FakeVideoCaptureDeviceFactory()
     : number_of_devices_(1),
       delivery_mode_(FakeVideoCaptureDeviceMaker::DeliveryMode::
@@ -53,19 +51,8 @@
   for (int n = 0; n < number_of_devices_; ++n) {
     std::string possible_id = base::StringPrintf("/dev/video%d", n);
     if (device_descriptor.device_id.compare(possible_id) == 0) {
-      FakeVideoCaptureDeviceMaker::PixelFormat pixel_format =
-          GetPixelFormatFromDeviceId(possible_id);
-      FakeVideoCaptureDeviceMaker::DeliveryMode delivery_mode = delivery_mode_;
-      if (delivery_mode ==
-              FakeVideoCaptureDeviceMaker::DeliveryMode::
-                  USE_CLIENT_PROVIDED_BUFFERS &&
-          pixel_format == FakeVideoCaptureDeviceMaker::PixelFormat::MJPEG) {
-        // Incompatible options. Fall back to using internal buffers.
-        delivery_mode = FakeVideoCaptureDeviceMaker::DeliveryMode::
-            USE_DEVICE_INTERNAL_BUFFERS;
-      }
       return FakeVideoCaptureDeviceMaker::MakeInstance(
-          pixel_format, delivery_mode, frame_rate_);
+          GetPixelFormatFromDeviceId(possible_id), delivery_mode_, frame_rate_);
     }
   }
   return std::unique_ptr<VideoCaptureDevice>();
@@ -113,8 +100,8 @@
 
   ParseCommandLine();
 
-  const VideoPixelFormat pixel_format = static_cast<VideoPixelFormat>(
-      GetPixelFormatFromDeviceId(device_descriptor.device_id));
+  const VideoPixelFormat pixel_format =
+      GetPixelFormatFromDeviceId(device_descriptor.device_id);
   const VideoPixelStorage pixel_storage = PIXEL_STORAGE_CPU;
   std::vector<gfx::Size> supported_sizes;
   FakeVideoCaptureDeviceMaker::GetSupportedSizes(&supported_sizes);

diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index c6f46af..67e67e7 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc

@@ -266,22 +266,13 @@
 class FakeVideoCaptureDeviceTest
     : public FakeVideoCaptureDeviceBase,
       public ::testing::WithParamInterface<
-          ::testing::tuple<FakeVideoCaptureDeviceMaker::PixelFormat,
+          ::testing::tuple<VideoPixelFormat,
                            FakeVideoCaptureDeviceMaker::DeliveryMode,
                            float>> {};
 
 // Tests that a frame is delivered with the expected settings.
 // Sweeps through a fixed set of requested/expected resolutions.
 TEST_P(FakeVideoCaptureDeviceTest, CaptureUsing) {
-  if (testing::get<1>(GetParam()) ==
-          FakeVideoCaptureDeviceMaker::DeliveryMode::
-              USE_CLIENT_PROVIDED_BUFFERS &&
-      testing::get<0>(GetParam()) ==
-          FakeVideoCaptureDeviceMaker::PixelFormat::MJPEG) {
-    // Unsupported case
-    return;
-  }
-
   const std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors(
       EnumerateDevices());
   ASSERT_FALSE(descriptors->empty());
@@ -312,8 +303,7 @@
     WaitForCapturedFrame();
     EXPECT_EQ(resolution.second.width(), last_format().frame_size.width());
     EXPECT_EQ(resolution.second.height(), last_format().frame_size.height());
-    EXPECT_EQ(last_format().pixel_format,
-              static_cast<VideoPixelFormat>(testing::get<0>(GetParam())));
+    EXPECT_EQ(last_format().pixel_format, testing::get<0>(GetParam()));
     EXPECT_EQ(last_format().frame_rate, testing::get<2>(GetParam()));
     device->StopAndDeAllocate();
   }
@@ -322,9 +312,7 @@
 INSTANTIATE_TEST_CASE_P(
     ,
     FakeVideoCaptureDeviceTest,
-    Combine(Values(FakeVideoCaptureDeviceMaker::PixelFormat::I420,
-                   FakeVideoCaptureDeviceMaker::PixelFormat::Y16,
-                   FakeVideoCaptureDeviceMaker::PixelFormat::MJPEG),
+    Combine(Values(PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_ARGB),
             Values(FakeVideoCaptureDeviceMaker::DeliveryMode::
                        USE_DEVICE_INTERNAL_BUFFERS,
                    FakeVideoCaptureDeviceMaker::DeliveryMode::
@@ -333,22 +321,19 @@
 
 TEST_F(FakeVideoCaptureDeviceTest, GetDeviceSupportedFormats) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-      switches::kUseFakeDeviceForMediaStream, "device-count=4");
+      switches::kUseFakeDeviceForMediaStream, "device-count=3");
   std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors(
       EnumerateDevices());
-  ASSERT_EQ(4u, descriptors->size());
-  const VideoPixelFormat expected_format_by_device_index[] = {
-      PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_MJPEG,
-      PIXEL_FORMAT_I420};
+  ASSERT_EQ(3u, descriptors->size());
 
-  int device_index = 0;
   for (const auto& descriptors_iterator : *descriptors) {
     VideoCaptureFormats supported_formats;
     video_capture_device_factory_->GetSupportedFormats(descriptors_iterator,
                                                        &supported_formats);
     ASSERT_EQ(5u, supported_formats.size());
+    const std::string device_id = descriptors_iterator.device_id;
     VideoPixelFormat expected_format =
-        expected_format_by_device_index[device_index];
+        (device_id == "/dev/video1") ? PIXEL_FORMAT_Y16 : PIXEL_FORMAT_I420;
     EXPECT_EQ(96, supported_formats[0].frame_size.width());
     EXPECT_EQ(96, supported_formats[0].frame_size.height());
     EXPECT_EQ(expected_format, supported_formats[0].pixel_format);
@@ -369,7 +354,6 @@
     EXPECT_EQ(1080, supported_formats[4].frame_size.height());
     EXPECT_EQ(expected_format, supported_formats[4].pixel_format);
     EXPECT_GE(supported_formats[4].frame_rate, 20.0);
-    device_index++;
   }
 }
 
@@ -391,7 +375,7 @@
 
 TEST_F(FakeVideoCaptureDeviceTest, GetAndSetCapabilities) {
   auto device = FakeVideoCaptureDeviceMaker::MakeInstance(
-      FakeVideoCaptureDeviceMaker::PixelFormat::I420,
+      PIXEL_FORMAT_I420,
       FakeVideoCaptureDeviceMaker::DeliveryMode::USE_DEVICE_INTERNAL_BUFFERS,
       30.0);
   ASSERT_TRUE(device);
@@ -502,7 +486,7 @@
 
 TEST_F(FakeVideoCaptureDeviceTest, TakePhoto) {
   auto device = FakeVideoCaptureDeviceMaker::MakeInstance(
-      FakeVideoCaptureDeviceMaker::PixelFormat::I420,
+      PIXEL_FORMAT_I420,
       FakeVideoCaptureDeviceMaker::DeliveryMode::USE_DEVICE_INTERNAL_BUFFERS,
       30.0);
   ASSERT_TRUE(device);
@@ -594,17 +578,15 @@
                                60,
                                1u,
                                {PIXEL_FORMAT_I420}},
-           CommandLineTestData{"device-count=4",
-                               20,
-                               4u,
-
-                               {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
-                                PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
-           CommandLineTestData{"device-count=4,ownership=client",
-                               20,
-                               4u,
-
-                               {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16,
-                                PIXEL_FORMAT_MJPEG, PIXEL_FORMAT_I420}},
+           CommandLineTestData{
+               "device-count=3",
+               20,
+               3u,
+               {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_I420}},
+           CommandLineTestData{
+               "device-count=3,ownership=client",
+               20,
+               3u,
+               {PIXEL_FORMAT_I420, PIXEL_FORMAT_Y16, PIXEL_FORMAT_I420}},
            CommandLineTestData{"device-count=0", 20, 1u, {PIXEL_FORMAT_I420}}));
 };  // namespace media

diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc
index b910425..96f9d22 100644
--- a/media/capture/video/video_capture_device_client.cc
+++ b/media/capture/video/video_capture_device_client.cc

@@ -333,6 +333,15 @@
   }
   if (buffer_id == VideoCaptureBufferPool::kInvalidId)
     return Buffer();
+
+  if (!base::ContainsValue(buffer_ids_known_by_receiver_, buffer_id)) {
+    receiver_->OnNewBufferHandle(
+        buffer_id,
+        base::MakeUnique<BufferPoolBufferHandleProvider>(buffer_pool_,
+                                                         buffer_id));
+    buffer_ids_known_by_receiver_.push_back(buffer_id);
+  }
+
   return MakeBufferStruct(buffer_pool_, buffer_id, frame_feedback_id);
 }
 
@@ -356,11 +365,6 @@
     const VideoFrameMetadata& additional_metadata) {
   DFAKE_SCOPED_RECURSIVE_LOCK(call_from_producer_);
 
-  if (!base::ContainsValue(buffer_ids_known_by_receiver_, buffer.id)) {
-    receiver_->OnNewBufferHandle(buffer.id, std::move(buffer.handle_provider));
-    buffer_ids_known_by_receiver_.push_back(buffer.id);
-  }
-
   VideoFrameMetadata metadata;
   metadata.MergeMetadataFrom(&additional_metadata);
   metadata.SetDouble(media::VideoFrameMetadata::FRAME_RATE, format.frame_rate);

diff --git a/media/cast/net/pacing/paced_sender.cc b/media/cast/net/pacing/paced_sender.cc
index 4193cc33..34ab762 100644
--- a/media/cast/net/pacing/paced_sender.cc
+++ b/media/cast/net/pacing/paced_sender.cc

@@ -6,7 +6,6 @@
 
 #include "base/big_endian.h"
 #include "base/bind.h"
-#include "base/debug/dump_without_crashing.h"
 #include "base/message_loop/message_loop.h"
 #include "base/numerics/safe_conversions.h"
 
@@ -21,12 +20,6 @@
 static const size_t kPacingMaxBurstsPerFrame = 3;
 static const size_t kMaxDedupeWindowMs = 500;
 
-// "Impossible" upper-bound on the maximum number of packets that should ever be
-// enqueued in the pacer.  This is used to detect bugs, reported as crash dumps.
-static const size_t kHugeQueueLengthSeconds = 10;
-static const size_t kRidiculousNumberOfPackets =
-    kHugeQueueLengthSeconds * (kMaxBurstSize * 1000 / kPacingIntervalMs);
-
 }  // namespace
 
 DedupInfo::DedupInfo() : last_byte_acked_for_audio(0) {}
@@ -89,7 +82,6 @@
       next_next_max_burst_size_(target_burst_size_),
       current_burst_size_(0),
       state_(State_Unblocked),
-      has_reached_upper_bound_once_(false),
       weak_factory_(this) {}
 
 PacedSender::~PacedSender() {}
@@ -337,15 +329,6 @@
     return;
   }
 
-  // If the queue ever becomes impossibly long, send a crash dump without
-  // actually crashing the process.
-  if (size() > kRidiculousNumberOfPackets && !has_reached_upper_bound_once_) {
-    NOTREACHED();
-    // Please use Cr=Internals-Cast label in bug reports:
-    base::debug::DumpWithoutCrashing();
-    has_reached_upper_bound_once_ = true;
-  }
-
   base::TimeTicks now = clock_->NowTicks();
   // I don't actually trust that PostDelayTask(x - now) will mean that
   // now >= x when the call happens, so check if the previous state was

diff --git a/media/cast/net/pacing/paced_sender.h b/media/cast/net/pacing/paced_sender.h
index 3a559f9..7d601afa 100644
--- a/media/cast/net/pacing/paced_sender.h
+++ b/media/cast/net/pacing/paced_sender.h

@@ -242,8 +242,6 @@
 
   State state_;
 
-  bool has_reached_upper_bound_once_;
-
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<PacedSender> weak_factory_;
 

diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc
index 6031981..a8a0cba9 100644
--- a/media/filters/audio_decoder_selector_unittest.cc
+++ b/media/filters/audio_decoder_selector_unittest.cc

@@ -169,10 +169,8 @@
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderSelectorTest);
 };
 
-// TODO(xhwang): Add kNoCdm tests for clear stream.
+// Tests for clear streams.
 
-// The stream is not encrypted but we have no clear decoder. No decoder can be
-// selected.
 TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_NoClearDecoder) {
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 0);
@@ -182,11 +180,9 @@
   SelectDecoder();
 }
 
-// The stream is not encrypted and we have one clear decoder. The decoder
-// will be selected.
-TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
+TEST_F(AudioDecoderSelectorTest, ClearStream_NoCdm_OneClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 1);
+  InitializeDecoderSelector(kNoCdm, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
       .WillOnce(RunCallback<2>(true));
@@ -195,21 +191,18 @@
   SelectDecoder();
 }
 
-TEST_F(AudioDecoderSelectorTest,
-       Destroy_ClearStream_NoDecryptor_OneClearDecoder) {
+TEST_F(AudioDecoderSelectorTest, Destroy_ClearStream_NoCdm_OneClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 1);
+  InitializeDecoderSelector(kNoCdm, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
 
   SelectDecoderAndDestroy();
 }
 
-// The stream is not encrypted and we have multiple clear decoders. The first
-// decoder that can decode the input stream will be selected.
-TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
+TEST_F(AudioDecoderSelectorTest, ClearStream_NoCdm_MultipleClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 2);
+  InitializeDecoderSelector(kNoCdm, 2);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
       .WillOnce(RunCallback<2>(false));
@@ -221,9 +214,9 @@
 }
 
 TEST_F(AudioDecoderSelectorTest,
-       Destroy_ClearStream_NoDecryptor_MultipleClearDecoder) {
+       Destroy_ClearStream_NoCdm_MultipleClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 2);
+  InitializeDecoderSelector(kNoCdm, 2);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
       .WillOnce(RunCallback<2>(false));
@@ -232,20 +225,64 @@
   SelectDecoderAndDestroy();
 }
 
-// There is a decryptor but the stream is not encrypted. The decoder will be
-// selected.
-TEST_F(AudioDecoderSelectorTest, ClearStream_HasDecryptor) {
+TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 1);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
+      .WillOnce(RunCallback<2>(false));
+  EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull()));
+
+  SelectDecoder();
+}
+
+TEST_F(AudioDecoderSelectorTest,
+       Destroy_ClearStream_NoDecryptor_OneClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 1);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _));
+
+  SelectDecoderAndDestroy();
+}
+
+TEST_F(AudioDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 2);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
+      .WillOnce(RunCallback<2>(false));
+  EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _))
+      .WillOnce(RunCallback<2>(true));
+  EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
+
+  SelectDecoder();
+}
+
+TEST_F(AudioDecoderSelectorTest,
+       Destroy_ClearStream_NoDecryptor_MultipleClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 2);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
+      .WillOnce(RunCallback<2>(false));
+  EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _));
+
+  SelectDecoderAndDestroy();
+}
+
+TEST_F(AudioDecoderSelectorTest, ClearStream_DecryptOnly) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
       .WillOnce(RunCallback<2>(true));
-  EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
+  EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
 
   SelectDecoder();
 }
 
-TEST_F(AudioDecoderSelectorTest, Destroy_ClearStream_HasDecryptor) {
+TEST_F(AudioDecoderSelectorTest, Destroy_ClearStream_DecryptOnly) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
@@ -254,8 +291,28 @@
   SelectDecoderAndDestroy();
 }
 
-// The stream is encrypted and there's no decryptor. The decoder only supports
-// clear streams so no decoder can be selected.
+TEST_F(AudioDecoderSelectorTest, ClearStream_DecryptAndDecode) {
+  UseClearStream();
+  InitializeDecoderSelector(kDecryptAndDecode, 1);
+
+#if !defined(OS_ANDROID)
+  // A DecryptingVideoDecoder will be created and selected. The clear decoder
+  // should not be touched at all. No DecryptingDemuxerStream should be
+  // created.
+  EXPECT_CALL(*this, OnDecoderSelected(NotNull(), IsNull()));
+#else
+  // A DecryptingDemuxerStream will be created. The clear decoder will be
+  // initialized and returned.
+  EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
+      .WillOnce(RunCallback<2>(true));
+  EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull()));
+#endif
+
+  SelectDecoder();
+}
+
+// Tests for encrypted streams.
+
 TEST_F(AudioDecoderSelectorTest, EncryptedStream_NoDecryptor_OneClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kNoDecryptor, 1);
@@ -277,8 +334,6 @@
   SelectDecoderAndDestroy();
 }
 
-// The stream is encrypted and there's no decryptor. There are multiple decoders
-// and the first one that supports encrypted streams is selected.
 TEST_F(AudioDecoderSelectorTest, EncryptedStream_NoDecryptor_MultipleDecoders) {
   UseEncryptedStream();
   InitializeDecoderSelector(kNoDecryptor, 2);
@@ -304,8 +359,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can only do decryption and there's no decoder available. No decoder
-// can be selected.
 TEST_F(AudioDecoderSelectorTest, EncryptedStream_DecryptOnly_NoClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 0);
@@ -315,8 +368,6 @@
   SelectDecoder();
 }
 
-// Decryptor can do decryption-only and there's a decoder available. The decoder
-// will be selected and a DecryptingDemuxerStream will be created.
 TEST_F(AudioDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
@@ -338,9 +389,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can only do decryption and there are multiple decoders available.
-// The first decoder that can decode the input stream will be selected and
-// a DecryptingDemuxerStream will be created.
 TEST_F(AudioDecoderSelectorTest,
        EncryptedStream_DecryptOnly_MultipleClearDecoder) {
   UseEncryptedStream();
@@ -367,7 +415,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can do decryption and decoding.
 TEST_F(AudioDecoderSelectorTest, EncryptedStream_DecryptAndDecode) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptAndDecode, 1);

diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 70b15f8..00aad682 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc

@@ -1012,7 +1012,7 @@
 
   DemuxerStream* GetStream(DemuxerStream::Type type) {
     std::vector<DemuxerStream*> streams = demuxer_->GetAllStreams();
-    for (const auto& stream : streams) {
+    for (auto* stream : streams) {
       if (stream->type() == type)
         return stream;
     }

diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index 4ab98e20..3d6854f 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc

@@ -40,19 +40,6 @@
   return false;
 }
 
-static bool IsStreamEncrypted(DemuxerStream* stream) {
-  switch (stream->type()) {
-    case DemuxerStream::AUDIO:
-      return stream->audio_decoder_config().is_encrypted();
-    case DemuxerStream::VIDEO:
-      return stream->video_decoder_config().is_encrypted();
-    case DemuxerStream::TEXT:
-    case DemuxerStream::UNKNOWN:
-      NOTREACHED();
-  }
-  return false;
-}
-
 template <DemuxerStream::Type StreamType>
 DecoderSelector<StreamType>::DecoderSelector(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ -106,23 +93,23 @@
   input_stream_ = stream;
   output_cb_ = output_cb;
 
-  if (!IsStreamEncrypted(input_stream_)) {
-    InitializeDecoder();
-    return;
-  }
-
-  // This could be null during fallback after decoder reinitialization failure.
-  // See DecoderStream<StreamType>::OnDecoderReinitialized().
-  if (!cdm_context_) {
-    ReturnNullDecoder();
-    return;
-  }
-
+  // When there is a CDM attached, always try the decrypting decoder or
+  // demuxer-stream first.
+  if (cdm_context_) {
 #if !defined(OS_ANDROID)
-  InitializeDecryptingDecoder();
+    InitializeDecryptingDecoder();
 #else
-  InitializeDecryptingDemuxerStream();
+    InitializeDecryptingDemuxerStream();
 #endif
+    return;
+  }
+
+  config_ = StreamTraits::GetDecoderConfig(input_stream_);
+
+  // If the input stream is encrypted, CdmContext must be non-null.
+  DCHECK(!config_.is_encrypted());
+
+  InitializeDecoder();
 }
 
 #if !defined(OS_ANDROID)
@@ -177,6 +164,7 @@
   DVLOG(2) << __func__
            << ": status=" << MediaLog::PipelineStatusToString(status);
   DCHECK(task_runner_->BelongsToCurrentThread());
+  DCHECK(cdm_context_);
 
   // If DecryptingDemuxerStream initialization succeeded, we'll use it to do
   // decryption and use a decoder to decode the clear stream. Otherwise, we'll
@@ -185,10 +173,15 @@
 
   if (status == PIPELINE_OK) {
     input_stream_ = decrypted_stream_.get();
-    DCHECK(!IsStreamEncrypted(input_stream_));
+    config_ = StreamTraits::GetDecoderConfig(input_stream_);
+    DCHECK(!config_.is_encrypted());
   } else {
     decrypted_stream_.reset();
-    DCHECK(IsStreamEncrypted(input_stream_));
+    config_ = StreamTraits::GetDecoderConfig(input_stream_);
+
+    // Prefer decrypting decoder by using an encrypted config.
+    if (!config_.is_encrypted())
+      config_.SetIsEncrypted(true);
   }
 
   InitializeDecoder();
@@ -209,7 +202,7 @@
   decoders_.weak_erase(decoders_.begin());
 
   traits_->InitializeDecoder(
-      decoder_.get(), StreamTraits::GetDecoderConfig(input_stream_),
+      decoder_.get(), config_,
       input_stream_->liveness() == DemuxerStream::LIVENESS_LIVE, cdm_context_,
       base::Bind(&DecoderSelector<StreamType>::DecoderInitDone,
                  weak_ptr_factory_.GetWeakPtr()),

diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h
index dfd948ef..09378b8 100644
--- a/media/filters/decoder_selector.h
+++ b/media/filters/decoder_selector.h

@@ -37,6 +37,7 @@
  public:
   typedef DecoderStreamTraits<StreamType> StreamTraits;
   typedef typename StreamTraits::DecoderType Decoder;
+  typedef typename StreamTraits::DecoderConfigType DecoderConfig;
 
   // Indicates completion of Decoder selection.
   // - First parameter: The initialized Decoder. If it's set to NULL, then
@@ -93,7 +94,11 @@
   scoped_refptr<MediaLog> media_log_;
 
   StreamTraits* traits_;
+
+  // Could be the |stream| passed in SelectDecoder, or |decrypted_stream_| when
+  // a DecryptingDemuxerStream is selected.
   DemuxerStream* input_stream_;
+
   CdmContext* cdm_context_;
   SelectDecoderCB select_decoder_cb_;
   typename Decoder::OutputCB output_cb_;
@@ -102,6 +107,9 @@
   std::unique_ptr<Decoder> decoder_;
   std::unique_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
+  // Config of the |input_stream| used to initialize decoders.
+  DecoderConfig config_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
 

diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index 623d266..7320b26 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc

@@ -251,8 +251,14 @@
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::SelectDecoder() {
+  // If we are already using DecryptingDemuxerStream (DDS), e.g. during
+  // fallback, the |stream_| will always be clear. In this case, no need pass in
+  // the |cdm_context_|. This will also help prevent creating a new DDS on top
+  // of the current DDS.
+  CdmContext* cdm_context = decrypting_demuxer_stream_ ? nullptr : cdm_context_;
+
   decoder_selector_->SelectDecoder(
-      &traits_, stream_, cdm_context_,
+      &traits_, stream_, cdm_context,
       base::Bind(&DecoderStream<StreamType>::OnDecoderSelected,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,

diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index 764946903..719e9adc 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc

@@ -58,6 +58,7 @@
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(decode_cb_.is_null());
   DCHECK(reset_cb_.is_null());
+  DCHECK(cdm_context);
 
   weak_this_ = weak_factory_.GetWeakPtr();
   init_cb_ = BindToCurrentLoop(init_cb);
@@ -73,11 +74,6 @@
   config_ = config;
 
   if (state_ == kUninitialized) {
-    // DecoderSelector only chooses |this| when the stream is encrypted.
-    // TODO(xhwang): We may also select this decoder for clear stream if a CDM
-    // is attached. Then we need to update this. See http://crbug.com/597443
-    DCHECK(config.is_encrypted());
-    DCHECK(cdm_context);
     if (!cdm_context->GetDecryptor()) {
       MEDIA_LOG(DEBUG, media_log_) << GetDisplayName() << ": no decryptor";
       base::ResetAndReturn(&init_cb_).Run(false);

diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 830a5a11..94d388b 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc

@@ -133,7 +133,8 @@
         .WillOnce(RunCallback<1>(true));
     EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio, _))
               .WillOnce(SaveArg<1>(&key_added_cb_));
-    decoder_->Initialize(new_config, nullptr, NewExpectedBoolCB(true),
+    decoder_->Initialize(new_config, cdm_context_.get(),
+                         NewExpectedBoolCB(true),
                          base::Bind(&DecryptingAudioDecoderTest::FrameReady,
                                     base::Unretained(this)));
   }

diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
index 7213aef4..8967203c 100644
--- a/media/filters/decrypting_demuxer_stream.cc
+++ b/media/filters/decrypting_demuxer_stream.cc

@@ -359,28 +359,21 @@
   // The decoder selector or upstream demuxer make sure the stream is valid.
   DCHECK(IsStreamValid(demuxer_stream_));
 
+  // Since |this| is a decrypted version of |demuxer_stream_|, the decoder
+  // config of |this| should always be a decrypted version of |demuxer_stream_|
+  // configs.
   switch (demuxer_stream_->type()) {
     case AUDIO: {
-      AudioDecoderConfig input_audio_config =
-          demuxer_stream_->audio_decoder_config();
-      audio_config_.Initialize(
-          input_audio_config.codec(), input_audio_config.sample_format(),
-          input_audio_config.channel_layout(),
-          input_audio_config.samples_per_second(),
-          input_audio_config.extra_data(), Unencrypted(),
-          input_audio_config.seek_preroll(), input_audio_config.codec_delay());
+      audio_config_ = demuxer_stream_->audio_decoder_config();
+      if (audio_config_.is_encrypted())
+        audio_config_.SetIsEncrypted(false);
       break;
     }
 
     case VIDEO: {
-      VideoDecoderConfig input_video_config =
-          demuxer_stream_->video_decoder_config();
-      video_config_.Initialize(
-          input_video_config.codec(), input_video_config.profile(),
-          input_video_config.format(), input_video_config.color_space(),
-          input_video_config.coded_size(), input_video_config.visible_rect(),
-          input_video_config.natural_size(), input_video_config.extra_data(),
-          Unencrypted());
+      video_config_ = demuxer_stream_->video_decoder_config();
+      if (video_config_.is_encrypted())
+        video_config_.SetIsEncrypted(false);
       break;
     }
 

diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 3a869440..4f379d9 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc

@@ -52,6 +52,7 @@
   DCHECK(decode_cb_.is_null());
   DCHECK(reset_cb_.is_null());
   DCHECK(config.IsValidConfig());
+  DCHECK(cdm_context);
 
   init_cb_ = BindToCurrentLoop(init_cb);
   output_cb_ = BindToCurrentLoop(output_cb);
@@ -59,11 +60,6 @@
   config_ = config;
 
   if (state_ == kUninitialized) {
-    // DecoderSelector only chooses |this| when the stream is encrypted.
-    // TODO(xhwang): We may also select this decoder for clear stream if a CDM
-    // is attached. Then we need to update this. See http://crbug.com/597443
-    DCHECK(config.is_encrypted());
-    DCHECK(cdm_context);
     if (!cdm_context->GetDecryptor()) {
       MEDIA_LOG(DEBUG, media_log_) << GetDisplayName() << ": no decryptor";
       base::ResetAndReturn(&init_cb_).Run(false);

diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 11bcbb3a..92766f1 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc

@@ -107,7 +107,7 @@
 
   DemuxerStream* GetStream(DemuxerStream::Type type) {
     std::vector<DemuxerStream*> streams = demuxer_->GetAllStreams();
-    for (const auto& stream : streams) {
+    for (auto* stream : streams) {
       if (stream->type() == type)
         return stream;
     }

diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc
index 78becb1..c756324 100644
--- a/media/filters/video_decoder_selector_unittest.cc
+++ b/media/filters/video_decoder_selector_unittest.cc

@@ -164,10 +164,8 @@
   DISALLOW_COPY_AND_ASSIGN(VideoDecoderSelectorTest);
 };
 
-// TODO(xhwang): Add kNoCdm tests for clear stream.
+// Tests for clear streams.
 
-// The stream is not encrypted but we have no clear decoder. No decoder can be
-// selected.
 TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_NoClearDecoder) {
   UseClearStream();
   InitializeDecoderSelector(kNoDecryptor, 0);
@@ -177,11 +175,9 @@
   SelectDecoder();
 }
 
-// The stream is not encrypted and we have one clear decoder. The decoder
-// will be selected.
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
+TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_OneClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 1);
+  InitializeDecoderSelector(kNoCdm, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
       .WillOnce(RunCallback<3>(true));
@@ -190,21 +186,18 @@
   SelectDecoder();
 }
 
-TEST_F(VideoDecoderSelectorTest,
-       Destroy_ClearStream_NoDecryptor_OneClearDecoder) {
+TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_NoCdm_OneClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 1);
+  InitializeDecoderSelector(kNoCdm, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _));
 
   SelectDecoderAndDestroy();
 }
 
-// The stream is not encrypted and we have multiple clear decoders. The first
-// decoder that can decode the input stream will be selected.
-TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
+TEST_F(VideoDecoderSelectorTest, ClearStream_NoCdm_MultipleClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 2);
+  InitializeDecoderSelector(kNoCdm, 2);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
       .WillOnce(RunCallback<3>(false));
@@ -216,9 +209,9 @@
 }
 
 TEST_F(VideoDecoderSelectorTest,
-       Destroy_ClearStream_NoDecryptor_MultipleClearDecoder) {
+       Destroy_ClearStream_NoCdm_MultipleClearDecoder) {
   UseClearStream();
-  InitializeDecoderSelector(kNoDecryptor, 2);
+  InitializeDecoderSelector(kNoCdm, 2);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
       .WillOnce(RunCallback<3>(false));
@@ -227,20 +220,64 @@
   SelectDecoderAndDestroy();
 }
 
-// There is a decryptor but the stream is not encrypted. The decoder will be
-// selected.
-TEST_F(VideoDecoderSelectorTest, ClearStream_HasDecryptor) {
+TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_OneClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 1);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+      .WillOnce(RunCallback<3>(false));
+  EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull()));
+
+  SelectDecoder();
+}
+
+TEST_F(VideoDecoderSelectorTest,
+       Destroy_ClearStream_NoDecryptor_OneClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 1);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _));
+
+  SelectDecoderAndDestroy();
+}
+
+TEST_F(VideoDecoderSelectorTest, ClearStream_NoDecryptor_MultipleClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 2);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+      .WillOnce(RunCallback<3>(false));
+  EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _))
+      .WillOnce(RunCallback<3>(true));
+  EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
+
+  SelectDecoder();
+}
+
+TEST_F(VideoDecoderSelectorTest,
+       Destroy_ClearStream_NoDecryptor_MultipleClearDecoder) {
+  UseClearStream();
+  InitializeDecoderSelector(kNoDecryptor, 2);
+
+  EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _, _))
+      .WillOnce(RunCallback<3>(false));
+  EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _, _));
+
+  SelectDecoderAndDestroy();
+}
+
+TEST_F(VideoDecoderSelectorTest, ClearStream_DecryptOnly) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
   EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
       .WillOnce(RunCallback<3>(true));
-  EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
+  EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
 
   SelectDecoder();
 }
 
-TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_HasDecryptor) {
+TEST_F(VideoDecoderSelectorTest, Destroy_ClearStream_DecryptOnly) {
   UseClearStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
 
@@ -249,8 +286,28 @@
   SelectDecoderAndDestroy();
 }
 
-// The stream is encrypted and there's no decryptor. The decoder only supports
-// clear streams so no decoder can be selected.
+TEST_F(VideoDecoderSelectorTest, ClearStream_DecryptAndDecode) {
+  UseClearStream();
+  InitializeDecoderSelector(kDecryptAndDecode, 1);
+
+#if !defined(OS_ANDROID)
+  // A DecryptingVideoDecoder will be created and selected. The clear decoder
+  // should not be touched at all. No DecryptingDemuxerStream should be
+  // created.
+  EXPECT_CALL(*this, OnDecoderSelected(NotNull(), IsNull()));
+#else
+  // A DecryptingDemuxerStream will be created. The clear decoder will be
+  // initialized and returned.
+  EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _, _))
+      .WillOnce(RunCallback<3>(true));
+  EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull()));
+#endif
+
+  SelectDecoder();
+}
+
+// Tests for encrypted streams.
+
 TEST_F(VideoDecoderSelectorTest, EncryptedStream_NoDecryptor_OneClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kNoDecryptor, 1);
@@ -272,8 +329,6 @@
   SelectDecoderAndDestroy();
 }
 
-// The stream is encrypted and there's no decryptor. There are multiple decoders
-// and the first one that supports encrypted streams is selected.
 TEST_F(VideoDecoderSelectorTest, EncryptedStream_NoDecryptor_MultipleDecoders) {
   UseEncryptedStream();
   InitializeDecoderSelector(kNoDecryptor, 2);
@@ -299,8 +354,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can only do decryption and there's no decoder available. No decoder
-// can be selected.
 TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_NoDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 0);
@@ -310,8 +363,6 @@
   SelectDecoder();
 }
 
-// Decryptor can do decryption-only and there's a decoder available. The decoder
-// will be selected and a DecryptingDemuxerStream will be created.
 TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptOnly_OneClearDecoder) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptOnly, 1);
@@ -335,9 +386,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can only do decryption and there are multiple decoders available.
-// The first decoder that can decode the input stream will be selected and
-// a DecryptingDemuxerStream will be created.
 TEST_F(VideoDecoderSelectorTest,
        EncryptedStream_DecryptOnly_MultipleClearDecoder) {
   UseEncryptedStream();
@@ -364,7 +412,6 @@
   SelectDecoderAndDestroy();
 }
 
-// Decryptor can do decryption and decoding.
 TEST_F(VideoDecoderSelectorTest, EncryptedStream_DecryptAndDecode) {
   UseEncryptedStream();
   InitializeDecoderSelector(kDecryptAndDecode, 1);

diff --git a/media/filters/video_frame_stream_unittest.cc b/media/filters/video_frame_stream_unittest.cc
index 415233d..27fea03 100644
--- a/media/filters/video_frame_stream_unittest.cc
+++ b/media/filters/video_frame_stream_unittest.cc

@@ -57,7 +57,6 @@
       : demuxer_stream_(new FakeDemuxerStream(kNumConfigs,
                                               kNumBuffersInOneConfig,
                                               GetParam().is_encrypted)),
-        cdm_context_(new StrictMock<MockCdmContext>()),
         is_initialized_(false),
         num_decoded_frames_(0),
         pending_initialize_(false),
@@ -79,7 +78,7 @@
                                      bytes_decoded_cb);
 
     // TODO(xhwang): We should test the case where only certain decoder
-    // supports encrypted streams. Currently this is hard to test becasue we use
+    // supports encrypted streams. Currently this is hard to test because we use
     // parameterized tests which need to pass in all combinations.
     if (GetParam().is_encrypted && !GetParam().has_decryptor) {
       decoder1_->EnableEncryptedConfigSupport();
@@ -95,7 +94,7 @@
     video_frame_stream_.reset(new VideoFrameStream(
         message_loop_.task_runner(), std::move(decoders), new MediaLog()));
 
-    if (GetParam().has_decryptor) {
+    if (GetParam().is_encrypted && GetParam().has_decryptor) {
       decryptor_.reset(new NiceMock<MockDecryptor>());
 
       // Decryptor can only decrypt (not decrypt-and-decode) so that
@@ -106,8 +105,12 @@
           .WillRepeatedly(Invoke(this, &VideoFrameStreamTest::Decrypt));
     }
 
-    EXPECT_CALL(*cdm_context_, GetDecryptor())
-        .WillRepeatedly(Return(decryptor_.get()));
+    if (GetParam().is_encrypted) {
+      cdm_context_.reset(new StrictMock<MockCdmContext>());
+
+      EXPECT_CALL(*cdm_context_, GetDecryptor())
+          .WillRepeatedly(Return(decryptor_.get()));
+    }
   }
 
   ~VideoFrameStreamTest() {

diff --git a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator_unittest.cc b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator_unittest.cc
index 62ed1ae..82dd28f 100644
--- a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator_unittest.cc
+++ b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator_unittest.cc

@@ -90,7 +90,7 @@
   auto io_task_runner = io_thread_.task_runner();
   auto main_task_runner = base::ThreadTaskRunnerHandle::Get();
   auto decoder = base::MakeUnique<MockJpegDecodeAccelerator>();
-  auto decoder_ptr = decoder.get();
+  auto* decoder_ptr = decoder.get();
   ON_CALL(*decoder, Initialize(_)).WillByDefault(Return(true));
 
   IPC::MessageFilter* message_filter = nullptr;

diff --git a/media/media_options.gni b/media/media_options.gni
index 3d61b92..b289851a 100644
--- a/media/media_options.gni
+++ b/media/media_options.gni

@@ -49,7 +49,7 @@
   # platform. Enable by default for Chromecast.
   enable_hevc_demuxing = proprietary_codecs && is_chromecast
 
-  enable_webrtc = !is_ios
+  enable_webrtc = !is_ios && !is_cast_audio_only
 
   # Enable HLS with SAMPLE-AES decryption.
   # Enabled by default on the cast desktop implementation to allow unit tests of

diff --git a/media/mojo/clients/mojo_renderer.cc b/media/mojo/clients/mojo_renderer.cc
index a2ec4de..7563d58 100644
--- a/media/mojo/clients/mojo_renderer.cc
+++ b/media/mojo/clients/mojo_renderer.cc

@@ -76,7 +76,7 @@
   std::vector<DemuxerStream*> streams = media_resource_->GetAllStreams();
   std::vector<mojom::DemuxerStreamPtr> stream_proxies;
 
-  for (const auto& stream : streams) {
+  for (auto* stream : streams) {
     mojom::DemuxerStreamPtr stream_proxy;
     std::unique_ptr<MojoDemuxerStreamImpl> mojo_stream =
         base::MakeUnique<MojoDemuxerStreamImpl>(stream,

diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc
index 3abc020..f03b2da 100644
--- a/media/renderers/renderer_impl.cc
+++ b/media/renderers/renderer_impl.cc

@@ -143,6 +143,7 @@
   init_cb_ = init_cb;
 
   if (HasEncryptedStream() && !cdm_context_) {
+    DVLOG(1) << __func__ << ": Has encrypted stream but CDM is not set.";
     state_ = STATE_INIT_PENDING_CDM;
     return;
   }
@@ -353,7 +354,7 @@
   std::vector<DemuxerStream*> demuxer_streams =
       media_resource_->GetAllStreams();
 
-  for (const auto& stream : demuxer_streams) {
+  for (auto* stream : demuxer_streams) {
     if (stream->type() == DemuxerStream::AUDIO &&
         stream->audio_decoder_config().is_encrypted())
       return true;

diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 2f4af64..15e6e868 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc

@@ -737,6 +737,8 @@
     EXPECT_CALL(*this, OnDurationChange()).Times(AnyNumber());
     EXPECT_CALL(*this, OnVideoNaturalSizeChange(_)).Times(AtMost(1));
     EXPECT_CALL(*this, OnVideoOpacityChange(_)).Times(AtMost(1));
+    EXPECT_CALL(*this, OnVideoAverageKeyframeDistanceUpdate())
+        .Times(AnyNumber());
 
     source->set_demuxer_failure_cb(base::Bind(
         &PipelineIntegrationTest::OnStatusCallback, base::Unretained(this)));
@@ -1505,6 +1507,7 @@
   EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(640, 360))).Times(1);
   scoped_refptr<DecoderBuffer> second_file =
       ReadTestDataFile("bear-640x360-av_enc-av.webm");
+
   ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                                   second_file->data(),
                                   second_file->data_size()));
@@ -1522,9 +1525,6 @@
   Stop();
 }
 
-// TODO(xhwang): Config change from clear to encrypted is allowed by the
-// demuxer, but is not currently supported by the Renderer. See
-// http://crbug.com/597443
 TEST_F(PipelineIntegrationTest,
        MAYBE_EME(MediaSource_ConfigChange_ClearThenEncrypted_WebM)) {
   MockMediaSource source("bear-320x240-16x9-aspect.webm", kWebM,
@@ -1533,6 +1533,7 @@
   EXPECT_EQ(PIPELINE_OK,
             StartPipelineWithEncryptedMedia(&source, &encrypted_media));
 
+  EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(640, 360))).Times(1);
   scoped_refptr<DecoderBuffer> second_file =
       ReadTestDataFile("bear-640x360-av_enc-av.webm");
 
@@ -1542,8 +1543,7 @@
   source.EndOfStream();
 
   Play();
-
-  EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
+  EXPECT_TRUE(WaitUntilOnEnded());
 
   EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
   EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
@@ -1551,6 +1551,7 @@
             pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
 
   source.Shutdown();
+  Stop();
 }
 
 // Config change from encrypted to clear is allowed by the demuxer, and is

diff --git a/net/BUILD.gn b/net/BUILD.gn
index de5df342f..74953f2 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn

@@ -1327,6 +1327,7 @@
       "quic/platform/api/quic_clock.h",
       "quic/platform/api/quic_containers.h",
       "quic/platform/api/quic_export.h",
+      "quic/platform/api/quic_flag_utils.h",
       "quic/platform/api/quic_hostname_utils.cc",
       "quic/platform/api/quic_hostname_utils.h",
       "quic/platform/api/quic_ip_address.cc",
@@ -1354,6 +1355,7 @@
       "quic/platform/impl/quic_chromium_clock.h",
       "quic/platform/impl/quic_containers_impl.h",
       "quic/platform/impl/quic_export_impl.h",
+      "quic/platform/impl/quic_flag_utils_impl.h",
       "quic/platform/impl/quic_hostname_utils_impl.cc",
       "quic/platform/impl/quic_hostname_utils_impl.h",
       "quic/platform/impl/quic_ip_address_impl.cc",
@@ -4558,8 +4560,6 @@
     "quic/test_tools/quic_packet_creator_peer.h",
     "quic/test_tools/quic_packet_generator_peer.cc",
     "quic/test_tools/quic_packet_generator_peer.h",
-    "quic/test_tools/quic_received_packet_manager_peer.cc",
-    "quic/test_tools/quic_received_packet_manager_peer.h",
     "quic/test_tools/quic_sent_packet_manager_peer.cc",
     "quic/test_tools/quic_sent_packet_manager_peer.h",
     "quic/test_tools/quic_session_peer.cc",

diff --git a/net/cert/cert_verify_proc_android.cc b/net/cert/cert_verify_proc_android.cc
index e0a442a..3898168f 100644
--- a/net/cert/cert_verify_proc_android.cc
+++ b/net/cert/cert_verify_proc_android.cc

@@ -23,6 +23,7 @@
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/x509_certificate.h"
+#include "net/cert/x509_util.h"
 #include "third_party/boringssl/src/include/openssl/x509v3.h"
 #include "url/gurl.h"
 
@@ -112,7 +113,9 @@
     return false;
   CertErrors errors;
   return ParsedCertificate::CreateAndAddToVector(
-      aia_fetch_bytes.data(), aia_fetch_bytes.size(), {}, cert_list, &errors);
+      x509_util::CreateCryptoBuffer(aia_fetch_bytes.data(),
+                                    aia_fetch_bytes.size()),
+      {}, cert_list, &errors);
 }
 
 // Uses android::VerifyX509CertChain() to verify the certificates in |certs| for
@@ -175,7 +178,8 @@
   CertErrors errors;
   ParsedCertificateList certs;
   for (const auto& cert : cert_bytes) {
-    if (!ParsedCertificate::CreateAndAddToVector(cert, {}, &certs, &errors)) {
+    if (!ParsedCertificate::CreateAndAddToVector(
+            x509_util::CreateCryptoBuffer(cert), {}, &certs, &errors)) {
       return android::CERT_VERIFY_STATUS_ANDROID_NO_TRUSTED_ROOT;
     }
   }

diff --git a/net/cert/cert_verify_proc_mac.cc b/net/cert/cert_verify_proc_mac.cc
index 46d1cc86..15d07f3 100644
--- a/net/cert/cert_verify_proc_mac.cc
+++ b/net/cert/cert_verify_proc_mac.cc

@@ -35,6 +35,7 @@
 #include "net/cert/test_keychain_search_list_mac.h"
 #include "net/cert/test_root_certs.h"
 #include "net/cert/x509_certificate.h"
+#include "net/cert/x509_util.h"
 #include "net/cert/x509_util_mac.h"
 
 // CSSM functions are deprecated as of OSX 10.7, but have no replacement.
@@ -295,8 +296,8 @@
     return;
   }
 
-  scoped_refptr<ParsedCertificate> cert(
-      ParsedCertificate::Create(der_cert, {}, nullptr));
+  scoped_refptr<ParsedCertificate> cert(ParsedCertificate::Create(
+      x509_util::CreateCryptoBuffer(der_cert), {}, nullptr));
   if (!cert)
     return;
 
@@ -346,7 +347,8 @@
     if (!X509Certificate::GetDEREncoded(os_cert_chain[i], &der_cert))
       return false;
     scoped_refptr<ParsedCertificate> intermediate_cert(
-        ParsedCertificate::Create(der_cert, {}, nullptr));
+        ParsedCertificate::Create(x509_util::CreateCryptoBuffer(der_cert), {},
+                                  nullptr));
     if (!intermediate_cert)
       return false;
     if (!HasPolicyOrAnyPolicy(intermediate_cert.get(), ev_policy_oid))

diff --git a/net/cert/internal/cert_issuer_source_aia.cc b/net/cert/internal/cert_issuer_source_aia.cc
index 6e1290a..8ddb9a00a 100644
--- a/net/cert/internal/cert_issuer_source_aia.cc
+++ b/net/cert/internal/cert_issuer_source_aia.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "net/cert/cert_net_fetcher.h"
 #include "net/cert/internal/cert_errors.h"
+#include "net/cert/x509_util.h"
 #include "url/gurl.h"
 
 namespace net {
@@ -81,7 +82,9 @@
   // TODO(eroman): Avoid copying bytes in the certificate?
   CertErrors errors;
   if (!ParsedCertificate::CreateAndAddToVector(
-          fetched_bytes.data(), fetched_bytes.size(), {}, results, &errors)) {
+          x509_util::CreateCryptoBuffer(fetched_bytes.data(),
+                                        fetched_bytes.size()),
+          {}, results, &errors)) {
     // TODO(crbug.com/634443): propagate error info.
     LOG(ERROR) << "Error parsing cert retrieved from AIA:\n"
                << errors.ToDebugString();

diff --git a/net/cert/internal/cert_issuer_source_aia_unittest.cc b/net/cert/internal/cert_issuer_source_aia_unittest.cc
index f81c33d..b332dee 100644
--- a/net/cert/internal/cert_issuer_source_aia_unittest.cc
+++ b/net/cert/internal/cert_issuer_source_aia_unittest.cc

@@ -10,6 +10,7 @@
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/internal/test_helpers.h"
+#include "net/cert/x509_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ -44,7 +45,8 @@
   if (!r)
     return r;
   CertErrors errors;
-  *result = ParsedCertificate::Create(der, {}, &errors);
+  *result = ParsedCertificate::Create(x509_util::CreateCryptoBuffer(der), {},
+                                      &errors);
   if (!*result) {
     return ::testing::AssertionFailure()
            << "ParsedCertificate::Create() failed:\n"

diff --git a/net/cert/internal/cert_issuer_source_nss.cc b/net/cert/internal/cert_issuer_source_nss.cc
index 418efe3..24218e88 100644
--- a/net/cert/internal/cert_issuer_source_nss.cc
+++ b/net/cert/internal/cert_issuer_source_nss.cc

@@ -10,6 +10,7 @@
 #include "crypto/nss_util.h"
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
+#include "net/cert/x509_util.h"
 
 namespace net {
 
@@ -40,7 +41,9 @@
        !CERT_LIST_END(node, found_certs); node = CERT_LIST_NEXT(node)) {
     CertErrors errors;
     scoped_refptr<ParsedCertificate> issuer_cert = ParsedCertificate::Create(
-        node->cert->derCert.data, node->cert->derCert.len, {}, &errors);
+        x509_util::CreateCryptoBuffer(node->cert->derCert.data,
+                                      node->cert->derCert.len),
+        {}, &errors);
     if (!issuer_cert) {
       // TODO(crbug.com/634443): return errors better.
       LOG(ERROR) << "Error parsing issuer certificate:\n"

diff --git a/net/cert/internal/cert_issuer_source_sync_unittest.h b/net/cert/internal/cert_issuer_source_sync_unittest.h
index 6b36b2f..cf3eb426 100644
--- a/net/cert/internal/cert_issuer_source_sync_unittest.h
+++ b/net/cert/internal/cert_issuer_source_sync_unittest.h

@@ -9,6 +9,7 @@
 #include "net/cert/internal/cert_issuer_source.h"
 #include "net/cert/internal/test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net {
 
@@ -34,7 +35,10 @@
   if (!r)
     return r;
   CertErrors errors;
-  *result = ParsedCertificate::Create(der, {}, &errors);
+  *result = ParsedCertificate::Create(
+      bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+          reinterpret_cast<const uint8_t*>(der.data()), der.size(), nullptr)),
+      {}, &errors);
   if (!*result) {
     return ::testing::AssertionFailure()
            << "ParsedCertificate::Create() failed:\n"

diff --git a/net/cert/internal/parse_certificate_fuzzer.cc b/net/cert/internal/parse_certificate_fuzzer.cc
index 67ea6986..382df09 100644
--- a/net/cert/internal/parse_certificate_fuzzer.cc
+++ b/net/cert/internal/parse_certificate_fuzzer.cc

@@ -8,11 +8,12 @@
 #include "base/macros.h"
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
+#include "net/cert/x509_util.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   net::CertErrors errors;
-  scoped_refptr<net::ParsedCertificate> cert =
-      net::ParsedCertificate::Create(data, size, {}, &errors);
+  scoped_refptr<net::ParsedCertificate> cert = net::ParsedCertificate::Create(
+      net::x509_util::CreateCryptoBuffer(data, size), {}, &errors);
 
   // TODO(crbug.com/634443): Ensure that !errors.empty() on parsing failure.
   return 0;

diff --git a/net/cert/internal/parsed_certificate.cc b/net/cert/internal/parsed_certificate.cc
index 6c2676cd..0c655079 100644
--- a/net/cert/internal/parsed_certificate.cc
+++ b/net/cert/internal/parsed_certificate.cc

@@ -8,6 +8,7 @@
 #include "net/cert/internal/signature_algorithm.h"
 #include "net/cert/internal/verify_name_match.h"
 #include "net/der/parser.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net {
 
@@ -24,73 +25,51 @@
 ParsedCertificate::ParsedCertificate() {}
 ParsedCertificate::~ParsedCertificate() {}
 
+// static
 scoped_refptr<ParsedCertificate> ParsedCertificate::Create(
-    const uint8_t* data,
-    size_t length,
+    bssl::UniquePtr<CRYPTO_BUFFER> cert_data,
     const ParseCertificateOptions& options,
     CertErrors* errors) {
-  return CreateInternal(data, length, DataSource::INTERNAL_COPY, options,
-                        errors);
+  return CreateInternal(std::move(cert_data), der::Input(), options, errors);
 }
 
-scoped_refptr<ParsedCertificate> ParsedCertificate::Create(
-    const base::StringPiece& data,
-    const ParseCertificateOptions& options,
-    CertErrors* errors) {
-  return ParsedCertificate::Create(
-      reinterpret_cast<const uint8_t*>(data.data()), data.size(), options,
-      errors);
-}
-
+// static
 bool ParsedCertificate::CreateAndAddToVector(
-    const uint8_t* data,
-    size_t length,
+    bssl::UniquePtr<CRYPTO_BUFFER> cert_data,
     const ParseCertificateOptions& options,
-    ParsedCertificateList* chain,
+    std::vector<scoped_refptr<net::ParsedCertificate>>* chain,
     CertErrors* errors) {
-  scoped_refptr<ParsedCertificate> cert(Create(data, length, options, errors));
+  scoped_refptr<ParsedCertificate> cert(
+      Create(std::move(cert_data), options, errors));
   if (!cert)
     return false;
   chain->push_back(std::move(cert));
   return true;
 }
 
-bool ParsedCertificate::CreateAndAddToVector(
-    const base::StringPiece& data,
-    const ParseCertificateOptions& options,
-    ParsedCertificateList* chain,
-    CertErrors* errors) {
-  return CreateAndAddToVector(reinterpret_cast<const uint8_t*>(data.data()),
-                              data.size(), options, chain, errors);
-}
-
+// static
 scoped_refptr<ParsedCertificate> ParsedCertificate::CreateWithoutCopyingUnsafe(
     const uint8_t* data,
     size_t length,
     const ParseCertificateOptions& options,
     CertErrors* errors) {
-  return CreateInternal(data, length, DataSource::EXTERNAL_REFERENCE, options,
-                        errors);
+  return CreateInternal(nullptr, der::Input(data, length), options, errors);
 }
 
+// static
 scoped_refptr<ParsedCertificate> ParsedCertificate::CreateInternal(
-    const uint8_t* data,
-    size_t length,
-    DataSource source,
+    bssl::UniquePtr<CRYPTO_BUFFER> backing_data,
+    der::Input static_data,
     const ParseCertificateOptions& options,
     CertErrors* errors) {
   // TODO(crbug.com/634443): Add errors
   scoped_refptr<ParsedCertificate> result(new ParsedCertificate);
-
-  switch (source) {
-    case DataSource::INTERNAL_COPY:
-      result->cert_data_.assign(data, data + length);
-      result->cert_ =
-          der::Input(result->cert_data_.data(), result->cert_data_.size());
-      break;
-    case DataSource::EXTERNAL_REFERENCE:
-      result->cert_ = der::Input(data, length);
-      break;
+  if (backing_data) {
+    result->cert_data_ = std::move(backing_data);
+    result->cert_ = der::Input(CRYPTO_BUFFER_data(result->cert_data_.get()),
+                               CRYPTO_BUFFER_len(result->cert_data_.get()));
+  } else {
+    result->cert_ = static_data;
   }
 
   if (!ParseCertificate(result->cert_, &result->tbs_certificate_tlv_,

diff --git a/net/cert/internal/parsed_certificate.h b/net/cert/internal/parsed_certificate.h
index 0b7c89f..06bd3789 100644
--- a/net/cert/internal/parsed_certificate.h
+++ b/net/cert/internal/parsed_certificate.h

@@ -13,6 +13,7 @@
 #include "net/base/net_export.h"
 #include "net/cert/internal/parse_certificate.h"
 #include "net/der/input.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 
 namespace net {
 
@@ -40,21 +41,10 @@
   // Creates a ParsedCertificate given a DER-encoded Certificate. Returns
   // nullptr on failure. Failure will occur if the standard certificate fields
   // and supported extensions cannot be parsed.
-  //
-  // The provided certificate data is copied, so |data| needn't remain valid
-  // after this call.
-  //
   // On either success or failure, if |errors| is non-null it may have error
   // information added to it.
   static scoped_refptr<ParsedCertificate> Create(
-      const uint8_t* data,
-      size_t length,
-      const ParseCertificateOptions& options,
-      CertErrors* errors);
-
-  // Overload that takes a StringPiece.
-  static scoped_refptr<ParsedCertificate> Create(
-      const base::StringPiece& data,
+      bssl::UniquePtr<CRYPTO_BUFFER> cert_data,
       const ParseCertificateOptions& options,
       CertErrors* errors);
 
@@ -65,15 +55,7 @@
   // On either success or failure, if |errors| is non-null it may have error
   // information added to it.
   static bool CreateAndAddToVector(
-      const uint8_t* data,
-      size_t length,
-      const ParseCertificateOptions& options,
-      std::vector<scoped_refptr<net::ParsedCertificate>>* chain,
-      CertErrors* errors);
-
-  // Overload that takes a StringPiece.
-  static bool CreateAndAddToVector(
-      const base::StringPiece& data,
+      bssl::UniquePtr<CRYPTO_BUFFER> cert_data,
       const ParseCertificateOptions& options,
       std::vector<scoped_refptr<net::ParsedCertificate>>* chain,
       CertErrors* errors);
@@ -208,50 +190,23 @@
   }
 
  private:
-  // The certificate data for may either be owned internally (INTERNAL_COPY) or
-  // owned externally (EXTERNAL_REFERENCE). When it is owned internally the data
-  // is held by |cert_data_|
-  enum class DataSource {
-    INTERNAL_COPY,
-    EXTERNAL_REFERENCE,
-  };
-
   friend class base::RefCountedThreadSafe<ParsedCertificate>;
   ParsedCertificate();
   ~ParsedCertificate();
 
+  // Creates a ParsedCertificate.  If |backing_data| is non-null, the
+  // certificate's DER-encoded data will be referenced from here. Otherwise the
+  // certificate's data will be |static_data|, and the pointer MUST remain
+  // valid and its data unmodified for the entirety of the program.
   static scoped_refptr<ParsedCertificate> CreateInternal(
-      const uint8_t* data,
-      size_t length,
-      DataSource source,
+      bssl::UniquePtr<CRYPTO_BUFFER> backing_data,
+      der::Input static_data,
       const ParseCertificateOptions& options,
       CertErrors* errors);
 
-  // These private overloads should not be used, and have no definition.
-  //
-  // They are here to prevent incorrectly passing a const char*
-  // in place of a base::StringPiece (thanks to StringPiece implicit
-  // ctor on const char*).
-  //
-  // Accidentally inflating a const char* (without length) to a
-  // StringPiece would be a bug.
-  static scoped_refptr<ParsedCertificate> Create(
-      const char* invalid_data,
-      const ParseCertificateOptions& options,
-      CertErrors* errors);
-  static bool CreateAndAddToVector(
-      const char* data,
-      const ParseCertificateOptions& options,
-      std::vector<scoped_refptr<net::ParsedCertificate>>* chain,
-      CertErrors* errors);
-
-  // The backing store for the certificate data. This is only applicable when
-  // the ParsedCertificate was initialized using DataSource::INTERNAL_COPY.
-  std::vector<uint8_t> cert_data_;
-
-  // Note that the backing data for |cert_| (and its  may come either from
-  // |cert_data_| or some external buffer (depending on how the
-  // ParsedCertificate was created).
+  // The backing store for the certificate data. May be null if created by
+  // CreateWithoutCopyingUnsafe.
+  bssl::UniquePtr<CRYPTO_BUFFER> cert_data_;
 
   // Points to the raw certificate DER.
   der::Input cert_;

diff --git a/net/cert/internal/parsed_certificate_unittest.cc b/net/cert/internal/parsed_certificate_unittest.cc
index ab1d4a0..5212caab 100644
--- a/net/cert/internal/parsed_certificate_unittest.cc
+++ b/net/cert/internal/parsed_certificate_unittest.cc

@@ -9,6 +9,7 @@
 #include "net/cert/internal/test_helpers.h"
 #include "net/der/input.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net {
 
@@ -35,8 +36,10 @@
   EXPECT_TRUE(ReadTestDataFromPemFile(test_file_path, mappings));
 
   CertErrors errors;
-  scoped_refptr<ParsedCertificate> cert =
-      ParsedCertificate::Create(data, {}, &errors);
+  scoped_refptr<ParsedCertificate> cert = ParsedCertificate::Create(
+      bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+          reinterpret_cast<const uint8_t*>(data.data()), data.size(), nullptr)),
+      {}, &errors);
 
   EXPECT_EQ(expected_errors, errors.ToDebugString()) << "Test file: "
                                                      << test_file_path;

diff --git a/net/cert/internal/path_builder_pkits_unittest.cc b/net/cert/internal/path_builder_pkits_unittest.cc
index b362519..2d16ee9b 100644
--- a/net/cert/internal/path_builder_pkits_unittest.cc
+++ b/net/cert/internal/path_builder_pkits_unittest.cc

@@ -12,6 +12,7 @@
 #include "net/cert/internal/trust_store_in_memory.h"
 #include "net/cert/internal/verify_certificate_chain.h"
 #include "net/der/input.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 // Disable tests that require DSA signatures (DSA signatures are intentionally
 // unsupported). Custom versions of the DSA tests are defined below which expect
@@ -59,7 +60,11 @@
     ParsedCertificateList certs;
     for (const std::string& der : cert_ders) {
       CertErrors errors;
-      if (!ParsedCertificate::CreateAndAddToVector(der, {}, &certs, &errors)) {
+      if (!ParsedCertificate::CreateAndAddToVector(
+              bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+                  reinterpret_cast<const uint8_t*>(der.data()), der.size(),
+                  nullptr)),
+              {}, &certs, &errors)) {
         ADD_FAILURE() << "ParseCertificate::CreateAndAddToVector() failed:\n"
                       << errors.ToDebugString();
         return false;

diff --git a/net/cert/internal/path_builder_unittest.cc b/net/cert/internal/path_builder_unittest.cc
index 35fe154..212b8de3 100644
--- a/net/cert/internal/path_builder_unittest.cc
+++ b/net/cert/internal/path_builder_unittest.cc

@@ -20,6 +20,7 @@
 #include "net/test/test_certificate_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net {
 
@@ -101,7 +102,10 @@
   if (!r)
     return r;
   CertErrors errors;
-  *result = ParsedCertificate::Create(der, {}, &errors);
+  *result = ParsedCertificate::Create(
+      bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+          reinterpret_cast<const uint8_t*>(der.data()), der.size(), nullptr)),
+      {}, &errors);
   if (!*result) {
     return ::testing::AssertionFailure()
            << "ParseCertificate::Create() failed:\n"
@@ -785,8 +789,11 @@
 TEST_F(PathBuilderKeyRolloverTest, TestDuplicateIntermediates) {
   // Create a separate copy of oldintermediate.
   scoped_refptr<ParsedCertificate> oldintermediate_dupe(
-      ParsedCertificate::Create(oldintermediate_->der_cert().AsStringPiece(),
-                                {}, nullptr));
+      ParsedCertificate::Create(
+          bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+              oldintermediate_->der_cert().UnsafeData(),
+              oldintermediate_->der_cert().Length(), nullptr)),
+          {}, nullptr));
 
   // Only newroot is a trusted root.
   TrustStoreInMemory trust_store;
@@ -847,7 +854,10 @@
 TEST_F(PathBuilderKeyRolloverTest, TestDuplicateIntermediateAndRoot) {
   // Create a separate copy of newroot.
   scoped_refptr<ParsedCertificate> newroot_dupe(ParsedCertificate::Create(
-      newroot_->der_cert().AsStringPiece(), {}, nullptr));
+      bssl::UniquePtr<CRYPTO_BUFFER>(
+          CRYPTO_BUFFER_new(newroot_->der_cert().UnsafeData(),
+                            newroot_->der_cert().Length(), nullptr)),
+      {}, nullptr));
 
   // Only newroot is a trusted root.
   TrustStoreInMemory trust_store;
@@ -1034,8 +1044,11 @@
   }
 
   scoped_refptr<ParsedCertificate> oldintermediate_dupe(
-      ParsedCertificate::Create(oldintermediate_->der_cert().AsStringPiece(),
-                                {}, nullptr));
+      ParsedCertificate::Create(
+          bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+              oldintermediate_->der_cert().UnsafeData(),
+              oldintermediate_->der_cert().Length(), nullptr)),
+          {}, nullptr));
 
   EXPECT_CALL(*target_issuers_req, GetNext(_))
       // First async batch: return oldintermediate_.

diff --git a/net/cert/internal/test_helpers.cc b/net/cert/internal/test_helpers.cc
index 2b87e49..24d4f329 100644
--- a/net/cert/internal/test_helpers.cc
+++ b/net/cert/internal/test_helpers.cc

@@ -12,6 +12,7 @@
 #include "net/cert/pem_tokenizer.h"
 #include "net/der/parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace net {
 
@@ -142,15 +143,21 @@
 
     if (block_type == kCertificateHeader) {
       CertErrors errors;
-      ASSERT_TRUE(net::ParsedCertificate::CreateAndAddToVector(block_data, {},
-                                                               chain, &errors))
+      ASSERT_TRUE(net::ParsedCertificate::CreateAndAddToVector(
+          bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+              reinterpret_cast<const uint8_t*>(block_data.data()),
+              block_data.size(), nullptr)),
+          {}, chain, &errors))
           << errors.ToDebugString();
     } else if (block_type == kTrustAnchorUnconstrained ||
                block_type == kTrustAnchorConstrained) {
       ASSERT_FALSE(*trust_anchor) << "Duplicate trust anchor";
       CertErrors errors;
-      scoped_refptr<ParsedCertificate> root =
-          net::ParsedCertificate::Create(block_data, {}, &errors);
+      scoped_refptr<ParsedCertificate> root = net::ParsedCertificate::Create(
+          bssl::UniquePtr<CRYPTO_BUFFER>(CRYPTO_BUFFER_new(
+              reinterpret_cast<const uint8_t*>(block_data.data()),
+              block_data.size(), nullptr)),
+          {}, &errors);
       ASSERT_TRUE(root) << errors.ToDebugString();
       *trust_anchor =
           block_type == kTrustAnchorUnconstrained

diff --git a/net/cert/internal/trust_store_nss.cc b/net/cert/internal/trust_store_nss.cc
index dd214dc..0a67939c 100644
--- a/net/cert/internal/trust_store_nss.cc
+++ b/net/cert/internal/trust_store_nss.cc

@@ -11,6 +11,7 @@
 #include "crypto/nss_util.h"
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/parsed_certificate.h"
+#include "net/cert/x509_util.h"
 
 // TODO(mattm): structure so that supporting ChromeOS multi-profile stuff is
 // doable (Have a TrustStoreChromeOS which uses net::NSSProfileFilterChromeOS,
@@ -56,7 +57,9 @@
 
     CertErrors errors;
     scoped_refptr<ParsedCertificate> anchor_cert = ParsedCertificate::Create(
-        node->cert->derCert.data, node->cert->derCert.len, {}, &errors);
+        x509_util::CreateCryptoBuffer(node->cert->derCert.data,
+                                      node->cert->derCert.len),
+        {}, &errors);
     if (!anchor_cert) {
       // TODO(crbug.com/634443): return errors better.
       LOG(ERROR) << "Error parsing issuer certificate:\n"

diff --git a/net/cert/internal/verify_certificate_chain_pkits_unittest.cc b/net/cert/internal/verify_certificate_chain_pkits_unittest.cc
index 6e2209a..52a5ff88 100644
--- a/net/cert/internal/verify_certificate_chain_pkits_unittest.cc
+++ b/net/cert/internal/verify_certificate_chain_pkits_unittest.cc

@@ -8,6 +8,7 @@
 #include "net/cert/internal/signature_policy.h"
 #include "net/cert/internal/trust_store.h"
 #include "net/der/input.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 // Disable tests that require DSA signatures (DSA signatures are intentionally
 // unsupported). Custom versions of the DSA tests are defined below which expect
@@ -58,8 +59,11 @@
     std::vector<scoped_refptr<net::ParsedCertificate>> input_chain;
     CertErrors errors;
     for (auto i = cert_ders.rbegin(); i != cert_ders.rend(); ++i) {
-      if (!net::ParsedCertificate::CreateAndAddToVector(*i, {}, &input_chain,
-                                                        &errors)) {
+      if (!net::ParsedCertificate::CreateAndAddToVector(
+              bssl::UniquePtr<CRYPTO_BUFFER>(
+                  CRYPTO_BUFFER_new(reinterpret_cast<const uint8_t*>(i->data()),
+                                    i->size(), nullptr)),
+              {}, &input_chain, &errors)) {
         ADD_FAILURE() << "Cert failed to parse:\n" << errors.ToDebugString();
         return false;
       }

diff --git a/net/cert/x509_util.h b/net/cert/x509_util.h
index 63b0c298..1773fdd 100644
--- a/net/cert/x509_util.h
+++ b/net/cert/x509_util.h

@@ -15,7 +15,7 @@
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
-#include "third_party/boringssl/src/include/openssl/base.h"
+#include "third_party/boringssl/src/include/openssl/pool.h"
 
 namespace crypto {
 class RSAPrivateKey;
@@ -111,6 +111,20 @@
 // Returns a CRYPTO_BUFFER_POOL for deduplicating certificates.
 NET_EXPORT CRYPTO_BUFFER_POOL* GetBufferPool();
 
+// Creates a CRYPTO_BUFFER in the same pool returned by GetBufferPool.
+NET_EXPORT bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(
+    const uint8_t* data,
+    size_t length);
+
+// Creates a CRYPTO_BUFFER in the same pool returned by GetBufferPool.
+NET_EXPORT bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(
+    const base::StringPiece& data);
+
+// Overload with no definition, to disallow creating a CRYPTO_BUFFER from a
+// char* due to StringPiece implicit ctor.
+NET_EXPORT bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(
+    const char* invalid_data);
+
 } // namespace x509_util
 
 } // namespace net

diff --git a/net/cert/x509_util_openssl.cc b/net/cert/x509_util_openssl.cc
index 4e79ad8a..d36fd5e4 100644
--- a/net/cert/x509_util_openssl.cc
+++ b/net/cert/x509_util_openssl.cc

@@ -365,6 +365,19 @@
   return g_buffer_pool_singleton.Get().pool();
 }
 
+bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(const uint8_t* data,
+                                                  size_t length) {
+  return bssl::UniquePtr<CRYPTO_BUFFER>(
+      CRYPTO_BUFFER_new(data, length, GetBufferPool()));
+}
+
+bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(
+    const base::StringPiece& data) {
+  return bssl::UniquePtr<CRYPTO_BUFFER>(
+      CRYPTO_BUFFER_new(reinterpret_cast<const uint8_t*>(data.data()),
+                        data.size(), GetBufferPool()));
+}
+
 }  // namespace x509_util
 
 }  // namespace net

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index b06b11ab..1dc390a 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc

@@ -116,6 +116,10 @@
   return 0;
 }
 
+bool HttpCache::ActiveEntry::HasNoTransactions() {
+  return !writer && readers.empty() && pending_queue.empty();
+}
+
 //-----------------------------------------------------------------------------
 
 // This structure keeps track of work items that are attempting to create or
@@ -671,9 +675,7 @@
 
 void HttpCache::FinalizeDoomedEntry(ActiveEntry* entry) {
   DCHECK(entry->doomed);
-  DCHECK(!entry->writer);
-  DCHECK(entry->readers.empty());
-  DCHECK(entry->pending_queue.empty());
+  DCHECK(entry->HasNoTransactions());
 
   auto it = doomed_entries_.find(entry);
   DCHECK(it != doomed_entries_.end());
@@ -696,10 +698,8 @@
 void HttpCache::DeactivateEntry(ActiveEntry* entry) {
   DCHECK(!entry->will_process_pending_queue);
   DCHECK(!entry->doomed);
-  DCHECK(!entry->writer);
   DCHECK(entry->disk_entry);
-  DCHECK(entry->readers.empty());
-  DCHECK(entry->pending_queue.empty());
+  DCHECK(entry->HasNoTransactions());
 
   std::string key = entry->disk_entry->GetKey();
   if (key.empty())
@@ -853,7 +853,7 @@
     }
   } else {
     // transaction needs read access to the entry
-    entry->readers.push_back(trans);
+    entry->readers.insert(trans);
   }
 
   // We do this before calling EntryAvailable to force any further calls to
@@ -922,7 +922,7 @@
 void HttpCache::DoneReadingFromEntry(ActiveEntry* entry, Transaction* trans) {
   DCHECK(!entry->writer);
 
-  auto it = std::find(entry->readers.begin(), entry->readers.end(), trans);
+  auto it = entry->readers.find(trans);
   DCHECK(it != entry->readers.end());
 
   entry->readers.erase(it);
@@ -938,7 +938,7 @@
   Transaction* trans = entry->writer;
 
   entry->writer = NULL;
-  entry->readers.push_back(trans);
+  entry->readers.insert(trans);
 
   ProcessPendingQueue(entry);
 }
@@ -1037,12 +1037,14 @@
   DCHECK(!entry->writer);
 
   // If no one is interested in this entry, then we can deactivate it.
-  if (entry->pending_queue.empty()) {
-    if (entry->readers.empty())
-      DestroyEntry(entry);
+  if (entry->HasNoTransactions()) {
+    DestroyEntry(entry);
     return;
   }
 
+  if (entry->pending_queue.empty())
+    return;
+
   // Promote next transaction from the pending queue.
   Transaction* next = entry->pending_queue.front();
   if ((next->mode() & Transaction::WRITE) && !entry->readers.empty())

diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 4835e88b..635cb92d 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h

@@ -244,7 +244,8 @@
   friend class ViewCacheHelper;
   struct PendingOp;  // Info for an entry under construction.
 
-  typedef std::list<Transaction*> TransactionList;
+  using TransactionList = std::list<Transaction*>;
+  using TransactionSet = std::unordered_set<Transaction*>;
   typedef std::list<std::unique_ptr<WorkItem>> WorkItemList;
 
   struct ActiveEntry {
@@ -252,9 +253,12 @@
     ~ActiveEntry();
     size_t EstimateMemoryUsage() const;
 
+    // Returns true if no transactions are associated with this entry.
+    bool HasNoTransactions();
+
     disk_cache::Entry* disk_entry;
     Transaction*       writer;
-    TransactionList    readers;
+    TransactionSet readers;
     TransactionList    pending_queue;
     bool               will_process_pending_queue;
     bool               doomed;

diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc
index ef2c616..16f160c 100644
--- a/net/log/file_net_log_observer.cc
+++ b/net/log/file_net_log_observer.cc

@@ -216,9 +216,50 @@
   DISALLOW_COPY_AND_ASSIGN(UnboundedFileWriter);
 };
 
-FileNetLogObserver::FileNetLogObserver(
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
-    : file_task_runner_(file_task_runner) {}
+std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateBounded(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    const base::FilePath& directory,
+    size_t max_total_size,
+    size_t total_num_files,
+    std::unique_ptr<base::Value> constants) {
+  DCHECK_GT(total_num_files, 0u);
+  // The BoundedFileWriter uses a soft limit to write events to file that allows
+  // the size of the file to exceed the limit, but the WriteQueue uses a hard
+  // limit which the size of |WriteQueue::queue_| cannot exceed. Thus, the
+  // BoundedFileWriter may write more events to file than can be contained by
+  // the WriteQueue if they have the same size limit. The maximum size of the
+  // WriteQueue is doubled to allow |WriteQueue::queue_| to hold enough events
+  // for the BoundedFileWriter to fill all files. As long as all events have
+  // sizes <= the size of an individual event file, the discrepancy between the
+  // hard limit and the soft limit will not cause an issue.
+  // TODO(dconnol): Handle the case when the WriteQueue  still doesn't
+  // contain enough events to fill all files, because of very large events
+  // relative to file size.
+  std::unique_ptr<FileWriter> file_writer(
+      new BoundedFileWriter(directory, max_total_size / total_num_files,
+                            total_num_files, file_task_runner));
+
+  scoped_refptr<WriteQueue> write_queue(new WriteQueue(max_total_size * 2));
+
+  return std::unique_ptr<FileNetLogObserver>(
+      new FileNetLogObserver(file_task_runner, std::move(file_writer),
+                             std::move(write_queue), std::move(constants)));
+}
+
+std::unique_ptr<FileNetLogObserver> FileNetLogObserver::CreateUnbounded(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    const base::FilePath& log_path,
+    std::unique_ptr<base::Value> constants) {
+  std::unique_ptr<FileWriter> file_writer(
+      new UnboundedFileWriter(log_path, file_task_runner));
+
+  scoped_refptr<WriteQueue> write_queue(
+      new WriteQueue(std::numeric_limits<size_t>::max()));
+
+  return std::unique_ptr<FileNetLogObserver>(
+      new FileNetLogObserver(file_task_runner, std::move(file_writer),
+                             std::move(write_queue), std::move(constants)));
+}
 
 FileNetLogObserver::~FileNetLogObserver() {
   if (net_log()) {
@@ -228,75 +269,11 @@
                               base::Unretained(file_writer_)));
     net_log()->DeprecatedRemoveObserver(this);
   }
-
   file_task_runner_->DeleteSoon(FROM_HERE, file_writer_);
 }
 
-void FileNetLogObserver::StartObservingBounded(
-    NetLog* net_log,
-    NetLogCaptureMode capture_mode,
-    const base::FilePath& directory,
-    std::unique_ptr<base::Value> constants,
-    URLRequestContext* url_request_context,
-    size_t max_total_size,
-    size_t total_num_files) {
-  DCHECK_GT(total_num_files, 0u);
-
-  file_writer_ =
-      new BoundedFileWriter(directory, max_total_size / total_num_files,
-                            total_num_files, file_task_runner_);
-
-  // The |file_writer_| uses a soft limit to write events to file that allows
-  // the size of the file to exceed the limit, but the |write_queue_| uses a
-  // hard limit which the size of the |queue_| cannot exceed. Thus, the
-  // |file_writer_| may write more events to file than can be contained by the
-  // |write_queue_| if they have the same size limit. The maximum size of the
-  // |write_queue_| is doubled to allow the |queue_| to hold enough events for
-  // the |file_writer_| to fill all files. As long as all events have sizes <=
-  // the size of an individual event file, the discrepancy between the hard
-  // limit and the soft limit will not cause an issue.
-  // TODO(dconnol): Handle the case when the |write_queue_| still doesn't
-  // contain enough events to fill all files, because of very large events
-  // relative to file size.
-  write_queue_ = new WriteQueue(max_total_size * 2);
-
-  StartObservingHelper(net_log, capture_mode, std::move(constants),
-                       url_request_context);
-}
-
-void FileNetLogObserver::StartObservingUnbounded(
-    NetLog* net_log,
-    NetLogCaptureMode capture_mode,
-    const base::FilePath& filepath,
-    std::unique_ptr<base::Value> constants,
-    URLRequestContext* url_request_context) {
-  file_writer_ = new UnboundedFileWriter(filepath, file_task_runner_);
-
-  write_queue_ = new WriteQueue(std::numeric_limits<size_t>::max());
-
-  StartObservingHelper(net_log, capture_mode, std::move(constants),
-                       url_request_context);
-}
-
-void FileNetLogObserver::StartObservingHelper(
-    NetLog* net_log,
-    NetLogCaptureMode capture_mode,
-    std::unique_ptr<base::Value> constants,
-    URLRequestContext* url_request_context) {
-  if (!constants)
-    constants = GetNetConstants();
-  file_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&FileNetLogObserver::FileWriter::Initialize,
-                 base::Unretained(file_writer_), base::Passed(&constants)));
-
-  if (url_request_context) {
-    DCHECK(url_request_context->CalledOnValidThread());
-    std::set<URLRequestContext*> contexts;
-    contexts.insert(url_request_context);
-    CreateNetLogEntriesForActiveObjects(contexts, this);
-  }
-
+void FileNetLogObserver::StartObserving(NetLog* net_log,
+                                        NetLogCaptureMode capture_mode) {
   net_log->DeprecatedAddObserver(this, capture_mode);
 }
 
@@ -331,6 +308,22 @@
   }
 }
 
+FileNetLogObserver::FileNetLogObserver(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+    std::unique_ptr<FileWriter> file_writer,
+    scoped_refptr<WriteQueue> write_queue,
+    std::unique_ptr<base::Value> constants)
+    : file_task_runner_(std::move(file_task_runner)),
+      write_queue_(std::move(write_queue)),
+      file_writer_(file_writer.release()) {
+  if (!constants)
+    constants = GetNetConstants();
+  file_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&FileNetLogObserver::FileWriter::Initialize,
+                 base::Unretained(file_writer_), base::Passed(&constants)));
+}
+
 FileNetLogObserver::WriteQueue::WriteQueue(size_t memory_max)
     : memory_(0), memory_max_(memory_max) {}
 

diff --git a/net/log/file_net_log_observer.h b/net/log/file_net_log_observer.h
index b7c8a2f..2b2b3a8 100644
--- a/net/log/file_net_log_observer.h
+++ b/net/log/file_net_log_observer.h

@@ -21,7 +21,6 @@
 namespace net {
 
 class NetLogCaptureMode;
-class URLRequestContext;
 
 // FileNetLogObserver watches the NetLog event stream and sends all entries to
 // either a group of files in a directory (bounded mode) or to a single file
@@ -42,23 +41,18 @@
 // The entire JSON object is put into one file. There is no size limit to how
 // large this file can grow; all events added will be written to the file.
 //
-// The consumer must call StartObservingBounded/StartObservingUnbounded before
-// calling StopObserving, and must call each method exactly once in the lifetime
-// of the observer. StartObservingBounded/StartObservingUnbounded and
-// StopObserving must be called on the same thread, but there is no restriction
-// on which thread is used.
+// The consumer must call StartObserving before calling StopObserving, and must
+// call each method exactly once in the lifetime of the observer. StartObserving
+// and StopObserving must be called on the same thread, but there is no
+// restriction on which thread is used.
 class NET_EXPORT FileNetLogObserver : public NetLog::ThreadSafeObserver {
  public:
+  // Creates a FileNetLogObserver in bounded mode.
+  //
   // |file_task_runner| indicates the task runner that should be used to post
   // tasks from the main thread to the file thread.
-  explicit FileNetLogObserver(
-      scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
-
-  ~FileNetLogObserver() override;
-
-  // Starts observing |net_log| in bounded mode and writes output files to
-  // |directory|.
-  // May only be called once in the lifetime of the object.
+  //
+  // |directory| is the directory where the log files will be.
   //
   // |max_total_size| is the approximate limit on the cumulative size of all
   // netlog files.
@@ -69,48 +63,44 @@
   // |constants| is an optional legend for decoding constant values used in
   // the log. It should generally be a modified version of GetNetConstants().
   // If not present, the output of GetNetConstants() will be used.
-  //
-  // |url_request_context| is an optional URLRequestContext that will be used
-  // to pre-populate the log with information about in-progress events. If the
-  // context is non-NULL, StartObservingBounded() must be called on the
-  // context's thread.
-  void StartObservingBounded(NetLog* net_log,
-                             NetLogCaptureMode capture_mode,
-                             const base::FilePath& directory,
-                             std::unique_ptr<base::Value> constants,
-                             URLRequestContext* url_request_context,
-                             size_t max_total_size,
-                             size_t total_num_files);
+  static std::unique_ptr<FileNetLogObserver> CreateBounded(
+      scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+      const base::FilePath& directory,
+      size_t max_total_size,
+      size_t total_num_files,
+      std::unique_ptr<base::Value> constants);
 
-  // Starts observing |net_log| in unbounded mode and writes to the file at
-  // |filepath|.
-  // May only be called once in the lifetime of the object.
+  // Creates a FileNetLogObserver in unbounded mode.
+  //
+  // |file_task_runner| indicates the task runner that should be used to post
+  // tasks from the main thread to the file thread.
+  //
+  // |log_path| is where the log file will be.
   //
   // |constants| is an optional legend for decoding constant values used in
   // the log. It should generally be a modified version of GetNetConstants().
   // If not present, the output of GetNetConstants() will be used.
-  //
-  // |url_request_context| is an optional URLRequestContext that will be used
-  // to pre-populate the log with information about in-progress events. If the
-  // context is non-NULL, StartObservingUnbounded() must be called on
-  // the context's thread.
-  void StartObservingUnbounded(NetLog* net_log,
-                               NetLogCaptureMode capture_mode,
-                               const base::FilePath& filepath,
-                               std::unique_ptr<base::Value> constants,
-                               URLRequestContext* url_request_context);
+  static std::unique_ptr<FileNetLogObserver> CreateUnbounded(
+      scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+      const base::FilePath& log_path,
+      std::unique_ptr<base::Value> constants);
 
-  // Stops observing net_log(). Must be called after StartObservingBounded/
-  // StartObservingUnbounded. Should be called before destruction of the
+  ~FileNetLogObserver() override;
+
+  // Attaches this observer to |net_log| and begins observing events.
+  void StartObserving(NetLog* net_log, NetLogCaptureMode capture_mode);
+
+  // Stops observing net_log() and closes the output file(s). Must be called
+  // after StartObserving. Should be called before destruction of the
   // FileNetLogObserver and the NetLog, or the NetLog files will be deleted when
   // the observer is destroyed.
   //
+  // |polled_data| is an optional argument used to add additional network stack
+  // state to the log.
+  //
   // |callback| will be run on whichever thread StopObserving() was called on
   // once all file writing is complete and the netlog files can be accessed
   // safely.
-  //
-  // |polled_data| is an optional argument used to add additional network stack
-  // state to the log.
   void StopObserving(std::unique_ptr<base::Value> polled_data,
                      const base::Closure& callback);
 
@@ -123,12 +113,11 @@
   class BoundedFileWriter;
   class UnboundedFileWriter;
 
-  // Performs tasks common to both StartObservingBounded() and
-  // StartObservingUnbounded().
-  void StartObservingHelper(NetLog* net_log,
-                            NetLogCaptureMode capture_mode,
-                            std::unique_ptr<base::Value> constants,
-                            URLRequestContext* url_request_context);
+  FileNetLogObserver(
+      scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
+      std::unique_ptr<FileWriter> file_writer,
+      scoped_refptr<WriteQueue> write_queue,
+      std::unique_ptr<base::Value> constants);
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
 

diff --git a/net/log/file_net_log_observer_unittest.cc b/net/log/file_net_log_observer_unittest.cc
index a330e48..66c61c1 100644
--- a/net/log/file_net_log_observer_unittest.cc
+++ b/net/log/file_net_log_observer_unittest.cc

@@ -162,22 +162,21 @@
     file_thread_->StartWithOptions(
         base::Thread::Options(base::MessageLoop::TYPE_DEFAULT, 0));
     ASSERT_TRUE(file_thread_->WaitUntilThreadStarted());
-    logger_.reset(new FileNetLogObserver(file_thread_->task_runner()));
   }
 
-  void StartObserving(std::unique_ptr<base::Value> constants,
-                      URLRequestContext* url_request_context) {
+  void CreateAndStartObserving(std::unique_ptr<base::Value> constants) {
     bool bounded = GetParam();
     if (bounded) {
-      logger_->StartObservingBounded(&net_log_, NetLogCaptureMode::Default(),
-                                     bounded_log_dir_, std::move(constants),
-                                     url_request_context, kLargeFileSize,
-                                     kTotalNumFiles);
+      logger_ = FileNetLogObserver::CreateBounded(
+          file_thread_->task_runner(), bounded_log_dir_, kLargeFileSize,
+          kTotalNumFiles, std::move(constants));
     } else {
-      logger_->StartObservingUnbounded(
-          &net_log_, NetLogCaptureMode::Default(), unbounded_log_path_,
-          std::move(constants), url_request_context);
+      logger_ = FileNetLogObserver::CreateUnbounded(file_thread_->task_runner(),
+                                                    unbounded_log_path_,
+                                                    std::move(constants));
     }
+
+    logger_->StartObserving(&net_log_, NetLogCaptureMode::Default());
   }
 
   ::testing::AssertionResult ReadNetLogFromDisk(
@@ -231,16 +230,15 @@
     file_thread_->StartWithOptions(
         base::Thread::Options(base::MessageLoop::TYPE_DEFAULT, 0));
     ASSERT_TRUE(file_thread_->WaitUntilThreadStarted());
-    logger_.reset(new FileNetLogObserver(file_thread_->task_runner()));
   }
 
-  void StartObserving(std::unique_ptr<base::Value> constants,
-                      URLRequestContext* url_request_context,
-                      int total_file_size,
-                      int num_files) {
-    logger_->StartObservingBounded(
-        &net_log_, NetLogCaptureMode::Default(), bounded_log_dir_,
-        std::move(constants), url_request_context, total_file_size, num_files);
+  void CreateAndStartObserving(std::unique_ptr<base::Value> constants,
+                               int total_file_size,
+                               int num_files) {
+    logger_ = FileNetLogObserver::CreateBounded(
+        file_thread_->task_runner(), bounded_log_dir_, total_file_size,
+        num_files, std::move(constants));
+    logger_->StartObserving(&net_log_, NetLogCaptureMode::Default());
   }
 
   ::testing::AssertionResult ReadNetLogFromDisk(
@@ -278,7 +276,7 @@
                         ::testing::Values(true, false));
 
 TEST_P(FileNetLogObserverTest, ObserverDestroyedWithoutStopObserving) {
-  StartObserving(nullptr, nullptr);
+  CreateAndStartObserving(nullptr);
 
   // Send dummy event
   AddEntries(logger_.get(), 1, kDummyEventSize);
@@ -292,7 +290,7 @@
 TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithNoEvents) {
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr);
+  CreateAndStartObserving(nullptr);
 
   logger_->StopObserving(nullptr, closure.closure());
 
@@ -315,7 +313,7 @@
 TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithOneEvent) {
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr);
+  CreateAndStartObserving(nullptr);
 
   // Send dummy event.
   AddEntries(logger_.get(), 1, kDummyEventSize);
@@ -339,7 +337,7 @@
   std::unique_ptr<base::Value> constants(
       new base::StringValue(kConstantString));
 
-  StartObserving(std::move(constants), nullptr);
+  CreateAndStartObserving(std::move(constants));
 
   logger_->StopObserving(nullptr, closure.closure());
 
@@ -360,7 +358,7 @@
 TEST_P(FileNetLogObserverTest, GeneratesValidJSONWithPolledData) {
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr);
+  CreateAndStartObserving(nullptr);
 
   // Create dummy polled data
   const char kDummyPolledDataPath[] = "dummy_path";
@@ -390,43 +388,6 @@
   ASSERT_EQ(dummy_string, kDummyPolledDataString);
 }
 
-TEST_P(FileNetLogObserverTest,
-       GeneratesValidJSONWithPolledDataWithActiveRequest) {
-  TestClosure closure;
-
-  // Create context, start a request.
-  TestURLRequestContext context(true);
-  context.set_net_log(&net_log_);
-  context.Init();
-  TestDelegate delegate;
-  delegate.set_quit_on_complete(false);
-
-  // URL doesn't matter.  Requests can't fail synchronously.
-  std::unique_ptr<URLRequest> request(
-      context.CreateRequest(GURL("blah:blah"), IDLE, &delegate));
-  request->Start();
-
-  StartObserving(nullptr, &context);
-
-  logger_->StopObserving(net::GetNetInfo(&context, NET_INFO_ALL_SOURCES),
-                         closure.closure());
-
-  closure.WaitForResult();
-
-  std::unique_ptr<base::Value> root;
-  base::ListValue* events;
-  ASSERT_TRUE(ReadNetLogFromDisk(&root, &events));
-
-  // Check that 1 event was written
-  ASSERT_EQ(1u, events->GetSize());
-
-  // Make sure additional information is present, but don't validate it.
-  base::DictionaryValue* dict;
-  ASSERT_TRUE(root->GetAsDictionary(&dict));
-  base::DictionaryValue* polled_data;
-  ASSERT_TRUE(dict->GetDictionary("polledData", &polled_data));
-}
-
 // Adds events concurrently from several different threads. The exact order of
 // events seen by this test is non-deterministic.
 TEST_P(FileNetLogObserverTest, AddEventsFromMultipleThreads) {
@@ -441,7 +402,7 @@
     threads[i]->WaitUntilThreadStarted();
   }
 
-  StartObserving(nullptr, nullptr);
+  CreateAndStartObserving(nullptr);
 
   const size_t kNumEventsAddedPerThread = 200;
 
@@ -477,7 +438,7 @@
   const int kEventSize = 250;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
   logger_->StopObserving(nullptr, closure.closure());
@@ -524,7 +485,7 @@
   const int kEventSize = 200;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 
@@ -565,7 +526,7 @@
   const int kEventSize = 200;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 
@@ -617,7 +578,7 @@
   const int kNumEvents = kTotalNumFiles * ((kFileSize - 1) / kEventSize + 1);
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 
@@ -663,7 +624,7 @@
   const int kFileSize = kTotalFileSize / kTotalNumFiles;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 
@@ -714,7 +675,7 @@
   const int kFileSize = kTotalFileSize / kTotalNumFiles;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 
@@ -786,7 +747,7 @@
   const int kFileSize = kTotalFileSize / kTotalNumFiles;
   TestClosure closure;
 
-  StartObserving(nullptr, nullptr, kTotalFileSize, kTotalNumFiles);
+  CreateAndStartObserving(nullptr, kTotalFileSize, kTotalNumFiles);
 
   AddEntries(logger_.get(), kNumEvents, kEventSize);
 

diff --git a/net/quic/core/congestion_control/cubic_bytes_test.cc b/net/quic/core/congestion_control/cubic_bytes_test.cc
index e64865b..cd703bc 100644
--- a/net/quic/core/congestion_control/cubic_bytes_test.cc
+++ b/net/quic/core/congestion_control/cubic_bytes_test.cc

@@ -7,11 +7,15 @@
 #include <cstdint>
 
 #include "net/quic/core/quic_flags.h"
+#include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 namespace test {
+namespace {
 
 const float kBeta = 0.7f;          // Default Cubic backoff factor.
 const float kBetaLastMax = 0.85f;  // Default Cubic backoff factor.
@@ -22,17 +26,70 @@
 const float kNConnectionAlpha = 3 * kNumConnections * kNumConnections *
                                 (1 - kNConnectionBeta) / (1 + kNConnectionBeta);
 
-class CubicBytesTest : public ::testing::Test {
+struct TestParams {
+  TestParams(bool fix_convex_mode,
+             bool fix_cubic_quantization,
+             bool fix_beta_last_max)
+      : fix_convex_mode(fix_convex_mode),
+        fix_cubic_quantization(fix_cubic_quantization),
+        fix_beta_last_max(fix_beta_last_max) {}
+
+  friend std::ostream& operator<<(std::ostream& os, const TestParams& p) {
+    os << "{ fix_convex_mode: " << p.fix_convex_mode
+       << "  fix_cubic_quantization: " << p.fix_cubic_quantization
+       << "  fix_beta_last_max: " << p.fix_beta_last_max;
+    os << " }";
+    return os;
+  }
+
+  bool fix_convex_mode;
+  bool fix_cubic_quantization;
+  bool fix_beta_last_max;
+};
+
+string TestParamToString(const testing::TestParamInfo<TestParams>& params) {
+  return QuicStrCat("convex_mode_", params.param.fix_convex_mode, "_",
+                    "cubic_quantization_", params.param.fix_cubic_quantization,
+                    "_", "beta_last_max_", params.param.fix_beta_last_max);
+}
+
+std::vector<TestParams> GetTestParams() {
+  std::vector<TestParams> params;
+  for (bool fix_convex_mode : {true, false}) {
+    for (bool fix_cubic_quantization : {true, false}) {
+      for (bool fix_beta_last_max : {true, false}) {
+        if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
+            fix_convex_mode) {
+          continue;
+        }
+        if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization &&
+            fix_cubic_quantization) {
+          continue;
+        }
+        if (!FLAGS_quic_reloadable_flag_quic_fix_beta_last_max &&
+            fix_beta_last_max) {
+          continue;
+        }
+        TestParams param(fix_convex_mode, fix_cubic_quantization,
+                         fix_beta_last_max);
+        params.push_back(param);
+      }
+    }
+  }
+  return params;
+}
+
+}  // namespace
+
+class CubicBytesTest : public ::testing::TestWithParam<TestParams> {
  protected:
   CubicBytesTest()
       : one_ms_(QuicTime::Delta::FromMilliseconds(1)),
         hundred_ms_(QuicTime::Delta::FromMilliseconds(100)),
         cubic_(&clock_) {
-    cubic_.SetFixConvexMode(
-        FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode);
-    cubic_.SetFixCubicQuantization(
-        FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization);
-    cubic_.SetFixBetaLastMax(FLAGS_quic_reloadable_flag_quic_fix_beta_last_max);
+    cubic_.SetFixConvexMode(GetParam().fix_convex_mode);
+    cubic_.SetFixCubicQuantization(GetParam().fix_cubic_quantization);
+    cubic_.SetFixBetaLastMax(GetParam().fix_beta_last_max);
   }
 
   QuicByteCount RenoCwndInBytes(QuicByteCount current_cwnd) {
@@ -53,7 +110,7 @@
     const int64_t offset =
         ((elapsed_time + rtt).ToMicroseconds() << 10) / 1000000;
     const QuicByteCount delta_congestion_window =
-        FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization
+        GetParam().fix_cubic_quantization
             ? ((410 * offset * offset * offset) * kDefaultTCPMSS >> 40)
             : ((410 * offset * offset * offset) >> 40) * kDefaultTCPMSS;
     const QuicByteCount cubic_cwnd = initial_cwnd + delta_congestion_window;
@@ -70,12 +127,17 @@
   CubicBytes cubic_;
 };
 
+INSTANTIATE_TEST_CASE_P(CubicBytesTests,
+                        CubicBytesTest,
+                        ::testing::ValuesIn(GetTestParams()),
+                        TestParamToString);
+
 // TODO(jokulik): The original "AboveOrigin" test, below, is very
 // loose.  It's nearly impossible to make the test tighter without
 // deploying the fix for convex mode.  Once cubic convex is deployed,
 // replace "AboveOrigin" with this test.
-TEST_F(CubicBytesTest, AboveOriginWithTighterBounds) {
-  if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode) {
+TEST_P(CubicBytesTest, AboveOriginWithTighterBounds) {
+  if (!GetParam().fix_convex_mode) {
     // Without convex mode fixed, the behavior of the algorithm is so
     // far from expected, there's no point in doing a tighter test.
     return;
@@ -98,7 +160,7 @@
   // The maximum number of expected Reno RTTs is calculated by
   // finding the point where the cubic curve and the reno curve meet.
   const int max_reno_rtts =
-      FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization
+      GetParam().fix_cubic_quantization
           ? std::sqrt(kNConnectionAlpha /
                       (.4 * rtt_min_s * rtt_min_s * rtt_min_s)) -
                 2
@@ -130,7 +192,7 @@
     clock_.AdvanceTime(hundred_ms_);
   }
 
-  if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization) {
+  if (!GetParam().fix_cubic_quantization) {
     // Because our byte-wise Reno under-estimates the cwnd, we switch to
     // conservative increases for a few acks before switching to true
     // cubic increases.
@@ -166,9 +228,8 @@
   ASSERT_EQ(expected_cwnd, current_cwnd);
 }
 
-TEST_F(CubicBytesTest, AboveOrigin) {
-  if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
-      FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization) {
+TEST_P(CubicBytesTest, AboveOrigin) {
+  if (!GetParam().fix_convex_mode && GetParam().fix_cubic_quantization) {
     // Without convex mode fixed, the behavior of the algorithm does
     // not fit the exact pattern of this test.
     // TODO(jokulik): Once the convex mode fix becomes default, this
@@ -181,10 +242,9 @@
   QuicByteCount current_cwnd = 10 * kDefaultTCPMSS;
   // Without the signed-integer, cubic-convex fix, we start out in the
   // wrong mode.
-  QuicPacketCount expected_cwnd =
-      FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode
-          ? RenoCwndInBytes(current_cwnd)
-          : ConservativeCwndInBytes(current_cwnd);
+  QuicPacketCount expected_cwnd = GetParam().fix_convex_mode
+                                      ? RenoCwndInBytes(current_cwnd)
+                                      : ConservativeCwndInBytes(current_cwnd);
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   ASSERT_EQ(expected_cwnd,
@@ -205,7 +265,7 @@
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(
         kDefaultTCPMSS, current_cwnd, rtt_min, clock_.ApproximateNow());
-    if (FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode) {
+    if (GetParam().fix_convex_mode) {
       // When we fix convex mode and the uint64 arithmetic, we
       // increase the expected_cwnd only after after the first 100ms,
       // rather than after the initial 1ms.
@@ -236,7 +296,7 @@
       initial_cwnd / kDefaultTCPMSS +
       (elapsed_time_s * elapsed_time_s * elapsed_time_s * 410) / 1024;
   // Without the convex mode fix, the result is off by one.
-  if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode) {
+  if (!GetParam().fix_convex_mode) {
     ++expected_cwnd;
   }
   EXPECT_EQ(expected_cwnd, current_cwnd / kDefaultTCPMSS);
@@ -251,9 +311,8 @@
 //
 // - Sets an artificially large initial cwnd to prevent Reno from the
 // convex increases on every ack.
-TEST_F(CubicBytesTest, AboveOriginFineGrainedCubing) {
-  if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode ||
-      !FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization) {
+TEST_P(CubicBytesTest, AboveOriginFineGrainedCubing) {
+  if (!GetParam().fix_convex_mode || !GetParam().fix_cubic_quantization) {
     // Without these two fixes, this test cannot pass.
     return;
   }
@@ -293,15 +352,14 @@
   }
 }
 
-TEST_F(CubicBytesTest, LossEvents) {
+TEST_P(CubicBytesTest, LossEvents) {
   const QuicTime::Delta rtt_min = hundred_ms_;
   QuicByteCount current_cwnd = 422 * kDefaultTCPMSS;
   // Without the signed-integer, cubic-convex fix, we mistakenly
   // increment cwnd after only one_ms_ and a single ack.
-  QuicPacketCount expected_cwnd =
-      FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode
-          ? RenoCwndInBytes(current_cwnd)
-          : current_cwnd + kDefaultTCPMSS / 2;
+  QuicPacketCount expected_cwnd = GetParam().fix_convex_mode
+                                      ? RenoCwndInBytes(current_cwnd)
+                                      : current_cwnd + kDefaultTCPMSS / 2;
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   EXPECT_EQ(expected_cwnd,
@@ -329,11 +387,11 @@
   current_cwnd = expected_cwnd;
   EXPECT_GT(pre_loss_cwnd, LastMaxCongestionWindow());
   QuicByteCount expected_last_max =
-      FLAGS_quic_reloadable_flag_quic_fix_beta_last_max
+      GetParam().fix_beta_last_max
           ? static_cast<QuicByteCount>(pre_loss_cwnd * kNConnectionBetaLastMax)
           : static_cast<QuicByteCount>(pre_loss_cwnd * kBetaLastMax);
   EXPECT_EQ(expected_last_max, LastMaxCongestionWindow());
-  if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max) {
+  if (GetParam().fix_beta_last_max) {
     EXPECT_LT(expected_cwnd, LastMaxCongestionWindow());
   } else {
     // If we don't scale kLastBetaMax, the current window is exactly
@@ -344,7 +402,7 @@
   // Simulate an increase, and check that we are below the origin.
   current_cwnd = cubic_.CongestionWindowAfterAck(
       kDefaultTCPMSS, current_cwnd, rtt_min, clock_.ApproximateNow());
-  if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max) {
+  if (GetParam().fix_beta_last_max) {
     EXPECT_GT(LastMaxCongestionWindow(), current_cwnd);
   } else {
     // Without the bug fix, we will be at or above the origin.
@@ -359,22 +417,21 @@
   EXPECT_EQ(expected_cwnd,
             cubic_.CongestionWindowAfterPacketLoss(current_cwnd));
   expected_last_max =
-      FLAGS_quic_reloadable_flag_quic_fix_beta_last_max
+      GetParam().fix_beta_last_max
           ? pre_loss_cwnd
           : static_cast<QuicByteCount>(pre_loss_cwnd * kBetaLastMax);
   ASSERT_EQ(expected_last_max, LastMaxCongestionWindow());
 }
 
-TEST_F(CubicBytesTest, BelowOrigin) {
+TEST_P(CubicBytesTest, BelowOrigin) {
   // Concave growth.
   const QuicTime::Delta rtt_min = hundred_ms_;
   QuicByteCount current_cwnd = 422 * kDefaultTCPMSS;
   // Without the signed-integer, cubic-convex fix, we mistakenly
   // increment cwnd after only one_ms_ and a single ack.
-  QuicPacketCount expected_cwnd =
-      FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode
-          ? RenoCwndInBytes(current_cwnd)
-          : current_cwnd + kDefaultTCPMSS / 2;
+  QuicPacketCount expected_cwnd = GetParam().fix_convex_mode
+                                      ? RenoCwndInBytes(current_cwnd)
+                                      : current_cwnd + kDefaultTCPMSS / 2;
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   EXPECT_EQ(expected_cwnd,

diff --git a/net/quic/core/congestion_control/cubic_test.cc b/net/quic/core/congestion_control/cubic_test.cc
index f9d8aee9..4aeb32271 100644
--- a/net/quic/core/congestion_control/cubic_test.cc
+++ b/net/quic/core/congestion_control/cubic_test.cc

@@ -7,11 +7,15 @@
 #include <cstdint>
 
 #include "net/quic/core/quic_flags.h"
+#include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using std::string;
+
 namespace net {
 namespace test {
+namespace {
 
 const float kBeta = 0.7f;          // Default Cubic backoff factor.
 const float kBetaLastMax = 0.85f;  // Default Cubic backoff factor.
@@ -22,17 +26,58 @@
 const float kNConnectionAlpha = 3 * kNumConnections * kNumConnections *
                                 (1 - kNConnectionBeta) / (1 + kNConnectionBeta);
 
+struct TestParams {
+  TestParams(bool fix_convex_mode, bool fix_beta_last_max)
+      : fix_convex_mode(fix_convex_mode),
+        fix_beta_last_max(fix_beta_last_max) {}
+
+  friend std::ostream& operator<<(std::ostream& os, const TestParams& p) {
+    os << "{ fix_convex_mode: " << p.fix_convex_mode
+       << "  fix_beta_last_max: " << p.fix_beta_last_max;
+    os << " }";
+    return os;
+  }
+
+  bool fix_convex_mode;
+  bool fix_beta_last_max;
+};
+
+string TestParamToString(const testing::TestParamInfo<TestParams>& params) {
+  return QuicStrCat("convex_mode_", params.param.fix_convex_mode, "_",
+                    "beta_last_max_", params.param.fix_beta_last_max);
+}
+
+std::vector<TestParams> GetTestParams() {
+  std::vector<TestParams> params;
+  for (bool fix_convex_mode : {true, false}) {
+    for (bool fix_beta_last_max : {true, false}) {
+      if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
+          fix_convex_mode) {
+        continue;
+      }
+      if (!FLAGS_quic_reloadable_flag_quic_fix_beta_last_max &&
+          fix_beta_last_max) {
+        continue;
+      }
+      TestParams param(fix_convex_mode, fix_beta_last_max);
+      params.push_back(param);
+    }
+  }
+  return params;
+}
+
+}  // namespace
+
 // TODO(jokulik): Once we've rolled out the cubic convex fix, we will
 // no longer need a parameterized test.
-class CubicTest : public ::testing::TestWithParam<bool> {
+class CubicTest : public ::testing::TestWithParam<TestParams> {
  protected:
   CubicTest()
       : one_ms_(QuicTime::Delta::FromMilliseconds(1)),
         hundred_ms_(QuicTime::Delta::FromMilliseconds(100)),
         cubic_(&clock_) {
-    fix_convex_mode_ = GetParam();
-    cubic_.SetFixConvexMode(fix_convex_mode_);
-    cubic_.SetFixBetaLastMax(FLAGS_quic_reloadable_flag_quic_fix_beta_last_max);
+    cubic_.SetFixConvexMode(GetParam().fix_convex_mode);
+    cubic_.SetFixBetaLastMax(GetParam().fix_beta_last_max);
   }
 
   QuicByteCount LastMaxCongestionWindow() {
@@ -43,10 +88,12 @@
   const QuicTime::Delta hundred_ms_;
   MockClock clock_;
   Cubic cubic_;
-  bool fix_convex_mode_;
 };
 
-INSTANTIATE_TEST_CASE_P(CubicTests, CubicTest, testing::Bool());
+INSTANTIATE_TEST_CASE_P(CubicTests,
+                        CubicTest,
+                        ::testing::ValuesIn(GetTestParams()),
+                        TestParamToString);
 
 TEST_P(CubicTest, AboveOrigin) {
   // Convex growth.
@@ -56,7 +103,7 @@
   // Without the signed-integer, cubic-convex fix, we mistakenly
   // increment cwnd after only one_ms_ and a single ack.
   QuicPacketCount expected_cwnd =
-      fix_convex_mode_ ? current_cwnd : current_cwnd + 1;
+      GetParam().fix_convex_mode ? current_cwnd : current_cwnd + 1;
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   const QuicTime initial_time = clock_.ApproximateNow();
@@ -81,7 +128,7 @@
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min,
                                                    clock_.ApproximateNow());
-    if (fix_convex_mode_) {
+    if (GetParam().fix_convex_mode) {
       // When we fix convex mode and the uint64 arithmetic, we
       // increase the expected_cwnd only after after the first 100ms,
       // rather than after the initial 1ms.
@@ -122,7 +169,7 @@
   // Without the signed-integer, cubic-convex fix, we mistakenly
   // increment cwnd after only one_ms_ and a single ack.
   QuicPacketCount expected_cwnd =
-      fix_convex_mode_ ? current_cwnd : current_cwnd + 1;
+      GetParam().fix_convex_mode ? current_cwnd : current_cwnd + 1;
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   EXPECT_EQ(expected_cwnd, cubic_.CongestionWindowAfterAck(
@@ -149,12 +196,12 @@
   current_cwnd = expected_cwnd;
   EXPECT_GT(pre_loss_cwnd, LastMaxCongestionWindow());
   QuicByteCount expected_last_max =
-      FLAGS_quic_reloadable_flag_quic_fix_beta_last_max
+      GetParam().fix_beta_last_max
           ? static_cast<QuicPacketCount>(pre_loss_cwnd *
                                          kNConnectionBetaLastMax)
           : static_cast<QuicPacketCount>(pre_loss_cwnd * kBetaLastMax);
   EXPECT_EQ(expected_last_max, LastMaxCongestionWindow());
-  if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max) {
+  if (GetParam().fix_beta_last_max) {
     EXPECT_LT(expected_cwnd, LastMaxCongestionWindow());
   } else {
     // If we don't scale kLastBetaMax, the current window is exactly
@@ -165,7 +212,7 @@
   // Simulate an increase, and check that we are below the origin.
   current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min,
                                                  clock_.ApproximateNow());
-  if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max) {
+  if (GetParam().fix_beta_last_max) {
     EXPECT_GT(LastMaxCongestionWindow(), current_cwnd);
   } else {
     // Without the bug fix, we will be at or above the origin.
@@ -189,7 +236,7 @@
   // Without the signed-integer, cubic-convex fix, we mistakenly
   // increment cwnd after only one_ms_ and a single ack.
   QuicPacketCount expected_cwnd =
-      fix_convex_mode_ ? current_cwnd : current_cwnd + 1;
+      GetParam().fix_convex_mode ? current_cwnd : current_cwnd + 1;
   // Initialize the state.
   clock_.AdvanceTime(one_ms_);
   EXPECT_EQ(expected_cwnd, cubic_.CongestionWindowAfterAck(

diff --git a/net/quic/core/congestion_control/send_algorithm_test.cc b/net/quic/core/congestion_control/send_algorithm_test.cc
index 5e882ea..8ee348b 100644
--- a/net/quic/core/congestion_control/send_algorithm_test.cc
+++ b/net/quic/core/congestion_control/send_algorithm_test.cc

@@ -11,6 +11,7 @@
 #include "net/quic/core/quic_types.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_logging.h"
+#include "net/quic/platform/api/quic_str_cat.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/quic_config_peer.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
@@ -116,21 +117,37 @@
 }
 
 struct TestParams {
-  explicit TestParams(CongestionControlType congestion_control_type)
-      : congestion_control_type(congestion_control_type) {}
+  explicit TestParams(CongestionControlType congestion_control_type,
+                      bool fix_convex_mode,
+                      bool fix_cubic_quantization,
+                      bool fix_beta_last_max)
+      : congestion_control_type(congestion_control_type),
+        fix_convex_mode(fix_convex_mode),
+        fix_cubic_quantization(fix_cubic_quantization),
+        fix_beta_last_max(fix_beta_last_max) {}
 
   friend std::ostream& operator<<(std::ostream& os, const TestParams& p) {
     os << "{ congestion_control_type: "
        << CongestionControlTypeToString(p.congestion_control_type);
+    os << "  fix_convex_mode: " << p.fix_convex_mode
+       << "  fix_cubic_quantization: " << p.fix_cubic_quantization
+       << "  fix_beta_last_max: " << p.fix_beta_last_max;
     os << " }";
     return os;
   }
 
   CongestionControlType congestion_control_type;
+  bool fix_convex_mode;
+  bool fix_cubic_quantization;
+  bool fix_beta_last_max;
 };
 
 string TestParamToString(const testing::TestParamInfo<TestParams>& params) {
-  return CongestionControlTypeToString(params.param.congestion_control_type);
+  return QuicStrCat(
+      CongestionControlTypeToString(params.param.congestion_control_type), "_",
+      "convex_mode_", params.param.fix_convex_mode, "_", "cubic_quantization_",
+      params.param.fix_cubic_quantization, "_", "beta_last_max_",
+      params.param.fix_beta_last_max);
 }
 
 // Constructs various test permutations.
@@ -138,7 +155,33 @@
   std::vector<TestParams> params;
   for (const CongestionControlType congestion_control_type :
        {kBBR, kCubic, kCubicBytes, kReno, kRenoBytes}) {
-    params.push_back(TestParams(congestion_control_type));
+    if (congestion_control_type != kCubic &&
+        congestion_control_type != kCubicBytes) {
+      params.push_back(
+          TestParams(congestion_control_type, false, false, false));
+      continue;
+    }
+    for (bool fix_convex_mode : {true, false}) {
+      for (bool fix_cubic_quantization : {true, false}) {
+        for (bool fix_beta_last_max : {true, false}) {
+          if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
+              fix_convex_mode) {
+            continue;
+          }
+          if (!FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization &&
+              fix_cubic_quantization) {
+            continue;
+          }
+          if (!FLAGS_quic_reloadable_flag_quic_fix_beta_last_max &&
+              fix_beta_last_max) {
+            continue;
+          }
+          TestParams param(congestion_control_type, fix_convex_mode,
+                           fix_cubic_quantization, fix_beta_last_max);
+          params.push_back(param);
+        }
+      }
+    }
   }
   return params;
 }
@@ -185,16 +228,14 @@
   void SetExperimentalOptionsInServerConfig() {
     QuicConfig client_config;
     QuicTagVector options;
-    if (FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode) {
+    if (GetParam().fix_convex_mode) {
       options.push_back(kCCVX);
     }
-    if (FLAGS_quic_reloadable_flag_quic_fix_cubic_convex_mode &&
-        FLAGS_quic_reloadable_flag_quic_fix_cubic_bytes_quantization) {
-      options.push_back(kCCVX);
+    if (GetParam().fix_cubic_quantization) {
       options.push_back(kCBQT);
     }
 
-    if (FLAGS_quic_reloadable_flag_quic_fix_beta_last_max) {
+    if (GetParam().fix_beta_last_max) {
       options.push_back(kBLMX);
     }
 

diff --git a/net/quic/core/quic_connection.cc b/net/quic/core/quic_connection.cc
index 56e8c33..ae9e1cd 100644
--- a/net/quic/core/quic_connection.cc
+++ b/net/quic/core/quic_connection.cc

@@ -691,7 +691,13 @@
   if (send_alarm_->IsSet()) {
     send_alarm_->Cancel();
   }
-  ProcessAckFrame(incoming_ack);
+  largest_seen_packet_with_ack_ = last_header_.packet_number;
+  sent_packet_manager_.OnIncomingAck(incoming_ack,
+                                     time_of_last_received_packet_);
+  // Always reset the retransmission alarm when an ack comes in, since we now
+  // have a better estimate of the current rtt than when it was set.
+  SetRetransmissionAlarm();
+
   // If the incoming ack's packets set expresses missing packets: peer is still
   // waiting for a packet lower than a packet that we are no longer planning to
   // send.
@@ -708,21 +714,6 @@
   return connected_;
 }
 
-void QuicConnection::ProcessAckFrame(const QuicAckFrame& incoming_ack) {
-  largest_seen_packet_with_ack_ = last_header_.packet_number;
-  sent_packet_manager_.OnIncomingAck(incoming_ack,
-                                     time_of_last_received_packet_);
-  // Always reset the retransmission alarm when an ack comes in, since we now
-  // have a better estimate of the current rtt than when it was set.
-  SetRetransmissionAlarm();
-}
-
-void QuicConnection::ProcessStopWaitingFrame(
-    const QuicStopWaitingFrame& stop_waiting) {
-  largest_seen_packet_with_stop_waiting_ = last_header_.packet_number;
-  received_packet_manager_.UpdatePacketInformationSentByPeer(stop_waiting);
-}
-
 bool QuicConnection::OnStopWaitingFrame(const QuicStopWaitingFrame& frame) {
   DCHECK(connected_);
 
@@ -743,7 +734,8 @@
     debug_visitor_->OnStopWaitingFrame(frame);
   }
 
-  ProcessStopWaitingFrame(frame);
+  largest_seen_packet_with_stop_waiting_ = last_header_.packet_number;
+  received_packet_manager_.DontWaitForPacketsBefore(frame.least_unacked);
   return connected_;
 }
 
@@ -908,7 +900,6 @@
   }
   QUIC_DLOG(INFO) << ENDPOINT
                   << "PATH_CLOSE_FRAME received for path: " << frame.path_id;
-  OnPathClosed(frame.path_id);
   return connected_;
 }
 
@@ -1144,7 +1135,6 @@
   // Opportunistically bundle an ack with this outgoing packet.
   ScopedPacketBundler ack_bundler(this, SEND_ACK_IF_PENDING);
   packet_generator_.AddControlFrame(QuicFrame(new QuicPathCloseFrame(path_id)));
-  OnPathClosed(path_id);
 }
 
 const QuicConnectionStats& QuicConnection::GetStats() {
@@ -2337,11 +2327,6 @@
   sent_packet_manager_.OnConnectionMigration(peer_migration_type);
 }
 
-void QuicConnection::OnPathClosed(QuicPathId path_id) {
-  // Stop receiving packets on this path.
-  framer_.OnPathClosed(path_id);
-}
-
 bool QuicConnection::ack_frame_updated() const {
   return received_packet_manager_.ack_frame_updated();
 }

diff --git a/net/quic/core/quic_connection.h b/net/quic/core/quic_connection.h
index 6604c77..ba3faf2f 100644
--- a/net/quic/core/quic_connection.h
+++ b/net/quic/core/quic_connection.h

@@ -794,10 +794,6 @@
   // Attempts to process any queued undecryptable packets.
   void MaybeProcessUndecryptablePackets();
 
-  void ProcessAckFrame(const QuicAckFrame& incoming_ack);
-
-  void ProcessStopWaitingFrame(const QuicStopWaitingFrame& stop_waiting);
-
   // Sends any packets which are a response to the last packet, including both
   // acks and pending writes if an ack opened the congestion window.
   void MaybeSendInResponseToPacket();
@@ -834,15 +830,6 @@
   QuicByteCount GetLimitedMaxPacketSize(
       QuicByteCount suggested_max_packet_size);
 
-  // Called when |path_id| is considered as closed because either a PATH_CLOSE
-  // frame is sent or received. Stops receiving packets on closed path. Drops
-  // receive side of a closed path, and packets with retransmittable frames on a
-  // closed path are marked as retransmissions which will be transmitted on
-  // other paths.
-  // TODO(fayang): complete OnPathClosed once QuicMultipathSentPacketManager and
-  // QuicMultipathReceivedPacketManager are landed in QuicConnection.
-  void OnPathClosed(QuicPathId path_id);
-
   // Do any work which logically would be done in OnPacket but can not be
   // safely done until the packet is validated. Returns true if packet can be
   // handled, false otherwise.

diff --git a/net/quic/core/quic_connection_test.cc b/net/quic/core/quic_connection_test.cc
index 20ac251b..c607cc26 100644
--- a/net/quic/core/quic_connection_test.cc
+++ b/net/quic/core/quic_connection_test.cc

@@ -4249,15 +4249,6 @@
   EXPECT_EQ(0u, connection_.GetStats().blocked_frames_sent);
 }
 
-TEST_P(QuicConnectionTest, PathClose) {
-  EXPECT_CALL(visitor_, OnSuccessfulVersionNegotiation(_));
-
-  QuicPathCloseFrame path_close = QuicPathCloseFrame(1);
-  ProcessPathClosePacket(&path_close);
-  EXPECT_TRUE(QuicFramerPeer::IsPathClosed(
-      QuicConnectionPeer::GetFramer(&connection_), 1));
-}
-
 TEST_P(QuicConnectionTest, ZeroBytePacket) {
   // Don't close the connection for zero byte packets.
   EXPECT_CALL(visitor_, OnConnectionClosed(_, _, _)).Times(0);
@@ -4893,13 +4884,6 @@
   EXPECT_TRUE(QuicConnectionPeer::IsMultipathEnabled(&connection_));
 }
 
-TEST_P(QuicConnectionTest, ClosePath) {
-  QuicPathId kTestPathId = 1;
-  connection_.SendPathClose(kTestPathId);
-  EXPECT_TRUE(QuicFramerPeer::IsPathClosed(
-      QuicConnectionPeer::GetFramer(&connection_), kTestPathId));
-}
-
 TEST_P(QuicConnectionTest, OnPathDegrading) {
   QuicByteCount packet_size;
   const size_t kMinTimeoutsBeforePathDegrading = 2;

diff --git a/net/quic/core/quic_flags_list.h b/net/quic/core/quic_flags_list.h
index d071636..8d284003 100644
--- a/net/quic/core/quic_flags_list.h
+++ b/net/quic/core/quic_flags_list.h

@@ -136,10 +136,6 @@
 // allow CHLO packets to be buffered until next iteration of the event loop.
 QUIC_FLAG(bool, FLAGS_quic_allow_chlo_buffering, true)
 
-// If true, fix version manager bug, in which version flag does not really
-// help.
-QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_fix_version_manager, true)
-
 // Add a new client connection options field to QuicOptions which is only used
 // to configure client side features, such as congestion control.
 QUIC_FLAG(bool, FLAGS_quic_reloadable_flag_quic_client_connection_options, true)
@@ -197,3 +193,8 @@
 
 // Congestion window gain for QUIC BBR during PROBE_BW phase.
 QUIC_FLAG(double, FLAGS_quic_bbr_cwnd_gain, 2.0f)
+
+// If true, bidi streaming is always enabled in QUIC.
+QUIC_FLAG(bool,
+          FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming,
+          false)

diff --git a/net/quic/core/quic_flow_controller.cc b/net/quic/core/quic_flow_controller.cc
index 274831c..d519032a 100644
--- a/net/quic/core/quic_flow_controller.cc
+++ b/net/quic/core/quic_flow_controller.cc

@@ -54,8 +54,8 @@
 
 void QuicFlowController::AddBytesConsumed(QuicByteCount bytes_consumed) {
   bytes_consumed_ += bytes_consumed;
-  QUIC_DVLOG(1) << ENDPOINT << "Stream " << id_
-                << " consumed: " << bytes_consumed_;
+  QUIC_DVLOG(1) << ENDPOINT << "Stream " << id_ << " consumed "
+                << bytes_consumed_ << " bytes.";
 
   MaybeSendWindowUpdate();
 }
@@ -68,7 +68,7 @@
   }
 
   QUIC_DVLOG(1) << ENDPOINT << "Stream " << id_
-                << " highest byte offset increased from: "
+                << " highest byte offset increased from "
                 << highest_received_byte_offset_ << " to " << new_offset;
   highest_received_byte_offset_ = new_offset;
   return true;
@@ -91,7 +91,8 @@
   }
 
   bytes_sent_ += bytes_sent;
-  QUIC_DVLOG(1) << ENDPOINT << "Stream " << id_ << " sent: " << bytes_sent_;
+  QUIC_DVLOG(1) << ENDPOINT << "Stream " << id_ << " sent " << bytes_sent_
+                << " bytes.";
 }
 
 bool QuicFlowController::FlowControlViolation() {

diff --git a/net/quic/core/quic_framer.cc b/net/quic/core/quic_framer.cc
index 2c9f632..e32db271 100644
--- a/net/quic/core/quic_framer.cc
+++ b/net/quic/core/quic_framer.cc

@@ -136,8 +136,8 @@
       error_(QUIC_NO_ERROR),
       last_packet_number_(0),
       largest_packet_number_(0),
-      last_path_id_(kInvalidPathId),
       last_serialized_connection_id_(0),
+      last_version_tag_(0),
       supported_versions_(supported_versions),
       decrypter_level_(ENCRYPTION_NONE),
       alternative_decrypter_level_(ENCRYPTION_NONE),
@@ -696,7 +696,9 @@
   if (header.public_header.version_flag) {
     DCHECK_EQ(Perspective::IS_CLIENT, perspective_);
     QuicTag tag = QuicVersionToQuicTag(quic_version_);
-    writer->WriteUInt32(tag);
+    if (!writer->WriteUInt32(tag)) {
+      return false;
+    }
     QUIC_DVLOG(1) << ENDPOINT << "version = " << quic_version_ << ", tag = '"
                   << QuicTagToString(tag) << "'";
   }
@@ -743,46 +745,12 @@
   return QuicTime::Delta::FromMicroseconds(time);
 }
 
-bool QuicFramer::IsValidPath(QuicPathId path_id,
-                             QuicPacketNumber* base_packet_number) {
-  if (QuicContainsKey(closed_paths_, path_id)) {
-    // Path is closed.
-    return false;
-  }
-
-  if (path_id == last_path_id_) {
-    *base_packet_number = largest_packet_number_;
-    return true;
-  }
-
-  if (QuicContainsKey(largest_packet_numbers_, path_id)) {
-    *base_packet_number = largest_packet_numbers_[path_id];
-  } else {
-    *base_packet_number = 0;
-  }
-
-  return true;
-}
-
 void QuicFramer::SetLastPacketNumber(const QuicPacketHeader& header) {
-  if (header.public_header.multipath_flag && header.path_id != last_path_id_) {
-    if (last_path_id_ != kInvalidPathId) {
-      // Save current last packet number before changing path.
-      largest_packet_numbers_[last_path_id_] = largest_packet_number_;
-    }
-    // Change path.
-    last_path_id_ = header.path_id;
-  }
   last_packet_number_ = header.packet_number;
   largest_packet_number_ =
       std::max(header.packet_number, largest_packet_number_);
 }
 
-void QuicFramer::OnPathClosed(QuicPathId path_id) {
-  closed_paths_.insert(path_id);
-  largest_packet_numbers_.erase(path_id);
-}
-
 QuicPacketNumber QuicFramer::CalculatePacketNumberFromWire(
     QuicPacketNumberLength packet_number_length,
     QuicPacketNumber base_packet_number,
@@ -964,12 +932,6 @@
   }
 
   QuicPacketNumber base_packet_number = largest_packet_number_;
-  if (header->public_header.multipath_flag &&
-      !IsValidPath(header->path_id, &base_packet_number)) {
-    // Stop processing because path is closed.
-    set_detailed_error("Path is closed.");
-    return false;
-  }
 
   if (!ProcessPacketSequenceNumber(
           encrypted_reader, header->public_header.packet_number_length,

diff --git a/net/quic/core/quic_framer.h b/net/quic/core/quic_framer.h
index 1feb5b7..23d3c3ce 100644
--- a/net/quic/core/quic_framer.h
+++ b/net/quic/core/quic_framer.h

@@ -9,8 +9,6 @@
 #include <cstdint>
 #include <memory>
 #include <string>
-#include <unordered_map>
-#include <unordered_set>
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
@@ -332,9 +330,6 @@
 
   Perspective perspective() const { return perspective_; }
 
-  // Called when a PATH_CLOSED frame has been sent/received on |path_id|.
-  void OnPathClosed(QuicPathId path_id);
-
   QuicTag last_version_tag() { return last_version_tag_; }
 
  private:
@@ -407,12 +402,6 @@
                       size_t buffer_length,
                       size_t* decrypted_length);
 
-  // Checks if |path_id| is a viable path to receive packets on. Returns true
-  // and sets |base_packet_number| to the packet number to calculate the
-  // incoming packet number from if the path is not closed. Returns false
-  // otherwise.
-  bool IsValidPath(QuicPathId path_id, QuicPacketNumber* base_packet_number);
-
   // Sets last_packet_number_. This can only be called after the packet is
   // successfully decrypted.
   void SetLastPacketNumber(const QuicPacketHeader& header);
@@ -491,20 +480,10 @@
   std::string detailed_error_;
   QuicFramerVisitorInterface* visitor_;
   QuicErrorCode error_;
-  // Set of closed paths. A path is considered as closed if a PATH_CLOSED frame
-  // has been sent/received.
-  // TODO(fayang): this set is never cleaned up. A possible improvement is to
-  // use intervals.
-  std::unordered_set<QuicPathId> closed_paths_;
   // Updated by ProcessPacketHeader when it succeeds.
   QuicPacketNumber last_packet_number_;
-  // Map mapping path id to packet number of largest successfully decrypted
-  // received packet.
-  std::unordered_map<QuicPathId, QuicPacketNumber> largest_packet_numbers_;
   // Updated by ProcessPacketHeader when it succeeds decrypting a larger packet.
   QuicPacketNumber largest_packet_number_;
-  // The path on which last successfully decrypted packet was received.
-  QuicPathId last_path_id_;
   // Updated by WritePacketHeader.
   QuicConnectionId last_serialized_connection_id_;
   // The last QUIC version tag received.

diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
index 97e81a8..01a201d 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc

@@ -39,7 +39,6 @@
 // Use fields in which each byte is distinct to ensure that every byte is
 // framed correctly. The values are otherwise arbitrary.
 const QuicConnectionId kConnectionId = UINT64_C(0xFEDCBA9876543210);
-const QuicPathId kPathId = 0x42;
 const QuicPacketNumber kPacketNumber = UINT64_C(0x123456789ABC);
 const QuicPacketNumber kSmallLargestObserved = UINT16_C(0x1234);
 const QuicPacketNumber kSmallMissingPacket = UINT16_C(0x1233);
@@ -761,107 +760,6 @@
   }
 }
 
-TEST_P(QuicFramerTest, PacketHeaderWithPathChange) {
-  // Packet 1 from path 0x42.
-  // clang-format off
-  unsigned char packet1[] = {
-    // public flags (version)
-    0x78,
-    // connection_id
-    0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
-    // path_id
-    0x42,
-    // packet number
-    0xBC, 0x9A, 0x78, 0x56, 0x34, 0x12,
-  };
-  // clang-format on
-
-  EXPECT_EQ(0u, QuicFramerPeer::GetLastPacketNumber(&framer_));
-  EXPECT_EQ(kInvalidPathId, QuicFramerPeer::GetLastPathId(&framer_));
-  QuicEncryptedPacket encrypted1(AsChars(packet1), arraysize(packet1), false);
-  EXPECT_FALSE(framer_.ProcessPacket(encrypted1));
-  EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
-  ASSERT_TRUE(visitor_.header_.get());
-  EXPECT_EQ(kConnectionId, visitor_.header_->public_header.connection_id);
-  EXPECT_EQ(kPathId, visitor_.header_->path_id);
-  EXPECT_EQ(kPacketNumber, visitor_.header_->packet_number);
-  EXPECT_EQ(kPacketNumber, QuicFramerPeer::GetLastPacketNumber(&framer_));
-  EXPECT_EQ(kPathId, QuicFramerPeer::GetLastPathId(&framer_));
-
-  // Packet 2 from default path.
-  // clang-format off
-  unsigned char packet2[] = {
-    // public flags (version)
-    0x78,
-    // connection_id
-    0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
-    // path_id
-    0x00,
-    // packet number
-    0xCC, 0x9A, 0x78, 0x56, 0x34, 0x12,
-  };
-  // clang-format on
-
-  QuicEncryptedPacket encrypted2(AsChars(packet2), arraysize(packet2), false);
-  EXPECT_FALSE(framer_.ProcessPacket(encrypted2));
-  EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
-  ASSERT_TRUE(visitor_.header_.get());
-  EXPECT_EQ(kConnectionId, visitor_.header_->public_header.connection_id);
-  EXPECT_EQ(kDefaultPathId, visitor_.header_->path_id);
-  EXPECT_EQ(kPacketNumber + 16, visitor_.header_->packet_number);
-  EXPECT_EQ(kPacketNumber + 16, QuicFramerPeer::GetLastPacketNumber(&framer_));
-  EXPECT_EQ(kDefaultPathId, QuicFramerPeer::GetLastPathId(&framer_));
-
-  // Packet 3 from path 0x42.
-  // clang-format off
-  unsigned char packet3[] = {
-    // public flags (version)
-    0x78,
-    // connection_id
-    0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
-    // path_id
-    0x42,
-    // packet number
-    0xBD, 0x9A, 0x78, 0x56, 0x34, 0x12,
-  };
-  // clang-format on
-
-  QuicEncryptedPacket encrypted3(AsChars(packet3), arraysize(packet3), false);
-  EXPECT_FALSE(framer_.ProcessPacket(encrypted3));
-  EXPECT_EQ(QUIC_MISSING_PAYLOAD, framer_.error());
-  ASSERT_TRUE(visitor_.header_.get());
-  EXPECT_EQ(kConnectionId, visitor_.header_->public_header.connection_id);
-  EXPECT_EQ(kPathId, visitor_.header_->path_id);
-  EXPECT_EQ(kPacketNumber + 1, visitor_.header_->packet_number);
-  EXPECT_EQ(kPacketNumber + 1, QuicFramerPeer::GetLastPacketNumber(&framer_));
-  EXPECT_EQ(kPathId, QuicFramerPeer::GetLastPathId(&framer_));
-}
-
-TEST_P(QuicFramerTest, ReceivedPacketOnClosedPath) {
-  // Packet 1 from path 0x42.
-  // clang-format off
-  unsigned char packet[] = {
-    // public flags (version)
-    0x78,
-    // connection_id
-    0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
-    // path_id
-    0x42,
-    // packet number
-    0xBC, 0x9A, 0x78, 0x56, 0x34, 0x12,
-    // private flags
-    0x00,
-  };
-  // clang-format on
-
-  framer_.OnPathClosed(kPathId);
-  QuicEncryptedPacket encrypted(AsChars(packet), arraysize(packet), false);
-  EXPECT_FALSE(framer_.ProcessPacket(encrypted));
-  EXPECT_EQ(QUIC_NO_ERROR, framer_.error());
-  EXPECT_EQ(0u, QuicFramerPeer::GetLastPacketNumber(&framer_));
-  EXPECT_EQ(kInvalidPathId, QuicFramerPeer::GetLastPathId(&framer_));
-}
-
 TEST_P(QuicFramerTest, PacketHeaderWith4BytePacketNumber) {
   QuicFramerPeer::SetLargestPacketNumber(&framer_, kPacketNumber - 2);
 

diff --git a/net/quic/core/quic_multipath_received_packet_manager.cc b/net/quic/core/quic_multipath_received_packet_manager.cc
index 3bf497bf8..c7931cf 100644
--- a/net/quic/core/quic_multipath_received_packet_manager.cc
+++ b/net/quic/core/quic_multipath_received_packet_manager.cc

@@ -85,7 +85,7 @@
     QuicReceivedPacketManager* manager =
         path_managers_[stop_waiting.path_id].get();
     if (manager != nullptr) {
-      manager->UpdatePacketInformationSentByPeer(stop_waiting);
+      manager->DontWaitForPacketsBefore(stop_waiting.least_unacked);
     }
   }
 }

diff --git a/net/quic/core/quic_multipath_received_packet_manager_test.cc b/net/quic/core/quic_multipath_received_packet_manager_test.cc
index d8e948d..afedaa3 100644
--- a/net/quic/core/quic_multipath_received_packet_manager_test.cc
+++ b/net/quic/core/quic_multipath_received_packet_manager_test.cc

@@ -124,23 +124,6 @@
       "Check whether a packet is awaited on a non-existent path");
 }
 
-TEST_F(QuicMultipathReceivedPacketManagerTest,
-       UpdatePacketInformationSentByPeer) {
-  std::vector<QuicStopWaitingFrame> stop_waitings;
-  QuicStopWaitingFrame stop_waiting_0;
-  QuicStopWaitingFrame stop_waiting_1;
-  QuicStopWaitingFrame stop_waiting_2;
-  stop_waiting_0.path_id = kDefaultPathId;
-  stop_waiting_1.path_id = kPathId1;
-  stop_waiting_2.path_id = kPathId2;
-  stop_waitings.push_back(stop_waiting_0);
-  stop_waitings.push_back(stop_waiting_1);
-  stop_waitings.push_back(stop_waiting_2);
-  EXPECT_CALL(*manager_0_, UpdatePacketInformationSentByPeer(_)).Times(1);
-  EXPECT_CALL(*manager_1_, UpdatePacketInformationSentByPeer(_)).Times(1);
-  multipath_manager_.UpdatePacketInformationSentByPeer(stop_waitings);
-}
-
 TEST_F(QuicMultipathReceivedPacketManagerTest, HasNewMissingPackets) {
   EXPECT_CALL(*manager_0_, HasNewMissingPackets()).WillOnce(Return(true));
   EXPECT_CALL(*manager_1_, HasNewMissingPackets()).WillOnce(Return(false));

diff --git a/net/quic/core/quic_received_packet_manager.cc b/net/quic/core/quic_received_packet_manager.cc
index 2415307..668301d 100644
--- a/net/quic/core/quic_received_packet_manager.cc
+++ b/net/quic/core/quic_received_packet_manager.cc

@@ -103,18 +103,13 @@
   return QuicFrame(&ack_frame_);
 }
 
-bool QuicReceivedPacketManager::DontWaitForPacketsBefore(
+void QuicReceivedPacketManager::DontWaitForPacketsBefore(
     QuicPacketNumber least_unacked) {
-  peer_least_packet_awaiting_ack_ = least_unacked;
-  return ack_frame_.packets.RemoveUpTo(least_unacked);
-}
-
-void QuicReceivedPacketManager::UpdatePacketInformationSentByPeer(
-    const QuicStopWaitingFrame& stop_waiting) {
   // ValidateAck() should fail if peer_least_packet_awaiting_ack shrinks.
-  DCHECK_LE(peer_least_packet_awaiting_ack_, stop_waiting.least_unacked);
-  if (stop_waiting.least_unacked > peer_least_packet_awaiting_ack_) {
-    bool packets_updated = DontWaitForPacketsBefore(stop_waiting.least_unacked);
+  DCHECK_LE(peer_least_packet_awaiting_ack_, least_unacked);
+  if (least_unacked > peer_least_packet_awaiting_ack_) {
+    peer_least_packet_awaiting_ack_ = least_unacked;
+    bool packets_updated = ack_frame_.packets.RemoveUpTo(least_unacked);
     if (packets_updated) {
       // Ack frame gets updated because packets set is updated because of stop
       // waiting frame.

diff --git a/net/quic/core/quic_received_packet_manager.h b/net/quic/core/quic_received_packet_manager.h
index 140a825f..08001a8 100644
--- a/net/quic/core/quic_received_packet_manager.h
+++ b/net/quic/core/quic_received_packet_manager.h

@@ -15,7 +15,6 @@
 
 namespace test {
 class QuicConnectionPeer;
-class QuicReceivedPacketManagerPeer;
 }  // namespace test
 
 struct QuicConnectionStats;
@@ -43,9 +42,10 @@
   // another packet is received, or it will change.
   const QuicFrame GetUpdatedAckFrame(QuicTime approximate_now);
 
-  // Updates internal state based on |stop_waiting|.
-  virtual void UpdatePacketInformationSentByPeer(
-      const QuicStopWaitingFrame& stop_waiting);
+  // Deletes all missing packets before least unacked. The connection won't
+  // process any packets with packet number before |least_unacked| that it
+  // received after this call.
+  void DontWaitForPacketsBefore(QuicPacketNumber least_unacked);
 
   // Returns true if there are any missing packets.
   bool HasMissingPackets() const;
@@ -67,13 +67,6 @@
 
  private:
   friend class test::QuicConnectionPeer;
-  friend class test::QuicReceivedPacketManagerPeer;
-
-  // Deletes all missing packets before least unacked. The connection won't
-  // process any packets with packet number before |least_unacked| that it
-  // received after this call. Returns true if there were missing packets before
-  // |least_unacked| unacked, false otherwise.
-  bool DontWaitForPacketsBefore(QuicPacketNumber least_unacked);
 
   // Least packet number of the the packet sent by the peer for which it
   // hasn't received an ack.

diff --git a/net/quic/core/quic_received_packet_manager_test.cc b/net/quic/core/quic_received_packet_manager_test.cc
index 6a2e020..e7ff3d3 100644
--- a/net/quic/core/quic_received_packet_manager_test.cc
+++ b/net/quic/core/quic_received_packet_manager_test.cc

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "net/quic/core/quic_connection_stats.h"
-#include "net/quic/test_tools/quic_received_packet_manager_peer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -68,8 +67,7 @@
   received_manager_.RecordPacketReceived(header, QuicTime::Zero());
   EXPECT_TRUE(received_manager_.IsAwaitingPacket(3u));
   EXPECT_TRUE(received_manager_.IsAwaitingPacket(6u));
-  EXPECT_TRUE(QuicReceivedPacketManagerPeer::DontWaitForPacketsBefore(
-      &received_manager_, 4));
+  received_manager_.DontWaitForPacketsBefore(4);
   EXPECT_FALSE(received_manager_.IsAwaitingPacket(3u));
   EXPECT_TRUE(received_manager_.IsAwaitingPacket(6u));
 }

diff --git a/net/quic/core/quic_spdy_stream.h b/net/quic/core/quic_spdy_stream.h
index 6c6c3328..fec1fd7 100644
--- a/net/quic/core/quic_spdy_stream.h
+++ b/net/quic/core/quic_spdy_stream.h

@@ -181,7 +181,10 @@
     allow_bidirectional_data_ = value;
   }
 
-  bool allow_bidirectional_data() const { return allow_bidirectional_data_; }
+  bool allow_bidirectional_data() const {
+    return FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming ||
+           allow_bidirectional_data_;
+  }
 
   using QuicStream::CloseWriteSide;
 

diff --git a/net/quic/core/quic_stream.cc b/net/quic/core/quic_stream.cc
index d79d29c1..13df510 100644
--- a/net/quic/core/quic_stream.cc
+++ b/net/quic/core/quic_stream.cc

@@ -275,8 +275,8 @@
     bool fin,
     QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener) {
   if (write_side_closed_) {
-    QUIC_DLOG(ERROR) << ENDPOINT
-                     << "Attempt to write when the write side is closed";
+    QUIC_DLOG(ERROR) << ENDPOINT << "Stream " << id()
+                     << "attempting to write when the write side is closed";
     return QuicConsumedData(0, false);
   }
 
@@ -373,7 +373,7 @@
   sequencer_.ReleaseBuffer();
 
   if (write_side_closed_) {
-    QUIC_DLOG(INFO) << ENDPOINT << "Closing stream: " << id();
+    QUIC_DLOG(INFO) << ENDPOINT << "Closing stream " << id();
     session_->CloseStream(id());
   }
 }
@@ -386,7 +386,7 @@
 
   write_side_closed_ = true;
   if (read_side_closed_) {
-    QUIC_DLOG(INFO) << ENDPOINT << "Closing stream: " << id();
+    QUIC_DLOG(INFO) << ENDPOINT << "Closing stream " << id();
     session_->CloseStream(id());
   }
 }

diff --git a/net/quic/platform/api/quic_flag_utils.h b/net/quic/platform/api/quic_flag_utils.h
new file mode 100644
index 0000000..1689f68
--- /dev/null
+++ b/net/quic/platform/api/quic_flag_utils.h

@@ -0,0 +1,13 @@
+// Copyright (c) 2017 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 NET_QUIC_PLATFORM_API_QUIC_FLAG_UTILS_H_
+#define NET_QUIC_PLATFORM_API_QUIC_FLAG_UTILS_H_
+
+#include "net/quic/platform/impl/quic_flag_utils_impl.h"
+
+#define QUIC_FLAG_COUNT QUIC_FLAG_COUNT_IMPL
+#define QUIC_FLAG_COUNT_N QUIC_FLAG_COUNT_N_IMPL
+
+#endif  // NET_QUIC_PLATFORM_API_QUIC_FLAG_UTILS_H_

diff --git a/net/quic/platform/impl/quic_bug_tracker_impl.h b/net/quic/platform/impl/quic_bug_tracker_impl.h
index 1667504..a0b0efd 100644
--- a/net/quic/platform/impl/quic_bug_tracker_impl.h
+++ b/net/quic/platform/impl/quic_bug_tracker_impl.h

@@ -6,9 +6,6 @@
 
 #include "net/quic/platform/api/quic_logging.h"
 
-// For external QUIC, QUIC_BUG should be #defined to QUIC_LOG(DFATAL) and
-// QUIC_BUG_IF(condition) to QUIC LOG_IF(DFATAL, condition) as client-side log
-// rate limiting is less important and chrome doesn't QUIC_LOG_FIRST_N anyway.
 #define QUIC_BUG_IMPL QUIC_LOG(DFATAL)
 #define QUIC_BUG_IF_IMPL(condition) QUIC_LOG_IF(DFATAL, condition)
 

diff --git a/net/quic/platform/impl/quic_flag_utils_impl.h b/net/quic/platform/impl/quic_flag_utils_impl.h
new file mode 100644
index 0000000..52e7107
--- /dev/null
+++ b/net/quic/platform/impl/quic_flag_utils_impl.h

@@ -0,0 +1,15 @@
+// Copyright (c) 2017 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 NET_QUIC_PLATFORM_IMPL_QUIC_FLAG_UTILS_IMPL_H_
+#define NET_QUIC_PLATFORM_IMPL_QUIC_FLAG_UTILS_IMPL_H_
+
+#define QUIC_FLAG_COUNT_IMPL(flag) \
+  do {                             \
+  } while (0)
+#define QUIC_FLAG_COUNT_N_IMPL(flag, instance, total) \
+  do {                                                \
+  } while (0)
+
+#endif  // NET_QUIC_PLATFORM_IMPL_QUIC_FLAG_UTILS_IMPL_H_

diff --git a/net/quic/test_tools/quic_framer_peer.cc b/net/quic/test_tools/quic_framer_peer.cc
index 09103c1..2f8df04 100644
--- a/net/quic/test_tools/quic_framer_peer.cc
+++ b/net/quic/test_tools/quic_framer_peer.cc

@@ -77,15 +77,5 @@
   return framer->last_packet_number_;
 }
 
-// static
-QuicPathId QuicFramerPeer::GetLastPathId(QuicFramer* framer) {
-  return framer->last_path_id_;
-}
-
-// static
-bool QuicFramerPeer::IsPathClosed(QuicFramer* framer, QuicPathId path_id) {
-  return QuicContainsKey(framer->closed_paths_, path_id);
-}
-
 }  // namespace test
 }  // namespace net

diff --git a/net/quic/test_tools/quic_framer_peer.h b/net/quic/test_tools/quic_framer_peer.h
index 7b8b1794..930f164 100644
--- a/net/quic/test_tools/quic_framer_peer.h
+++ b/net/quic/test_tools/quic_framer_peer.h

@@ -37,10 +37,6 @@
 
   static QuicPacketNumber GetLastPacketNumber(QuicFramer* framer);
 
-  static QuicPathId GetLastPathId(QuicFramer* framer);
-
-  static bool IsPathClosed(QuicFramer* framer, QuicPathId path_id);
-
  private:
   DISALLOW_COPY_AND_ASSIGN(QuicFramerPeer);
 };

diff --git a/net/quic/test_tools/quic_received_packet_manager_peer.cc b/net/quic/test_tools/quic_received_packet_manager_peer.cc
deleted file mode 100644
index 1e0ee002..0000000
--- a/net/quic/test_tools/quic_received_packet_manager_peer.cc
+++ /dev/null

@@ -1,21 +0,0 @@
-// Copyright 2013 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 "net/quic/test_tools/quic_received_packet_manager_peer.h"
-
-#include "net/quic/core/quic_packets.h"
-#include "net/quic/core/quic_received_packet_manager.h"
-
-namespace net {
-namespace test {
-
-// static
-bool QuicReceivedPacketManagerPeer::DontWaitForPacketsBefore(
-    QuicReceivedPacketManager* received_packet_manager,
-    QuicPacketNumber least_unacked) {
-  return received_packet_manager->DontWaitForPacketsBefore(least_unacked);
-}
-
-}  // namespace test
-}  // namespace net

diff --git a/net/quic/test_tools/quic_received_packet_manager_peer.h b/net/quic/test_tools/quic_received_packet_manager_peer.h
deleted file mode 100644
index 43a9d20..0000000
--- a/net/quic/test_tools/quic_received_packet_manager_peer.h
+++ /dev/null

@@ -1,31 +0,0 @@
-// Copyright 2013 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 NET_QUIC_TEST_TOOLS_QUIC_RECEIVED_PACKET_MANAGER_PEER_H_
-#define NET_QUIC_TEST_TOOLS_QUIC_RECEIVED_PACKET_MANAGER_PEER_H_
-
-#include "base/macros.h"
-#include "net/quic/core/quic_packets.h"
-
-namespace net {
-
-class QuicReceivedPacketManager;
-
-namespace test {
-
-class QuicReceivedPacketManagerPeer {
- public:
-  static bool DontWaitForPacketsBefore(
-      QuicReceivedPacketManager* received_packet_manager,
-      QuicPacketNumber least_unacked);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(QuicReceivedPacketManagerPeer);
-};
-
-}  // namespace test
-
-}  // namespace net
-
-#endif  // NET_QUIC_TEST_TOOLS_QUIC_RECEIVED_PACKET_MANAGER_PEER_H_

diff --git a/net/quic/test_tools/quic_stream_peer.cc b/net/quic/test_tools/quic_stream_peer.cc
index f1362c98..859bc6ac 100644
--- a/net/quic/test_tools/quic_stream_peer.cc
+++ b/net/quic/test_tools/quic_stream_peer.cc

@@ -41,31 +41,11 @@
 }
 
 // static
-bool QuicStreamPeer::FinReceived(QuicStream* stream) {
-  return stream->fin_received_;
-}
-
-// static
 bool QuicStreamPeer::RstSent(QuicStream* stream) {
   return stream->rst_sent_;
 }
 
 // static
-bool QuicStreamPeer::RstReceived(QuicStream* stream) {
-  return stream->rst_received_;
-}
-
-// static
-bool QuicStreamPeer::ReadSideClosed(QuicStream* stream) {
-  return stream->read_side_closed_;
-}
-
-// static
-bool QuicStreamPeer::WriteSideClosed(QuicStream* stream) {
-  return stream->write_side_closed_;
-}
-
-// static
 uint32_t QuicStreamPeer::SizeOfQueuedData(QuicStream* stream) {
   uint32_t total = 0;
   std::list<QuicStream::PendingData>::iterator it =

diff --git a/net/quic/test_tools/quic_stream_peer.h b/net/quic/test_tools/quic_stream_peer.h
index 8744db6..c0fa106 100644
--- a/net/quic/test_tools/quic_stream_peer.h
+++ b/net/quic/test_tools/quic_stream_peer.h

@@ -27,12 +27,7 @@
   static void CloseReadSide(QuicStream* stream);
 
   static bool FinSent(QuicStream* stream);
-  static bool FinReceived(QuicStream* stream);
   static bool RstSent(QuicStream* stream);
-  static bool RstReceived(QuicStream* stream);
-
-  static bool ReadSideClosed(QuicStream* stream);
-  static bool WriteSideClosed(QuicStream* stream);
 
   static uint32_t SizeOfQueuedData(QuicStream* stream);
 

diff --git a/net/socket/tcp_socket_posix.cc b/net/socket/tcp_socket_posix.cc
index 438d5aa..a37d83b 100644
--- a/net/socket/tcp_socket_posix.cc
+++ b/net/socket/tcp_socket_posix.cc

@@ -14,6 +14,8 @@
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_piece.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/time/time.h"
 #include "net/base/address_list.h"
@@ -23,6 +25,7 @@
 #include "net/base/network_activity_monitor.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/sockaddr_storage.h"
+#include "net/http/http_util.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
@@ -92,12 +95,15 @@
                               &system_supports_tcp_fastopen)) {
     return false;
   }
-  // The read from /proc should return '1' if TCP FastOpen is enabled in the OS.
-  if (system_supports_tcp_fastopen.empty() ||
-      (system_supports_tcp_fastopen[0] != '1')) {
-    return false;
-  }
-  return true;
+  // The read value from /proc will be set in its least significant bit if
+  // TCP FastOpen is enabled.
+  int read_int = 0;
+  base::StringToInt(
+      HttpUtil::TrimLWS(base::StringPiece(system_supports_tcp_fastopen)),
+      &read_int);
+  if ((read_int & 0x1) == 1)
+    return true;
+  return false;
 }
 
 void RegisterTCPFastOpenIntentAndSupport(bool user_enabled,

diff --git a/net/spdy/hpack/hpack_decoder.cc b/net/spdy/hpack/hpack_decoder.cc
index 78e1f181..0b6c4fc 100644
--- a/net/spdy/hpack/hpack_decoder.cc
+++ b/net/spdy/hpack/hpack_decoder.cc

@@ -21,7 +21,11 @@
     : handler_(nullptr),
       total_header_bytes_(0),
       total_parsed_bytes_(0),
-      header_block_started_(false) {}
+      header_block_started_(false),
+      size_updates_seen_(0),
+      size_updates_allowed_(true),
+      incremental_decode_(false) {}
+
 
 HpackDecoder::~HpackDecoder() {}
 

diff --git a/net/spdy/hpack/hpack_entry.cc b/net/spdy/hpack/hpack_entry.cc
index 0581aaa..1c0eebe 100644
--- a/net/spdy/hpack/hpack_entry.cc
+++ b/net/spdy/hpack/hpack_entry.cc

@@ -23,15 +23,19 @@
       name_ref_(name_),
       value_ref_(value_),
       insertion_index_(insertion_index),
-      type_(is_static ? STATIC : DYNAMIC) {}
+      type_(is_static ? STATIC : DYNAMIC),
+      time_added_(0) {}
 
 HpackEntry::HpackEntry(StringPiece name, StringPiece value)
-    : name_ref_(name), value_ref_(value), insertion_index_(0), type_(LOOKUP) {}
+    : name_ref_(name), value_ref_(value), insertion_index_(0), type_(LOOKUP),
+      time_added_(0) {}
 
-HpackEntry::HpackEntry() : insertion_index_(0), type_(LOOKUP) {}
+HpackEntry::HpackEntry()
+    : insertion_index_(0), type_(LOOKUP), time_added_(0) {}
 
 HpackEntry::HpackEntry(const HpackEntry& other)
-    : insertion_index_(other.insertion_index_), type_(other.type_) {
+    : insertion_index_(other.insertion_index_), type_(other.type_),
+      time_added_(0) {
   if (type_ == LOOKUP) {
     name_ref_ = other.name_ref_;
     value_ref_ = other.value_ref_;

diff --git a/net/spdy/hpack/hpack_huffman_table.cc b/net/spdy/hpack/hpack_huffman_table.cc
index 2d361db..1b83526 100644
--- a/net/spdy/hpack/hpack_huffman_table.cc
+++ b/net/spdy/hpack/hpack_huffman_table.cc

@@ -51,7 +51,7 @@
   return size_t(1) << indexed_length;
 }
 
-HpackHuffmanTable::HpackHuffmanTable() {}
+HpackHuffmanTable::HpackHuffmanTable() : pad_bits_(0), failed_symbol_id_(0) {}
 
 HpackHuffmanTable::~HpackHuffmanTable() {}
 

diff --git a/net/tools/cert_verify_tool/verify_using_path_builder.cc b/net/tools/cert_verify_tool/verify_using_path_builder.cc
index b94a08e..60576cd 100644
--- a/net/tools/cert_verify_tool/verify_using_path_builder.cc
+++ b/net/tools/cert_verify_tool/verify_using_path_builder.cc

@@ -21,6 +21,7 @@
 #include "net/cert/internal/signature_policy.h"
 #include "net/cert/internal/trust_store_collection.h"
 #include "net/cert/internal/trust_store_in_memory.h"
+#include "net/cert/x509_util.h"
 #include "net/cert_net/cert_net_fetcher_impl.h"
 #include "net/tools/cert_verify_tool/cert_verify_tool_util.h"
 #include "net/url_request/url_request_context.h"
@@ -158,8 +159,8 @@
 
 scoped_refptr<net::ParsedCertificate> ParseCertificate(const CertInput& input) {
   net::CertErrors errors;
-  scoped_refptr<net::ParsedCertificate> cert =
-      net::ParsedCertificate::Create(input.der_cert, {}, &errors);
+  scoped_refptr<net::ParsedCertificate> cert = net::ParsedCertificate::Create(
+      net::x509_util::CreateCryptoBuffer(input.der_cert), {}, &errors);
   if (!cert) {
     PrintCertError("ERROR: ParsedCertificate failed:", input);
     std::cout << errors.ToDebugString() << "\n";

diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 106d80f..93ed695 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc

@@ -2549,6 +2549,13 @@
   set_server_initial_session_flow_control_receive_window(kWindowSize);
 
   ASSERT_TRUE(Initialize());
+  if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    // This test is testing the same behavior as
+    // EarlyResponseWithQuicStreamNoError, except for the additional final check
+    // that the stream is reset on early response. Once this flag is deprecated
+    // the tests will be the same and this one can be removed.
+    return;
+  }
 
   EXPECT_TRUE(client_->client()->WaitForCryptoHandshakeConfirmed());
 

diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index fe650dc..c99ea93 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc

@@ -307,8 +307,7 @@
   QuicVersion version = GetSupportedVersions().front();
   if (header.version_flag) {
     QuicVersion packet_version = header.versions.front();
-    if (FLAGS_quic_reloadable_flag_quic_fix_version_manager &&
-        framer_.supported_versions() != GetSupportedVersions()) {
+    if (framer_.supported_versions() != GetSupportedVersions()) {
       // Reset framer's version if version flags change in flight.
       framer_.SetSupportedVersions(GetSupportedVersions());
     }

diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
index 257ad13..8470575 100644
--- a/net/tools/quic/quic_dispatcher_test.cc
+++ b/net/tools/quic/quic_dispatcher_test.cc

@@ -535,7 +535,6 @@
 TEST_F(QuicDispatcherTest, SupportedVersionsChangeInFlight) {
   static_assert(arraysize(kSupportedQuicVersions) == 5u,
                 "Supported versions out of sync");
-  FLAGS_quic_reloadable_flag_quic_fix_version_manager = true;
   FLAGS_quic_reloadable_flag_quic_disable_version_34 = false;
   FLAGS_quic_reloadable_flag_quic_enable_version_36_v3 = true;
   FLAGS_quic_reloadable_flag_quic_enable_version_37 = true;

diff --git a/net/tools/quic/quic_packet_printer_bin.cc b/net/tools/quic/quic_packet_printer_bin.cc
index 2ba19b9..ccac643 100644
--- a/net/tools/quic/quic_packet_printer_bin.cc
+++ b/net/tools/quic/quic_packet_printer_bin.cc

@@ -41,7 +41,6 @@
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_text_utils.h"
 
-using std::cerr;
 using std::string;
 
 // If set, specify the QUIC version to use.
@@ -65,89 +64,89 @@
   explicit QuicPacketPrinter(QuicFramer* framer) : framer_(framer) {}
 
   void OnError(QuicFramer* framer) override {
-    cerr << "OnError: " << QuicErrorCodeToString(framer->error())
-         << " detail: " << framer->detailed_error() << "\n";
+    std::cerr << "OnError: " << QuicErrorCodeToString(framer->error())
+              << " detail: " << framer->detailed_error() << "\n";
   }
   bool OnProtocolVersionMismatch(QuicVersion received_version) override {
     framer_->set_version(received_version);
-    cerr << "OnProtocolVersionMismatch: "
-         << QuicVersionToString(received_version) << "\n";
+    std::cerr << "OnProtocolVersionMismatch: "
+              << QuicVersionToString(received_version) << "\n";
     return true;
   }
-  void OnPacket() override { cerr << "OnPacket\n"; }
+  void OnPacket() override { std::cerr << "OnPacket\n"; }
   void OnPublicResetPacket(const QuicPublicResetPacket& packet) override {
-    cerr << "OnPublicResetPacket\n";
+    std::cerr << "OnPublicResetPacket\n";
   }
   void OnVersionNegotiationPacket(
       const QuicVersionNegotiationPacket& packet) override {
-    cerr << "OnVersionNegotiationPacket\n";
+    std::cerr << "OnVersionNegotiationPacket\n";
   }
   bool OnUnauthenticatedPublicHeader(
       const QuicPacketPublicHeader& header) override {
-    cerr << "OnUnauthenticatedPublicHeader\n";
+    std::cerr << "OnUnauthenticatedPublicHeader\n";
     return true;
   }
   bool OnUnauthenticatedHeader(const QuicPacketHeader& header) override {
-    cerr << "OnUnauthenticatedHeader: " << header;
+    std::cerr << "OnUnauthenticatedHeader: " << header;
     return true;
   }
   void OnDecryptedPacket(EncryptionLevel level) override {
     // This only currently supports "decrypting" null encrypted packets.
     DCHECK_EQ(ENCRYPTION_NONE, level);
-    cerr << "OnDecryptedPacket\n";
+    std::cerr << "OnDecryptedPacket\n";
   }
   bool OnPacketHeader(const QuicPacketHeader& header) override {
-    cerr << "OnPacketHeader\n";
+    std::cerr << "OnPacketHeader\n";
     return true;
   }
   bool OnStreamFrame(const QuicStreamFrame& frame) override {
-    cerr << "OnStreamFrame: " << frame;
-    cerr << "         data: { "
-         << QuicTextUtils::HexEncode(frame.data_buffer, frame.data_length)
-         << " }\n";
+    std::cerr << "OnStreamFrame: " << frame;
+    std::cerr << "         data: { "
+              << QuicTextUtils::HexEncode(frame.data_buffer, frame.data_length)
+              << " }\n";
     return true;
   }
   bool OnAckFrame(const QuicAckFrame& frame) override {
-    cerr << "OnAckFrame: " << frame;
+    std::cerr << "OnAckFrame: " << frame;
     return true;
   }
   bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override {
-    cerr << "OnStopWaitingFrame: " << frame;
+    std::cerr << "OnStopWaitingFrame: " << frame;
     return true;
   }
   bool OnPaddingFrame(const QuicPaddingFrame& frame) override {
-    cerr << "OnPaddingFrame: " << frame;
+    std::cerr << "OnPaddingFrame: " << frame;
     return true;
   }
   bool OnPingFrame(const QuicPingFrame& frame) override {
-    cerr << "OnPingFrame\n";
+    std::cerr << "OnPingFrame\n";
     return true;
   }
   bool OnRstStreamFrame(const QuicRstStreamFrame& frame) override {
-    cerr << "OnRstStreamFrame: " << frame;
+    std::cerr << "OnRstStreamFrame: " << frame;
     return true;
   }
   bool OnConnectionCloseFrame(const QuicConnectionCloseFrame& frame) override {
-    cerr << "OnConnectionCloseFrame: " << frame;
+    std::cerr << "OnConnectionCloseFrame: " << frame;
     return true;
   }
   bool OnGoAwayFrame(const QuicGoAwayFrame& frame) override {
-    cerr << "OnGoAwayFrame: " << frame;
+    std::cerr << "OnGoAwayFrame: " << frame;
     return true;
   }
   bool OnWindowUpdateFrame(const QuicWindowUpdateFrame& frame) override {
-    cerr << "OnWindowUpdateFrame: " << frame;
+    std::cerr << "OnWindowUpdateFrame: " << frame;
     return true;
   }
   bool OnBlockedFrame(const QuicBlockedFrame& frame) override {
-    cerr << "OnBlockedFrame: " << frame;
+    std::cerr << "OnBlockedFrame: " << frame;
     return true;
   }
   bool OnPathCloseFrame(const QuicPathCloseFrame& frame) override {
-    cerr << "OnPathCloseFrame:" << frame;
+    std::cerr << "OnPathCloseFrame:" << frame;
     return true;
   }
-  void OnPacketComplete() override { cerr << "OnPacketComplete\n"; }
+  void OnPacketComplete() override { std::cerr << "OnPacketComplete\n"; }
 
  private:
   QuicFramer* framer_;  // Unowned.
@@ -161,8 +160,8 @@
   const base::CommandLine::StringVector& args = line->GetArgs();
 
   if (args.size() != 3) {
-    cerr << "Missing argument " << argc << ". (Usage: " << argv[0]
-         << " client|server <hex>\n";
+    std::cerr << "Missing argument " << argc << ". (Usage: " << argv[0]
+              << " client|server <hex>\n";
     return 1;
   }
 
@@ -177,8 +176,8 @@
   } else if (perspective_string == "server") {
     perspective = net::Perspective::IS_SERVER;
   } else {
-    cerr << "Invalid perspective. " << perspective_string
-         << " Usage: " << args[0] << " client|server <hex>\n";
+    std::cerr << "Invalid perspective. " << perspective_string
+              << " Usage: " << args[0] << " client|server <hex>\n";
     return 1;
   }
   string hex = net::QuicTextUtils::HexDecode(argv[2]);

diff --git a/net/tools/quic/quic_reject_reason_decoder_bin.cc b/net/tools/quic/quic_reject_reason_decoder_bin.cc
index d695f9d..96d63e6 100644
--- a/net/tools/quic/quic_reject_reason_decoder_bin.cc
+++ b/net/tools/quic/quic_reject_reason_decoder_bin.cc

@@ -16,8 +16,6 @@
 using net::HandshakeFailureReason;
 using net::CryptoUtils;
 using net::MAX_FAILURE_REASON;
-using std::cerr;
-using std::cout;
 
 int main(int argc, char* argv[]) {
   CommandLine::Init(argc, argv);
@@ -25,13 +23,13 @@
   const CommandLine::StringVector& args = line->GetArgs();
 
   if (args.size() != 1) {
-    cerr << "Missing argument (Usage: " << argv[0] << " <packed_reason>\n";
+    std::cerr << "Missing argument (Usage: " << argv[0] << " <packed_reason>\n";
     return 1;
   }
 
   uint32_t packed_error = 0;
   if (!base::StringToUint(args[0], &packed_error)) {
-    cerr << "Unable to parse: " << args[0] << "\n";
+    std::cerr << "Unable to parse: " << args[0] << "\n";
     return 2;
   }
 
@@ -40,7 +38,7 @@
       continue;
     }
     HandshakeFailureReason reason = static_cast<HandshakeFailureReason>(i);
-    cout << CryptoUtils::HandshakeFailureReasonToString(reason) << "\n";
+    std::cout << CryptoUtils::HandshakeFailureReasonToString(reason) << "\n";
   }
   return 0;
 }

diff --git a/net/tools/quic/quic_simple_server_stream.cc b/net/tools/quic/quic_simple_server_stream.cc
index ed960b2d..8289655 100644
--- a/net/tools/quic/quic_simple_server_stream.cc
+++ b/net/tools/quic/quic_simple_server_stream.cc

@@ -61,8 +61,8 @@
       // No more data to read.
       break;
     }
-    QUIC_DVLOG(1) << "Processed " << iov.iov_len << " bytes for stream "
-                  << id();
+    QUIC_DVLOG(1) << "Stream " << id() << " processed " << iov.iov_len
+                  << " bytes.";
     body_.append(static_cast<char*>(iov.iov_base), iov.iov_len);
 
     if (content_length_ >= 0 &&
@@ -100,7 +100,7 @@
   request_headers_ = std::move(push_request_headers);
   content_length_ = 0;
   QUIC_DVLOG(1) << "Stream " << id()
-                << ": Ready to receive server push response.";
+                << " ready to receive server push response.";
 
   // Set as if stream decompresed the headers and received fin.
   QuicSpdyStream::OnInitialHeadersComplete(/*fin=*/true, 0, QuicHeaderList());
@@ -188,8 +188,8 @@
   }
   std::list<QuicHttpResponseCache::ServerPushInfo> resources =
       response_cache_->GetServerPushResources(request_url);
-  QUIC_DVLOG(1) << "Found " << resources.size() << " push resources for stream "
-                << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " found " << resources.size()
+                << " push resources.";
 
   if (!resources.empty()) {
     QuicSimpleServerSession* session =
@@ -198,13 +198,13 @@
                                   request_headers_);
   }
 
-  QUIC_DVLOG(1) << "Sending response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending response.";
   SendHeadersAndBodyAndTrailers(response->headers().Clone(), response->body(),
                                 response->trailers().Clone());
 }
 
 void QuicSimpleServerStream::SendNotFoundResponse() {
-  QUIC_DVLOG(1) << "Sending not found response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending not found response.";
   SpdyHeaderBlock headers;
   headers[":status"] = "404";
   headers["content-length"] =
@@ -213,7 +213,7 @@
 }
 
 void QuicSimpleServerStream::SendErrorResponse() {
-  QUIC_DVLOG(1) << "Sending error response for stream " << id();
+  QUIC_DVLOG(1) << "Stream " << id() << " sending error response.";
   SpdyHeaderBlock headers;
   headers[":status"] = "500";
   headers["content-length"] =
@@ -238,7 +238,7 @@
 
   // Send the headers, with a FIN if there's nothing else to send.
   bool send_fin = (body.empty() && response_trailers.empty());
-  QUIC_DLOG(INFO) << "Writing headers (fin = " << send_fin
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing headers (fin = " << send_fin
                   << ") : " << response_headers.DebugString();
   WriteHeaders(std::move(response_headers), send_fin, nullptr);
   if (send_fin) {
@@ -248,7 +248,7 @@
 
   // Send the body, with a FIN if there's no trailers to send.
   send_fin = response_trailers.empty();
-  QUIC_DLOG(INFO) << "Writing body (fin = " << send_fin
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing body (fin = " << send_fin
                   << ") with size: " << body.size();
   if (!body.empty() || send_fin) {
     WriteOrBufferData(body, send_fin, nullptr);
@@ -259,7 +259,7 @@
   }
 
   // Send the trailers. A FIN is always sent with trailers.
-  QUIC_DLOG(INFO) << "Writing trailers (fin = true): "
+  QUIC_DLOG(INFO) << "Stream " << id() << " writing trailers (fin = true): "
                   << response_trailers.DebugString();
   WriteTrailers(std::move(response_trailers), nullptr);
 }

diff --git a/net/tools/quic/quic_simple_server_stream_test.cc b/net/tools/quic/quic_simple_server_stream_test.cc
index 3e083ff..4a444e3 100644
--- a/net/tools/quic/quic_simple_server_stream_test.cc
+++ b/net/tools/quic/quic_simple_server_stream_test.cc

@@ -326,7 +326,9 @@
 
   QuicSimpleServerStreamPeer::SendResponse(stream_);
   EXPECT_FALSE(QuicStreamPeer::read_side_closed(stream_));
-  EXPECT_TRUE(stream_->reading_stopped());
+  if (!FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_TRUE(stream_->reading_stopped());
+  }
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
@@ -357,7 +359,9 @@
 
   QuicSimpleServerStreamPeer::SendResponse(stream_);
   EXPECT_FALSE(QuicStreamPeer::read_side_closed(stream_));
-  EXPECT_TRUE(stream_->reading_stopped());
+  if (!FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_TRUE(stream_->reading_stopped());
+  }
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
@@ -413,7 +417,9 @@
 
   QuicSimpleServerStreamPeer::SendResponse(stream_);
   EXPECT_FALSE(QuicStreamPeer::read_side_closed(stream_));
-  EXPECT_TRUE(stream_->reading_stopped());
+  if (!FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_TRUE(stream_->reading_stopped());
+  }
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
@@ -517,7 +523,9 @@
 
   QuicSimpleServerStreamPeer::SendErrorResponse(stream_);
   EXPECT_FALSE(QuicStreamPeer::read_side_closed(stream_));
-  EXPECT_TRUE(stream_->reading_stopped());
+  if (!FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_TRUE(stream_->reading_stopped());
+  }
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
@@ -577,6 +585,9 @@
 }
 
 TEST_P(QuicSimpleServerStreamTest, SendQuicRstStreamNoErrorWithEarlyResponse) {
+  if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    return;
+  }
   InSequence s;
   EXPECT_CALL(session_, WriteHeadersMock(stream_->id(), _, false, _, _));
   EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))

diff --git a/net/tools/quic/quic_spdy_client_stream_test.cc b/net/tools/quic/quic_spdy_client_stream_test.cc
index c7140860..915d539 100644
--- a/net/tools/quic/quic_spdy_client_stream_test.cc
+++ b/net/tools/quic/quic_spdy_client_stream_test.cc

@@ -168,6 +168,9 @@
 }
 
 TEST_F(QuicSpdyClientStreamTest, TestNoBidirectionalStreaming) {
+  if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    return;
+  }
   QuicStreamFrame frame(kClientDataStreamId1, false, 3, StringPiece("asd"));
 
   EXPECT_FALSE(stream_->write_side_closed());
@@ -196,9 +199,14 @@
 
   // Now send the body, which should close the stream as the FIN has been
   // received, as well as all data.
-  EXPECT_CALL(session_, CloseStream(stream_->id()));
+  if (!FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_CALL(session_, CloseStream(stream_->id()));
+  }
   stream_->OnStreamFrame(
       QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, body_));
+  if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
+    EXPECT_TRUE(stream_->reading_stopped());
+  }
 }
 
 }  // namespace

diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index ff6b766..9066b59 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h

@@ -57,10 +57,6 @@
   QuicConnectionId GenerateNewConnectionId() override;
   void UseWriter(QuicPacketWriterWrapper* writer);
   void UseConnectionId(QuicConnectionId connection_id);
-  void SendCachedNetworkParamaters(
-      const CachedNetworkParameters& cached_network_params) {
-    cached_network_paramaters_ = cached_network_params;
-  }
   const QuicReceivedPacket* last_incoming_packet() {
     return last_incoming_packet_.get();
   }
@@ -243,8 +239,6 @@
     allow_bidirectional_data_ = value;
   }
 
-  bool allow_bidirectional_data() const { return allow_bidirectional_data_; }
-
   size_t num_requests() const { return num_requests_; }
 
   size_t num_responses() const { return num_responses_; }

diff --git a/printing/OWNERS b/printing/OWNERS
index 7487e48a..db535f8 100644
--- a/printing/OWNERS
+++ b/printing/OWNERS

@@ -7,3 +7,5 @@
 
 per-file printing_context_android*=avayvod@chromium.org
 per-file printing_context_android*=dgn@chromium.org
+
+# COMPONENT: Internals>Printing

diff --git a/sandbox/win/src/process_mitigations_win32k_dispatcher.cc b/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
index 36db426..347cdf14 100644
--- a/sandbox/win/src/process_mitigations_win32k_dispatcher.cc
+++ b/sandbox/win/src/process_mitigations_win32k_dispatcher.cc

@@ -193,7 +193,7 @@
                          GETCERTIFICATE_ID, 20)) {
         return false;
       }
-      if (base::win::GetVersion() < base::win::VERSION_WIN10)
+      if (base::win::GetVersion() < base::win::VERSION_WIN10_TH2)
         return true;
       if (!INTERCEPT_EAT(manager, L"gdi32.dll", GetCertificateByHandle,
                          GETCERTIFICATEBYHANDLE_ID, 20)) {
@@ -206,7 +206,7 @@
                          GETCERTIFICATESIZE_ID, 16)) {
         return false;
       }
-      if (base::win::GetVersion() < base::win::VERSION_WIN10)
+      if (base::win::GetVersion() < base::win::VERSION_WIN10_TH2)
         return true;
       if (!INTERCEPT_EAT(manager, L"gdi32.dll", GetCertificateSizeByHandle,
                          GETCERTIFICATESIZEBYHANDLE_ID, 16)) {

diff --git a/services/ui/demo/mus_demo.cc b/services/ui/demo/mus_demo.cc
index 565c058e..7afba569 100644
--- a/services/ui/demo/mus_demo.cc
+++ b/services/ui/demo/mus_demo.cc

@@ -31,15 +31,32 @@
                                      display::DisplayList::Type::PRIMARY);
 }
 
-void MusDemo::InitWindowTreeData(
-    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
-  DCHECK(window_tree_data_);
-  DCHECK(!window_tree_data_->IsInitialized());
-  window_tree_data_->Init(std::move(window_tree_host));
+bool MusDemo::HasPendingWindowTreeData() const {
+  return !window_tree_data_list_.empty() &&
+         !window_tree_data_list_.back()->IsInitialized();
 }
 
-void MusDemo::CleanupWindowTreeData() {
-  window_tree_data_.reset();
+void MusDemo::AppendWindowTreeData(
+    std::unique_ptr<WindowTreeData> window_tree_data) {
+  DCHECK(!HasPendingWindowTreeData());
+  window_tree_data_list_.push_back(std::move(window_tree_data));
+}
+
+void MusDemo::InitWindowTreeData(
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+  DCHECK(HasPendingWindowTreeData());
+  window_tree_data_list_.back()->Init(std::move(window_tree_host));
+}
+
+void MusDemo::RemoveWindowTreeData(aura::WindowTreeHostMus* window_tree_host) {
+  DCHECK(window_tree_host);
+  auto it =
+      std::find_if(window_tree_data_list_.begin(), window_tree_data_list_.end(),
+                   [window_tree_host](std::unique_ptr<WindowTreeData>& data) {
+                     return data->WindowTreeHost() == window_tree_host;
+                   });
+  DCHECK(it != window_tree_data_list_.end());
+  window_tree_data_list_.erase(it);
 }
 
 void MusDemo::OnStart() {
@@ -51,7 +68,8 @@
   property_converter_ = base::MakeUnique<aura::PropertyConverter>();
   wm_state_ = base::MakeUnique<::wm::WMState>();
 
-  OnStartImpl(&window_tree_client_, &window_tree_data_);
+  window_tree_client_ = CreateWindowTreeClient();
+  OnStartImpl();
 
   env_->SetWindowTreeClient(window_tree_client_.get());
 }
@@ -76,7 +94,7 @@
 
 void MusDemo::OnLostConnection(aura::WindowTreeClient* client) {
   window_tree_client_.reset();
-  CleanupWindowTreeData();
+  window_tree_data_list_.clear();
 }
 
 void MusDemo::OnPointerEventObserved(const PointerEvent& event,

diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h
index bf8c127..251a505 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h

@@ -44,14 +44,28 @@
 
  protected:
   void AddPrimaryDisplay(const display::Display& display);
+
+  // These functions help to manage the list of WindowTreeData structures.
+  // AppendWindowTreeData is used to add an uninitialized structure at the end
+  // of the list. When a new WindowTreeHostMus is created and is sent to
+  // MusDemo (via OnWmNewDisplay or OnEmbed), the WindowTreeData is initialized
+  // by a call to InitWindowTreeData and the demo starts. When the destruction
+  // of the WindowTreeHostMus is announced to MusDemo (via OnWmDisplayRemoved
+  // or OnEmbedRootDestroyed), the corresponding WindowTreeData is removed by
+  // a call to RemoveWindowTreeData.
+  void AppendWindowTreeData(std::unique_ptr<WindowTreeData> window_tree_data);
   void InitWindowTreeData(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
-  void CleanupWindowTreeData();
+  void RemoveWindowTreeData(aura::WindowTreeHostMus* window_tree_host);
+
+  aura::WindowTreeClient* window_tree_client() {
+    return window_tree_client_.get();
+  }
 
  private:
-  virtual void OnStartImpl(
-      std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-      std::unique_ptr<WindowTreeData>* window_tree_data) = 0;
+  virtual void OnStartImpl() = 0;
+  virtual std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() = 0;
+  bool HasPendingWindowTreeData() const;
 
   // service_manager::Service:
   void OnStart() override;
@@ -76,7 +90,10 @@
   std::unique_ptr<::wm::WMState> wm_state_;
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
-  std::unique_ptr<WindowTreeData> window_tree_data_;
+  // List of WindowTreeData structures. When a new window is opened, its data
+  // is appended at the end of that list and it remains uninitialized until the
+  // next call to InitWindowTreeData.
+  std::vector<std::unique_ptr<WindowTreeData>> window_tree_data_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };

diff --git a/services/ui/demo/mus_demo_external.cc b/services/ui/demo/mus_demo_external.cc
index d402628..88d9f369 100644
--- a/services/ui/demo/mus_demo_external.cc
+++ b/services/ui/demo/mus_demo_external.cc

@@ -24,49 +24,81 @@
                          mojom::WindowTreeClientPtr tree_client,
                          int square_size)
       : WindowTreeData(square_size) {
+    // TODO(tonikitoo,fwang): Extend the API to allow creating WindowTreeHost
+    // using the WindowTreeClient.
     factory->CreateWindowTreeHost(MakeRequest(&host_), std::move(tree_client));
   }
 
  private:
   // Holds the Mojo pointer to the window tree host.
   mojom::WindowTreeHostPtr host_;
+
+  DISALLOW_COPY_AND_ASSIGN(WindowTreeDataExternal);
 };
 
-// Size of square in pixels to draw.
-const int kSquareSize = 500;
+// Number of windows to open.
+// TODO(tonikitoo,fwang): Open multiple windows.
+const size_t kNumberOfWindows = 1;
+
+int GetSquareSizeForWindow(int window_index) {
+  return 50 * window_index + 400;
+};
+
 }  // namespace
 
 MusDemoExternal::MusDemoExternal() {}
 
 MusDemoExternal::~MusDemoExternal() {}
 
-void MusDemoExternal::OnStartImpl(
-    std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-    std::unique_ptr<WindowTreeData>* window_tree_data) {
+std::unique_ptr<aura::WindowTreeClient>
+MusDemoExternal::CreateWindowTreeClient() {
+  return base::MakeUnique<aura::WindowTreeClient>(
+      context()->connector(), this, nullptr,
+      MakeRequest(&window_tree_client_mojo_));
+}
+
+void MusDemoExternal::OnStartImpl() {
+  // TODO(tonikitoo,fwang): Extend the WindowTreeClient API to allow connection
+  // to the window tree host factory using window_tree_client().
   context()->connector()->BindInterface(ui::mojom::kServiceName,
                                         &window_tree_host_factory_);
-  mojom::WindowTreeClientPtr tree_client;
-  *window_tree_client = base::MakeUnique<aura::WindowTreeClient>(
-      context()->connector(), this, nullptr, MakeRequest(&tree_client));
-  // TODO(tonikitoo,fwang): Open two external windows with different square
-  // sizes.
-  *window_tree_data = base::MakeUnique<WindowTreeDataExternal>(
-      window_tree_host_factory_.get(), std::move(tree_client), kSquareSize);
 
   // TODO(tonikitoo,fwang): Implement management of displays in external mode.
   // For now, a fake display is created in order to work around an assertion in
   // aura::GetDeviceScaleFactorFromDisplay().
   AddPrimaryDisplay(display::Display(0));
+
+  // The number of windows to open is specified by kNumberOfWindows. The windows
+  // are opened sequentially (the first one here and the others after each call
+  // to OnEmbed) to ensure that the WindowTreeHostMus passed to OnEmbed
+  // corresponds to the WindowTreeDataExternal::host_ created in OpenNewWindow.
+  OpenNewWindow();
+}
+
+void MusDemoExternal::OpenNewWindow() {
+  // TODO(tonikitoo,fwang): Extend the WindowTreeClient API to allow creation
+  // of window tree host. Then pass window_tree_client() here and remove
+  // window_tree_host_factory_ and window_tree_client_mojo_. Currently
+  // window_tree_client_mojo_ is only initialized once so this is incorrect when
+  // kNumberOfWindows > 1.
+  AppendWindowTreeData(base::MakeUnique<WindowTreeDataExternal>(
+      window_tree_host_factory_.get(), std::move(window_tree_client_mojo_),
+      GetSquareSizeForWindow(initialized_windows_count_)));
 }
 
 void MusDemoExternal::OnEmbed(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   InitWindowTreeData(std::move(window_tree_host));
+  initialized_windows_count_++;
+
+  // Open the next window until the requested number of windows is reached.
+  if (initialized_windows_count_ < kNumberOfWindows)
+    OpenNewWindow();
 }
 
 void MusDemoExternal::OnEmbedRootDestroyed(
     aura::WindowTreeHostMus* window_tree_host) {
-  CleanupWindowTreeData();
+  RemoveWindowTreeData(window_tree_host);
 }
 
 }  // namespace demo

diff --git a/services/ui/demo/mus_demo_external.h b/services/ui/demo/mus_demo_external.h
index a3a8ca9..13f920a 100644
--- a/services/ui/demo/mus_demo_external.h
+++ b/services/ui/demo/mus_demo_external.h

@@ -22,15 +22,19 @@
   ~MusDemoExternal() final;
 
  private:
+  void OpenNewWindow();
+
   // ui::demo::MusDemo:
-  void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-                   std::unique_ptr<WindowTreeData>* window_tree_data) final;
+  void OnStartImpl() final;
+  std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) final;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) final;
 
   mojom::WindowTreeHostFactoryPtr window_tree_host_factory_;
+  mojom::WindowTreeClientPtr window_tree_client_mojo_;
+  size_t initialized_windows_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemoExternal);
 };

diff --git a/services/ui/demo/mus_demo_internal.cc b/services/ui/demo/mus_demo_internal.cc
index 153ffbb..6c21256 100644
--- a/services/ui/demo/mus_demo_internal.cc
+++ b/services/ui/demo/mus_demo_internal.cc

@@ -22,13 +22,16 @@
 
 MusDemoInternal::~MusDemoInternal() {}
 
-void MusDemoInternal::OnStartImpl(
-    std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-    std::unique_ptr<WindowTreeData>* window_tree_data) {
-  *window_tree_client = base::MakeUnique<aura::WindowTreeClient>(
-      context()->connector(), this, this);
-  window_tree_client->get()->ConnectAsWindowManager();
-  *window_tree_data = base::MakeUnique<WindowTreeData>(kSquareSize);
+std::unique_ptr<aura::WindowTreeClient>
+MusDemoInternal::CreateWindowTreeClient() {
+  return base::MakeUnique<aura::WindowTreeClient>(context()->connector(), this,
+                                                  this);
+}
+
+void MusDemoInternal::OnStartImpl() {
+  window_tree_client()->ConnectAsWindowManager();
+  // The demo will actually start when the window server creates the display,
+  // causing OnWmNewDisplay to be called.
 }
 
 void MusDemoInternal::SetWindowManagerClient(
@@ -67,12 +70,13 @@
 void MusDemoInternal::OnWmNewDisplay(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display) {
+  AppendWindowTreeData(base::MakeUnique<WindowTreeData>(kSquareSize));
   InitWindowTreeData(std::move(window_tree_host));
 }
 
 void MusDemoInternal::OnWmDisplayRemoved(
     aura::WindowTreeHostMus* window_tree_host) {
-  CleanupWindowTreeData();
+  RemoveWindowTreeData(window_tree_host);
 }
 
 void MusDemoInternal::OnWmDisplayModified(const display::Display& display) {}

diff --git a/services/ui/demo/mus_demo_internal.h b/services/ui/demo/mus_demo_internal.h
index 3a72654..ee93d5e 100644
--- a/services/ui/demo/mus_demo_internal.h
+++ b/services/ui/demo/mus_demo_internal.h

@@ -27,8 +27,8 @@
 
  private:
   // ui::demo::MusDemo:
-  void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-                   std::unique_ptr<WindowTreeData>* window_tree_data) final;
+  void OnStartImpl() final;
+  std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final;
 
   // aura::WindowManagerDelegate:
   void SetWindowManagerClient(aura::WindowManagerClient* client) final;

diff --git a/services/ui/demo/window_tree_data.h b/services/ui/demo/window_tree_data.h
index 0e1bcbd..007b04f6d 100644
--- a/services/ui/demo/window_tree_data.h
+++ b/services/ui/demo/window_tree_data.h

@@ -29,6 +29,10 @@
   void Init(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
   bool IsInitialized() const { return !!window_tree_host_; }
 
+  const aura::WindowTreeHostMus* WindowTreeHost() const {
+    return window_tree_host_.get();
+  }
+
  private:
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();

diff --git a/services/ui/gpu/gpu_service.h b/services/ui/gpu/gpu_service.h
index 252da6cc..04b7df3 100644
--- a/services/ui/gpu/gpu_service.h
+++ b/services/ui/gpu/gpu_service.h

@@ -76,13 +76,6 @@
  private:
   friend class GpuMain;
 
-  gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
-      gfx::GpuMemoryBufferHandle buffer_handle,
-      gfx::GpuMemoryBufferId id,
-      const gfx::Size& size,
-      gfx::BufferFormat format,
-      int client_id);
-
   gpu::SyncPointManager* sync_point_manager() { return sync_point_manager_; }
 
   gpu::gles2::MailboxManager* mailbox_manager() {

diff --git a/services/ui/surfaces/display_compositor.cc b/services/ui/surfaces/display_compositor.cc
index fb14a1ee..6ddd4433 100644
--- a/services/ui/surfaces/display_compositor.cc
+++ b/services/ui/surfaces/display_compositor.cc

@@ -50,25 +50,6 @@
   manager_.RemoveObserver(this);
 }
 
-void DisplayCompositor::OnClientConnectionLost(
-    const cc::FrameSinkId& frame_sink_id,
-    bool destroy_compositor_frame_sink) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (destroy_compositor_frame_sink)
-    DestroyCompositorFrameSink(frame_sink_id);
-  // TODO(fsamuel): Tell the display compositor host that the client connection
-  // has been lost so that it can drop its private connection and allow a new
-  // client instance to create a new CompositorFrameSink.
-}
-
-void DisplayCompositor::OnPrivateConnectionLost(
-    const cc::FrameSinkId& frame_sink_id,
-    bool destroy_compositor_frame_sink) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (destroy_compositor_frame_sink)
-    DestroyCompositorFrameSink(frame_sink_id);
-}
-
 void DisplayCompositor::CreateRootCompositorFrameSink(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
@@ -108,6 +89,20 @@
           std::move(private_request), std::move(client));
 }
 
+void DisplayCompositor::RegisterFrameSinkHierarchy(
+    const cc::FrameSinkId& parent_frame_sink_id,
+    const cc::FrameSinkId& child_frame_sink_id) {
+  manager_.RegisterFrameSinkHierarchy(parent_frame_sink_id,
+                                      child_frame_sink_id);
+}
+
+void DisplayCompositor::UnregisterFrameSinkHierarchy(
+    const cc::FrameSinkId& parent_frame_sink_id,
+    const cc::FrameSinkId& child_frame_sink_id) {
+  manager_.UnregisterFrameSinkHierarchy(parent_frame_sink_id,
+                                        child_frame_sink_id);
+}
+
 std::unique_ptr<cc::Display> DisplayCompositor::CreateDisplay(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
@@ -170,4 +165,23 @@
 void DisplayCompositor::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                                          bool* changed) {}
 
+void DisplayCompositor::OnClientConnectionLost(
+    const cc::FrameSinkId& frame_sink_id,
+    bool destroy_compositor_frame_sink) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (destroy_compositor_frame_sink)
+    DestroyCompositorFrameSink(frame_sink_id);
+  // TODO(fsamuel): Tell the display compositor host that the client connection
+  // has been lost so that it can drop its private connection and allow a new
+  // client instance to create a new CompositorFrameSink.
+}
+
+void DisplayCompositor::OnPrivateConnectionLost(
+    const cc::FrameSinkId& frame_sink_id,
+    bool destroy_compositor_frame_sink) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (destroy_compositor_frame_sink)
+    DestroyCompositorFrameSink(frame_sink_id);
+}
+
 }  // namespace ui

diff --git a/services/ui/surfaces/display_compositor.h b/services/ui/surfaces/display_compositor.h
index a796896..fbc8565 100644
--- a/services/ui/surfaces/display_compositor.h
+++ b/services/ui/surfaces/display_compositor.h

@@ -62,12 +62,6 @@
 
   cc::SurfaceManager* manager() { return &manager_; }
 
-  // display_compositor::GpuCompositorFrameSinkDelegate implementation.
-  void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
-                              bool destroy_compositor_frame_sink) override;
-  void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
-                               bool destroy_compositor_frame_sink) override;
-
   // cc::mojom::DisplayCompositor implementation:
   void CreateRootCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
@@ -82,6 +76,12 @@
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client) override;
+  void RegisterFrameSinkHierarchy(
+      const cc::FrameSinkId& parent_frame_sink_id,
+      const cc::FrameSinkId& child_frame_sink_id) override;
+  void UnregisterFrameSinkHierarchy(
+      const cc::FrameSinkId& parent_frame_sink_id,
+      const cc::FrameSinkId& child_frame_sink_id) override;
 
  private:
   std::unique_ptr<cc::Display> CreateDisplay(
@@ -89,16 +89,6 @@
       gpu::SurfaceHandle surface_handle,
       cc::SyntheticBeginFrameSource* begin_frame_source);
 
-  void CreateCompositorFrameSinkInternal(
-      const cc::FrameSinkId& frame_sink_id,
-      gpu::SurfaceHandle surface_handle,
-      std::unique_ptr<cc::Display> display,
-      std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
-      cc::mojom::MojoCompositorFrameSinkRequest request,
-      cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
-      cc::mojom::MojoCompositorFrameSinkClientPtr client,
-      cc::mojom::DisplayPrivateRequest display_private_request);
-
   // It is necessary to pass |frame_sink_id| by value because the id
   // is owned by the GpuCompositorFrameSink in the map. When the sink is
   // removed from the map, |frame_sink_id| would also be destroyed if it were a
@@ -111,6 +101,12 @@
   void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                         bool* changed) override;
 
+  // display_compositor::GpuCompositorFrameSinkDelegate implementation.
+  void OnClientConnectionLost(const cc::FrameSinkId& frame_sink_id,
+                              bool destroy_compositor_frame_sink) override;
+  void OnPrivateConnectionLost(const cc::FrameSinkId& frame_sink_id,
+                               bool destroy_compositor_frame_sink) override;
+
   // SurfaceManager should be the first object constructed and the last object
   // destroyed in order to ensure that all other objects that depend on it have
   // access to a valid pointer for the entirety of their liftimes.

diff --git a/services/ui/ws/server_window.cc b/services/ui/ws/server_window.cc
index b1e6573..9c5bce0 100644
--- a/services/ui/ws/server_window.cc
+++ b/services/ui/ws/server_window.cc

@@ -26,6 +26,7 @@
                            const Properties& properties)
     : delegate_(delegate),
       id_(id),
+      frame_sink_id_(WindowIdToTransportId(id), 0),
       parent_(nullptr),
       stacking_target_(nullptr),
       transient_parent_(nullptr),
@@ -117,18 +118,12 @@
   for (auto& observer : child->observers_)
     observer.OnWillChangeWindowHierarchy(child, this, old_parent);
 
-  ServerWindow* old_root = child->GetRoot();
-  ServerWindow* new_root = GetRoot();
-
   if (child->parent())
     child->parent()->RemoveImpl(child);
 
   child->parent_ = this;
   children_.push_back(child);
 
-  if (old_root != new_root)
-    child->ProcessRootChanged(old_root, new_root);
-
   // Stack the child properly if it is a transient child of a sibling.
   if (child->transient_parent_ && child->transient_parent_->parent() == this)
     RestackTransientDescendants(child->transient_parent_, &GetStackingTarget,
@@ -149,9 +144,6 @@
 
   RemoveImpl(child);
 
-  if (GetRoot() != nullptr)
-    child->ProcessRootChanged(GetRoot(), nullptr);
-
   // Stack the child properly if it is a transient child of a sibling.
   if (child->transient_parent_ && child->transient_parent_->parent() == this)
     RestackTransientDescendants(child->transient_parent_, &GetStackingTarget,
@@ -431,14 +423,6 @@
   children_.erase(std::find(children_.begin(), children_.end(), window));
 }
 
-void ServerWindow::ProcessRootChanged(ServerWindow* old_root,
-                                      ServerWindow* new_root) {
-  if (compositor_frame_sink_manager_)
-    compositor_frame_sink_manager_->OnRootChanged(old_root, new_root);
-  for (ServerWindow* child : children_)
-    child->ProcessRootChanged(old_root, new_root);
-}
-
 void ServerWindow::OnStackingChanged() {
   if (stacking_target_) {
     Windows::const_iterator window_i = std::find(

diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index f57f2201..bab09d0 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h

@@ -72,6 +72,8 @@
 
   const WindowId& id() const { return id_; }
 
+  const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
+
   void Add(ServerWindow* child);
   void Remove(ServerWindow* child);
   void Reorder(ServerWindow* relative, mojom::OrderDirection diretion);
@@ -211,10 +213,6 @@
   // Implementation of removing a window. Doesn't send any notification.
   void RemoveImpl(ServerWindow* window);
 
-  // Called when the root window changes from |old_root| to |new_root|. This is
-  // called after the window is moved from |old_root| to |new_root|.
-  void ProcessRootChanged(ServerWindow* old_root, ServerWindow* new_root);
-
   // Called when this window's stacking order among its siblings is changed.
   void OnStackingChanged();
 
@@ -228,6 +226,7 @@
 
   ServerWindowDelegate* delegate_;
   const WindowId id_;
+  cc::FrameSinkId frame_sink_id_;
   ServerWindow* parent_;
   Windows children_;
 

diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.cc b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
index 1053faf..4849b90a1 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.cc

@@ -26,12 +26,9 @@
     cc::mojom::MojoCompositorFrameSinkAssociatedRequest sink_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateAssociatedRequest display_request) {
-  cc::FrameSinkId frame_sink_id(WindowIdToTransportId(window_->id()), 0);
-
   if (!frame_sink_data_)
     frame_sink_data_ = base::MakeUnique<CompositorFrameSinkData>();
 
-  frame_sink_data_->frame_sink_id = frame_sink_id;
   cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request;
   if (frame_sink_data_->pending_compositor_frame_sink_request.is_pending()) {
     private_request =
@@ -45,28 +42,17 @@
   // or Android. We should instead use GpuSurfaceTracker here on those
   // platforms.
   window_->delegate()->GetDisplayCompositor()->CreateRootCompositorFrameSink(
-      frame_sink_id, widget, std::move(sink_request),
+      window_->frame_sink_id(), widget, std::move(sink_request),
       std::move(private_request), std::move(client),
       std::move(display_request));
-
-  if (window_->parent()) {
-    ServerWindow* root_window = window_->GetRoot();
-    if (root_window) {
-      root_window->GetOrCreateCompositorFrameSinkManager()->AddChildFrameSinkId(
-          frame_sink_id);
-    }
-  }
 }
 
 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSink(
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client) {
-  cc::FrameSinkId frame_sink_id(WindowIdToTransportId(window_->id()), 0);
-
   if (!frame_sink_data_)
     frame_sink_data_ = base::MakeUnique<CompositorFrameSinkData>();
 
-  frame_sink_data_->frame_sink_id = frame_sink_id;
   cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request;
   if (frame_sink_data_->pending_compositor_frame_sink_request.is_pending()) {
     private_request =
@@ -77,50 +63,8 @@
   }
 
   window_->delegate()->GetDisplayCompositor()->CreateCompositorFrameSink(
-      frame_sink_id, std::move(request), std::move(private_request),
+      window_->frame_sink_id(), std::move(request), std::move(private_request),
       std::move(client));
-
-  if (window_->parent()) {
-    ServerWindow* root_window = window_->GetRoot();
-    if (root_window) {
-      root_window->GetOrCreateCompositorFrameSinkManager()->AddChildFrameSinkId(
-          frame_sink_id);
-    }
-  }
-}
-
-void ServerWindowCompositorFrameSinkManager::AddChildFrameSinkId(
-    const cc::FrameSinkId& frame_sink_id) {
-  if (frame_sink_data_) {
-    frame_sink_data_->compositor_frame_sink->AddChildFrameSink(frame_sink_id);
-    return;
-  }
-  frame_sink_data_ = base::MakeUnique<CompositorFrameSinkData>();
-  frame_sink_data_->pending_compositor_frame_sink_request =
-      mojo::MakeRequest(&frame_sink_data_->compositor_frame_sink);
-  frame_sink_data_->compositor_frame_sink->AddChildFrameSink(frame_sink_id);
-}
-
-void ServerWindowCompositorFrameSinkManager::RemoveChildFrameSinkId(
-    const cc::FrameSinkId& frame_sink_id) {
-  DCHECK(frame_sink_data_);
-  frame_sink_data_->compositor_frame_sink->RemoveChildFrameSink(frame_sink_id);
-}
-
-void ServerWindowCompositorFrameSinkManager::OnRootChanged(
-    ServerWindow* old_root,
-    ServerWindow* new_root) {
-  if (!frame_sink_data_)
-    return;
-
-  if (old_root) {
-    old_root->GetOrCreateCompositorFrameSinkManager()->RemoveChildFrameSinkId(
-        frame_sink_data_->frame_sink_id);
-  }
-  if (new_root) {
-    new_root->GetOrCreateCompositorFrameSinkManager()->AddChildFrameSinkId(
-        frame_sink_data_->frame_sink_id);
-  }
 }
 
 CompositorFrameSinkData::CompositorFrameSinkData() {}

diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.h b/services/ui/ws/server_window_compositor_frame_sink_manager.h
index f45782a..8eb887b 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.h
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.h

@@ -30,7 +30,6 @@
   cc::mojom::MojoCompositorFrameSinkPrivatePtr compositor_frame_sink;
   cc::mojom::MojoCompositorFrameSinkPrivateRequest
       pending_compositor_frame_sink_request;
-  cc::FrameSinkId frame_sink_id;
 };
 
 // ServerWindowCompositorFrameSinkManager tracks the surfaces associated with a
@@ -52,18 +51,6 @@
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
-  // Adds the provided |frame_sink_id| to this ServerWindow's associated
-  // CompositorFrameSink if possible. If this ServerWindow does not have
-  // an associated CompositorFrameSink then this method will recursively
-  // walk up the window hierarchy and register itself with the first ancestor
-  // that has a CompositorFrameSink of the same type. This method returns
-  // the FrameSinkId that is the first composited ancestor of the ServerWindow
-  // assocaited with the provided |frame_sink_id|.
-  void AddChildFrameSinkId(const cc::FrameSinkId& frame_sink_id);
-  void RemoveChildFrameSinkId(const cc::FrameSinkId& frame_sink_id);
-
-  void OnRootChanged(ServerWindow* old_root, ServerWindow* new_root);
-
  private:
   friend class ServerWindowCompositorFrameSinkManagerTestApi;
   friend class ServerWindowCompositorFrameSink;

diff --git a/services/ui/ws/window_manager_window_tree_factory.cc b/services/ui/ws/window_manager_window_tree_factory.cc
index 9b8a55e..26be4b7 100644
--- a/services/ui/ws/window_manager_window_tree_factory.cc
+++ b/services/ui/ws/window_manager_window_tree_factory.cc

@@ -16,11 +16,8 @@
     WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set,
     const UserId& user_id,
     mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request)
-    : window_manager_window_tree_factory_set_(
-          window_manager_window_tree_factory_set),
-      user_id_(user_id),
-      binding_(this),
-      window_tree_(nullptr) {
+    : WindowManagerWindowTreeFactory(window_manager_window_tree_factory_set,
+                                     user_id) {
   if (request.is_pending())
     binding_.Bind(std::move(request));
 }

diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index 6ca2249..3b0446d 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc

@@ -638,6 +638,15 @@
 
   ProcessWindowHierarchyChanged(window, new_parent, old_parent);
 
+  if (old_parent) {
+    display_compositor_->UnregisterFrameSinkHierarchy(
+        old_parent->frame_sink_id(), window->frame_sink_id());
+  }
+  if (new_parent) {
+    display_compositor_->RegisterFrameSinkHierarchy(new_parent->frame_sink_id(),
+                                                    window->frame_sink_id());
+  }
+
   UpdateNativeCursorFromMouseLocation(window);
 }
 

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index 8545bb3..7388854 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h

@@ -224,8 +224,8 @@
 #   define SK_SUPPORT_LEGACY_CLIPOP_EXOTIC_NAMES
 #endif
 
-#ifndef SK_SUPPORT_LEGACY_CANVAS_HELPERS
-#define SK_SUPPORT_LEGACY_CANVAS_HELPERS
+#ifndef SK_SUPPORT_LEGACY_PATHEFFECT_SUBCLASSES
+#define SK_SUPPORT_LEGACY_PATHEFFECT_SUBCLASSES
 #endif
 
 ///////////////////////// Imported from BUILD.gn and skia_common.gypi
@@ -258,10 +258,6 @@
 // Updating to a correct SkPMColor lerp will require layout test rebaselines.
 #define SK_SUPPORT_LEGACY_BROKEN_LERP
 
-#ifndef    SK_SUPPORT_LEGACY_AAA
-#   define SK_SUPPORT_LEGACY_AAA
-#endif
-
 // ===== End Chrome-specific definitions =====
 
 #endif

diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index 8519cba..fda4ee98 100644
--- a/skia/ext/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h

@@ -14,7 +14,6 @@
 
 struct SkIRect;
 struct SkRect;
-class SkCanvas;
 class SkMatrix;
 #ifdef __LP64__
 typedef CGSize NSSize;
@@ -93,48 +92,6 @@
 // TODO(thakis): Remove this -- http://crbug.com/69432
 SK_API NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
-// Converts a SkCanvas temporarily to a CGContext
-class SK_API SkiaBitLocker {
- public:
-  /**
-    User clip rect is an *additional* clip to be applied in addition to the
-    current state of the canvas, in *local* rather than device coordinates.
-    If no additional clipping is desired, pass in
-    SkIRect::MakeSize(canvas->getBaseLayerSize()) transformed by the inverse
-    CTM.
-   */
-  SkiaBitLocker(SkCanvas* canvas,
-                const SkIRect& userClipRect,
-                SkScalar bitmapScaleFactor = 1);
-  ~SkiaBitLocker();
-  CGContextRef cgContext();
-  bool hasEmptyClipRegion() const;
-
- private:
-  void releaseIfNeeded();
-  SkIRect computeDirtyRect();
-
-  SkCanvas* canvas_;
-
-  CGContextRef cgContext_;
-  // offscreen_ is only valid if useDeviceBits_ is false
-  SkBitmap offscreen_;
-  SkIPoint bitmapOffset_;
-  SkScalar bitmapScaleFactor_;
-
-  // True if we are drawing to |canvas_|'s backing store directly.
-  // Otherwise, the bits in |bitmap_| are our allocation and need to
-  // be copied over to |canvas_|.
-  bool useDeviceBits_;
-
-  // True if |bitmap_| is a dummy 1x1 bitmap allocated for the sake of creating
-  // a non-NULL CGContext (it is invalid to use a NULL CGContext), and will not
-  // be copied to |canvas_|. This will happen if |canvas_|'s clip region is
-  // empty.
-  bool bitmapIsDummy_;
-};
-
-
 }  // namespace skia
 
 #endif  // SKIA_EXT_SKIA_UTILS_MAC_H_

diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 1b0a2fef..a8518885 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm

@@ -241,126 +241,4 @@
   return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get());
 }
 
-SkiaBitLocker::SkiaBitLocker(SkCanvas* canvas,
-                             const SkIRect& userClipRect,
-                             SkScalar bitmapScaleFactor)
-    : canvas_(canvas),
-      cgContext_(0),
-      bitmapScaleFactor_(bitmapScaleFactor),
-      useDeviceBits_(false),
-      bitmapIsDummy_(false) {
-  canvas_->save();
-  canvas_->clipRect(SkRect::MakeFromIRect(userClipRect));
-}
-
-SkiaBitLocker::~SkiaBitLocker() {
-  releaseIfNeeded();
-  canvas_->restore();
-}
-
-SkIRect SkiaBitLocker::computeDirtyRect() {
-  // If the user specified a clip region, assume that it was tight and that the
-  // dirty rect is approximately the whole bitmap.
-  return SkIRect::MakeWH(offscreen_.width(), offscreen_.height());
-}
-
-// This must be called to balance calls to cgContext
-void SkiaBitLocker::releaseIfNeeded() {
-  if (!cgContext_)
-    return;
-  if (!useDeviceBits_ && !bitmapIsDummy_) {
-    // Find the bits that were drawn to.
-    SkIRect bounds = computeDirtyRect();
-    SkBitmap subset;
-    if (!offscreen_.extractSubset(&subset, bounds)) {
-        return;
-    }
-    subset.setImmutable();  // Prevents a defensive copy inside Skia.
-    canvas_->save();
-    canvas_->setMatrix(SkMatrix::I());  // Reset back to device space.
-    canvas_->translate(bounds.x() + bitmapOffset_.x(),
-                       bounds.y() + bitmapOffset_.y());
-    canvas_->scale(1.f / bitmapScaleFactor_, 1.f / bitmapScaleFactor_);
-    canvas_->drawBitmap(subset, 0, 0);
-    canvas_->restore();
-  }
-  CGContextRelease(cgContext_);
-  cgContext_ = 0;
-  useDeviceBits_ = false;
-  bitmapIsDummy_ = false;
-}
-
-CGContextRef SkiaBitLocker::cgContext() {
-  releaseIfNeeded(); // This flushes any prior bitmap use
-
-  SkIRect clip_bounds;
-  if (!canvas_->getDeviceClipBounds(&clip_bounds)) {
-    // If the clip is empty, then there is nothing to draw. The caller may
-    // attempt to draw (to-be-clipped) results, so ensure there is a dummy
-    // non-NULL CGContext to use.
-    bitmapIsDummy_ = true;
-    clip_bounds = SkIRect::MakeXYWH(0, 0, 1, 1);
-  }
-
-  // remember the top/left, in case we need to compose this later
-  bitmapOffset_.set(clip_bounds.x(), clip_bounds.y());
-
-  // Now make clip_bounds be relative to the current layer/device
-  if (!bitmapIsDummy_) {
-    canvas_->temporary_internal_describeTopLayer(nullptr, &clip_bounds);
-  }
-
-  SkPixmap devicePixels;
-  skia::GetWritablePixels(canvas_, &devicePixels);
-
-  // Only draw directly if we have pixels, and we're only rect-clipped.
-  // If not, we allocate an offscreen and draw into that, relying on the
-  // compositing step to apply skia's clip.
-  useDeviceBits_ = devicePixels.addr() &&
-                   canvas_->isClipRect() &&
-                   !bitmapIsDummy_;
-  base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
-      CGColorSpaceCreateDeviceRGB());
-
-  int displayHeight;
-  if (useDeviceBits_) {
-    SkPixmap subset;
-    bool result = devicePixels.extractSubset(&subset, clip_bounds);
-    DCHECK(result);
-    if (!result)
-      return 0;
-    displayHeight = subset.height();
-    cgContext_ = CGBitmapContextCreate(subset.writable_addr(), subset.width(),
-      subset.height(), 8, subset.rowBytes(), colorSpace, 
-      kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
-  } else {
-    bool result = offscreen_.tryAllocN32Pixels(
-        SkScalarCeilToInt(bitmapScaleFactor_ * clip_bounds.width()),
-        SkScalarCeilToInt(bitmapScaleFactor_ * clip_bounds.height()));
-    DCHECK(result);
-    if (!result)
-      return 0;
-    offscreen_.eraseColor(0);
-    displayHeight = offscreen_.height();
-    cgContext_ = CGBitmapContextCreate(offscreen_.getPixels(),
-      offscreen_.width(), offscreen_.height(), 8, offscreen_.rowBytes(),
-      colorSpace, kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
-  }
-  DCHECK(cgContext_);
-
-  SkMatrix matrix = canvas_->getTotalMatrix();
-  matrix.postTranslate(-SkIntToScalar(bitmapOffset_.x()),
-                       -SkIntToScalar(bitmapOffset_.y()));
-  matrix.postScale(bitmapScaleFactor_, -bitmapScaleFactor_);
-  matrix.postTranslate(0, SkIntToScalar(displayHeight));
-
-  CGContextConcatCTM(cgContext_, SkMatrixToCGAffineTransform(matrix));
-  
-  return cgContext_;
-}
-
-bool SkiaBitLocker::hasEmptyClipRegion() const {
-  return canvas_->isClipEmpty();
-}
-
 }  // namespace skia

diff --git a/skia/ext/skia_utils_mac_unittest.mm b/skia/ext/skia_utils_mac_unittest.mm
index 64f2049..f5906be9 100644
--- a/skia/ext/skia_utils_mac_unittest.mm
+++ b/skia/ext/skia_utils_mac_unittest.mm

@@ -9,7 +9,6 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
@@ -28,14 +27,6 @@
   // Checks that the given bitmap is red.
   void TestSkBitmap(const SkBitmap& bitmap);
 
-  enum BitLockerTest {
-    TestIdentity = 0,
-    TestTranslate = 1,
-    TestClip = 2,
-    TestXClip = TestTranslate | TestClip,
-  };
-  void RunBitLockerTest(BitLockerTest test);
-
   // If not red, is blue.
   // If not tfbit (twenty-four-bit), is 444.
   void ShapeHelper(int width, int height, bool isred, bool tfbit);
@@ -130,45 +121,6 @@
   EXPECT_EQ(255u, SkColorGetA(color));
 }
 
-void SkiaUtilsMacTest::RunBitLockerTest(BitLockerTest test) {
-  const unsigned width = 2;
-  const unsigned height = 2;
-  const unsigned storageSize = width * height;
-  const unsigned original[] = {0xFF333333, 0xFF666666, 0xFF999999, 0xFFCCCCCC};
-  EXPECT_EQ(storageSize, sizeof(original) / sizeof(original[0]));
-  unsigned bits[storageSize];
-  memcpy(bits, original, sizeof(original));
-  SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
-  SkBitmap bitmap;
-  bitmap.installPixels(info, bits, info.minRowBytes());
-
-  SkCanvas canvas(bitmap);
-  if (test & TestTranslate)
-    canvas.translate(width / 2, 0);
-  if (test & TestClip) {
-    SkRect clipRect = {0, height / 2, width, height};
-    canvas.clipRect(clipRect);
-  }
-  {
-    SkIRect clip = SkIRect::MakeSize(canvas.getBaseLayerSize()).
-        makeOffset((test & TestTranslate) ? - (static_cast<int>(width)) / 2 : 0, 0);
-    skia::SkiaBitLocker bitLocker(&canvas, clip);
-    CGContextRef cgContext = bitLocker.cgContext();
-    CGColorRef testColor = CGColorGetConstantColor(kCGColorWhite);
-    CGContextSetFillColorWithColor(cgContext, testColor);
-    CGRect cgRect = {{0, 0}, {width, height}};
-    CGContextFillRect(cgContext, cgRect);
-  }
-  const unsigned results[][storageSize] = {
-    {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}, // identity
-    {0xFF333333, 0xFFFFFFFF, 0xFF999999, 0xFFFFFFFF}, // translate
-    {0xFF333333, 0xFF666666, 0xFFFFFFFF, 0xFFFFFFFF}, // clip
-    {0xFF333333, 0xFF666666, 0xFF999999, 0xFFFFFFFF}  // translate | clip
-  };
-  for (unsigned index = 0; index < storageSize; index++)
-    EXPECT_EQ(results[test][index], bits[index]);
-}
-
 void SkiaUtilsMacTest::ShapeHelper(int width, int height,
                                    bool isred, bool tfbit) {
   SkBitmap thing(CreateSkBitmap(width, height, isred, tfbit));
@@ -224,21 +176,5 @@
   TestSkBitmap(bitmap);
 }
 
-TEST_F(SkiaUtilsMacTest, BitLocker_Identity) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestIdentity);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_Translate) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestTranslate);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_Clip) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestClip);
-}
-
-TEST_F(SkiaUtilsMacTest, BitLocker_XClip) {
-  RunBitLockerTest(SkiaUtilsMacTest::TestXClip);
-}
-
 }  // namespace
 

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index bd0fed8..b11a2df1 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json

@@ -227,6 +227,9 @@
           "--additional-apk=third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
         ],
         "name": "nonddready-cardboard-current_chrome_public_test_vr_apk",
+        "override_compile_targets": [
+          "chrome_public_test_vr_apk"
+        ],
         "override_isolate_target": "chrome_public_test_vr_apk",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -305,15 +308,6 @@
         },
         "test": "unit_tests"
       }
-    ],
-    "scripts": [
-      {
-        "args": [
-          "content_browsertests"
-        ],
-        "name": "count_filtered_tests_content_browsertests",
-        "script": "count_filtered_tests.py"
-      }
     ]
   },
   "CFI Linux": {

diff --git a/testing/buildbot/chromium.gpu.fyi.json b/testing/buildbot/chromium.gpu.fyi.json
index 65950add..43a3595 100644
--- a/testing/buildbot/chromium.gpu.fyi.json
+++ b/testing/buildbot/chromium.gpu.fyi.json

@@ -2820,6 +2820,514 @@
       }
     ]
   },
+  "Linux GPU TSAN Release": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--test-launcher-batch-limit=400",
+          "--deqp-egl-display-type=angle-gl"
+        ],
+        "name": "angle_deqp_gles2_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ],
+          "shards": 4
+        },
+        "test": "angle_deqp_gles2_tests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--test-launcher-batch-limit=400",
+          "--deqp-egl-display-type=angle-gl"
+        ],
+        "name": "angle_deqp_gles31_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ],
+          "shards": 4
+        },
+        "test": "angle_deqp_gles31_tests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--test-launcher-batch-limit=400",
+          "--deqp-egl-display-type=angle-gl"
+        ],
+        "name": "angle_deqp_gles3_gl_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ],
+          "shards": 12
+        },
+        "test": "angle_deqp_gles3_tests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests",
+          "--test-launcher-retry-limit=0"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "angle_end2end_tests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests",
+          "--test-launcher-retry-limit=0"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "angle_unittests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "audio_unittests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "gl_tests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "gl_unittests",
+        "use_xvfb": false
+      },
+      {
+        "args": [
+          "--use-gpu-in-tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "gles2_conform_test",
+        "use_xvfb": false
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "swiftshader_unittests",
+        "use_xvfb": false
+      },
+      {
+        "override_compile_targets": [
+          "tab_capture_end2end_tests_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        },
+        "test": "tab_capture_end2end_tests",
+        "use_xvfb": false
+      }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "-v"
+        ],
+        "isolate_name": "angle_perftests",
+        "name": "angle_perftests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "context_lost",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "context_lost_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "depth_capture",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "depth_capture_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "gpu_process",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "gpu_process_launch_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "hardware_accelerated_feature",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "hardware_accelerated_feature_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "maps",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--os-type",
+          "linux",
+          "--build-revision",
+          "${got_revision}",
+          "--test-machine-name",
+          "${buildername}"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "maps_pixel_test",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "pixel",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--refimg-cloud-storage-bucket",
+          "chromium-gpu-archive/reference-images",
+          "--os-type",
+          "linux",
+          "--build-revision",
+          "${got_revision}",
+          "--test-machine-name",
+          "${buildername}"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "pixel_test",
+        "non_precommit_args": [
+          "--upload-refimg-to-cloud-storage"
+        ],
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "precommit_args": [
+          "--download-refimg-from-cloud-storage"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "screenshot_sync",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "screenshot_sync_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "trace_test",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "trace_test",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle",
+          "--webgl-conformance-version=2.0.1",
+          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl2_conformance_angle_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ],
+          "shards": 15
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--webgl-conformance-version=2.0.1",
+          "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl2_conformance_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ],
+          "shards": 15
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_angle_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      },
+      {
+        "args": [
+          "webgl_conformance",
+          "--show-stdout",
+          "--browser=release",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "name": "webgl_conformance_tests",
+        "override_compile_targets": [
+          "telemetry_gpu_integration_test_run"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:104a",
+              "os": "Ubuntu"
+            }
+          ]
+        }
+      }
+    ]
+  },
   "Linux Release (AMD R5 230)": {
     "gtest_tests": [
       {

diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation b/third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation
index 65861a4..46366bc 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-browser-side-navigation

@@ -37,9 +37,6 @@
 Bug(695072) http/tests/security/location-href-clears-username-password.html [ Failure ]
 Bug(695072) virtual/mojo-loading/http/tests/security/location-href-clears-username-password.html [ Failure ]
 
-# Timeout
-Bug(none) fast/loader/crash-replacing-location-before-load.html [ Timeout ]
-
 # These tests are flaky.
 Bug(none) external/wpt/service-workers/service-worker/fetch-event-redirect.https.html [ Crash ]
 Bug(none) http/tests/misc/window-open-then-write.html [ Timeout ]

diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/root-layer-scrolls b/third_party/WebKit/LayoutTests/FlagExpectations/root-layer-scrolls
index c23a960..9025f919 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/root-layer-scrolls
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/root-layer-scrolls

@@ -1,9 +1,6 @@
-Bug(none) accessibility/scroll-to-global-point-main-window.html [ Crash ]
-Bug(none) accessibility/scroll-to-global-point-nested.html [ Crash ]
-Bug(none) accessibility/scroll-to-make-visible-main-window.html [ Crash ]
-Bug(none) accessibility/scroll-to-make-visible-nested-2.html [ Crash ]
-Bug(none) accessibility/scroll-to-make-visible-nested.html [ Crash ]
-Bug(none) accessibility/scroll-to-make-visible-with-subfocus.html [ Crash ]
+Bug(none) accessibility/scroll-to-global-point-main-window.html [ Failure ]
+Bug(none) accessibility/scroll-to-global-point-nested.html [ Failure ]
+Bug(none) accessibility/scroll-to-make-visible-nested-2.html [ Failure ]
 Bug(none) compositing/absolute-inside-out-of-view-fixed.html [ Failure ]
 Bug(none) compositing/backgrounds/fixed-background-on-descendant.html [ Failure ]
 Bug(none) compositing/checkerboard.html [ Failure ]
@@ -286,13 +283,12 @@
 Bug(none) fast/dom/elementsFromPoint/elementsFromPoint-iframes.html [ Failure ]
 Bug(none) fast/dom/elementsFromPoint/elementsFromPoint-invalid-cases.html [ Failure ]
 Bug(none) fast/dom/focus-contenteditable.html [ Failure ]
-Bug(none) fast/dom/horizontal-scrollbar-in-rtl.html [ Crash ]
 Bug(none) fast/dom/horizontal-scrollbar-when-dir-change.html [ Failure ]
 Bug(none) fast/dom/HTMLAnchorElement/anchor-in-noscroll-iframe.html [ Failure ]
 Bug(none) fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure ]
 Bug(none) fast/dom/scroll-reveal-left-overflow.html [ Failure ]
 Bug(none) fast/dom/scroll-reveal-top-overflow.html [ Failure ]
-Bug(none) fast/dom/vertical-scrollbar-in-rtl.html [ Crash ]
+Bug(none) fast/dom/vertical-scrollbar-in-rtl.html [ Failure ]
 Bug(none) fast/dom/vertical-scrollbar-when-dir-change.html [ Failure ]
 Bug(none) fast/dom/Window/window-xy-properties.html [ Failure ]
 Bug(none) fast/dynamic/anchor-lock.html [ Failure ]

diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index bafac36..37796ba42 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations

@@ -36,7 +36,6 @@
 # as we go. Please remove [ Pass ] lines instead of rebaselining these tests.
 crbug.com/537409 virtual/spv2/ [ Skip ]
 crbug.com/563667 virtual/spv2/fast/block/basic/001.html [ Pass ]
-crbug.com/580355 virtual/spv2/fast/block/basic/018.html [ Pass ]
 # Begin whitlelisted paint invalidation tests
 crbug.com/647831 virtual/spv2/paint/invalidation/margin.html [ Pass ]
 # End whitlelisted paint invalidation tests
@@ -155,8 +154,9 @@
 # LayoutNG - is a new layout system for Blink.
 
 #### css2.1/20110323
-#### Passed: 109
-#### Skipped: 300
+#### Passed: 108
+#### Skipped: 301
+crbug.com/635619 virtual/layout_ng/css2.1/20110323/margin-collapse-027.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/absolute-non-replaced-height-002.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/floats-zero-height-wrap-001.htm [ Skip ]
 crbug.com/635619 virtual/layout_ng/css2.1/20110323/floats-zero-height-wrap-002.htm [ Skip ]
@@ -581,8 +581,9 @@
 crbug.com/635619 virtual/layout_ng/fast/block/margin-collapse/webkit-margin-collapse-siblings.html [ Skip ]
 
 #### fast/block/float
-#### Passed: 56
-#### Skipped: 150
+#### Passed: 57
+#### Skipped: 151
+crbug.com/635619 virtual/layout_ng/fast/block/float/max-width-clear-float-with-overflow-hidden.html [ Skip ]
 crbug.com/635619 virtual/layout_ng/fast/block/float/001.html [ Skip ]
 crbug.com/635619 virtual/layout_ng/fast/block/float/002.html [ Skip ]
 crbug.com/635619 virtual/layout_ng/fast/block/float/003.html [ Skip ]
@@ -769,8 +770,6 @@
 crbug.com/538697 [ Win7 Debug ] virtual/threaded/printing/webgl-oversized-printing.html [ Failure Crash ]
 crbug.com/538697 [ Win7 Debug ] printing/webgl-oversized-printing.html [ Failure Crash ]
 
-crbug.com/617152 external/wpt/mediacapture-streams/GUM-impossible-constraint.https.html [ Skip ]
-
 crbug.com/281504 fast/canvas/canvas-large-pattern.html [ Failure ]
 crbug.com/281504 virtual/display_list_2d_canvas/fast/canvas/canvas-large-pattern.html [ Failure ]
 crbug.com/281504 virtual/gpu/fast/canvas/canvas-large-pattern.html [ Failure ]
@@ -841,6 +840,22 @@
 crbug.com/567965 [ Debug ] external/wpt/user-timing/test_user_timing_mark.html [ Skip ]
 crbug.com/518993 external/wpt/user-timing/test_user_timing_measure_navigation_timing.html [ Skip ]
 
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/flexbox/scrollbars-changed.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/selection/selection-in-non-composited-scrolling-container.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/compositing/iframe-inside-squashed-layer.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/table/border-collapse-change-collapse-to-separate.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/flexbox/repaint.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/table/resize-table-row-repaint.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/table/resize-table-repaint-percent-size-cell.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/table/border-collapse-change-separate-to-collapse.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/compositing/should-not-repaint-composited-descendants.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/forms/range-focus-by-mouse-then-keydown.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/forms/submit-focus-by-mouse-then-keydown.html [ NeedsManualRebaseline ]
+crbug.com/676748 virtual/disable-spinvalidation/paint/invalidation/table/resize-table-repaint-vertical-align-cell.html [ NeedsManualRebaseline ]
+
 crbug.com/636053 [ Mac Win ] printing/thead-repeats-at-top-of-each-page-multiple-tables.html [ NeedsManualRebaseline ]
 crbug.com/636053 [ Mac Win ] virtual/threaded/printing/thead-repeats-at-top-of-each-page-multiple-tables.html [ NeedsManualRebaseline ]
 
@@ -967,19 +982,7 @@
 Bug(github) external/wpt/uievents/keyboard/key-manual.css [ Skip ]
 Bug(github) external/wpt/uievents/keyboard/key-manual.js [ Skip ]
 
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStreamTrack-end.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStreamTrack-init.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStream-audio-only.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStream-finished-add.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStream-idl.https.html [ Skip ]
-crbug.com/387740 external/wpt/mediacapture-streams/MediaStream-removetrack.https.html [ Skip ]
-
-crbug.com/412381 external/wpt/mediacapture-streams/GUM-empty-option-param.https.html [ Failure ]
-crbug.com/412381 external/wpt/mediacapture-streams/GUM-unknownkey-option-param.https.html [ Failure ]
-crbug.com/412381 external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html [ Pass Timeout Failure ]
-
+crbug.com/688613 external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html [ Skip ]
 
 crbug.com/542660 fast/css/absolute-inline-alignment-2.html [ Failure ]
 
@@ -1763,9 +1766,6 @@
 crbug.com/599115 virtual/mojo-loading/http/tests/preload/document-write [ Failure ]
 crbug.com/599115 virtual/mojo-loading/http/tests/preload/document-write/document_write_no_preload.html [ Pass ]
 
-crbug.com/600261 external/wpt/mediacapture-streams/GUM-deny.https.html [ Failure ]
-crbug.com/600261 external/wpt/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html [ Failure ]
-
 crbug.com/605525 [ Win ] http/tests/xmlhttprequest/redirect-cross-origin-post.html [ Failure Pass ]
 
 crbug.com/600248 external/wpt/web-animations/interfaces/Animation/constructor.html [ Failure Timeout ]
@@ -1882,8 +1882,6 @@
 crbug.com/692105 external/wpt/streams/writable-streams/floating-point-total-queue-size.html [ Skip ]
 crbug.com/692105 external/wpt/streams/writable-streams/floating-point-total-queue-size.serviceworker.https.html [ Skip ]
 crbug.com/692105 external/wpt/streams/writable-streams/floating-point-total-queue-size.sharedworker.html [ Skip ]
-crbug.com/692105 external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance.html [ Skip ]
-crbug.com/692105 external/wpt/web-animations/timing-model/time-transformations/transformed-progress.html [ Skip ]
 
 # These policies are not implemented yet.
 crbug.com/627968 external/wpt/referrer-policy/origin-when-cross-origin/http-rp/same-origin/ [ Skip ]
@@ -1931,6 +1929,11 @@
 crbug.com/626703 external/wpt/mixed-content/blockable/no-opt-in/same-host-http/iframe-tag/top-level/swap-scheme-redirect/no-opt-in-blocks.https.html [ Timeout ]
 
 # ====== New tests from w3c-test-autoroller added here ======
+crbug.com/626703 external/wpt/pointerevents/pointerevent_click_during_capture-manual.html [ Timeout ]
+crbug.com/626703 external/wpt/streams/writable-streams/reentrant-strategy.dedicatedworker.html [ Timeout ]
+crbug.com/626703 external/wpt/streams/writable-streams/reentrant-strategy.html [ Timeout ]
+crbug.com/626703 external/wpt/streams/writable-streams/reentrant-strategy.serviceworker.https.html [ Timeout ]
+crbug.com/626703 external/wpt/streams/writable-streams/reentrant-strategy.sharedworker.html [ Timeout ]
 crbug.com/626703 external/wpt/html/webappapis/idle-callbacks/cancel-invoked.html [ Timeout ]
 crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_completely_move_up.html [ Failure ]
 crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/2_cues_overlapping_partially_move_down.html [ Failure ]
@@ -2149,12 +2152,10 @@
 crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html [ Failure ]
 crbug.com/626703 external/wpt/webvtt/rendering/cues-with-video/processing-model/too_many_cues_wrapped.html [ Failure ]
 crbug.com/626703 external/wpt/referrer-policy/generic/subresource-test/image-decoding.html [ Timeout ]
-crbug.com/626703 external/wpt/referrer-policy/generic/unsupported-csp-referrer-directive.html [ Timeout ]
 crbug.com/626703 external/wpt/streams/writable-streams/close.dedicatedworker.html [ Timeout ]
 crbug.com/626703 external/wpt/streams/writable-streams/close.html [ Timeout ]
 crbug.com/626703 external/wpt/streams/writable-streams/close.serviceworker.https.html [ Timeout ]
 crbug.com/626703 external/wpt/service-workers/service-worker/registration-useCache.https.html [ Timeout ]
-crbug.com/626703 external/wpt/service-workers/service-worker/multi-globals/url-parsing.https.html [ Pass Failure ]
 crbug.com/626703 external/wpt/streams/writable-streams/close.sharedworker.html [ Timeout ]
 crbug.com/626703 external/wpt/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/allow-scripts-flag-changing-2.html [ Timeout ]
 crbug.com/626703 external/wpt/html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html [ Timeout ]
@@ -2163,6 +2164,14 @@
 crbug.com/626703 [ Win ] external/csswg-test/css-flexbox-1/flex-minimum-width-flex-items-001.xht [ Failure ]
 crbug.com/626703 [ Win ] external/csswg-test/css-flexbox-1/flex-minimum-width-flex-items-003.xht [ Failure ]
 crbug.com/626703 [ Win ] external/csswg-test/css-flexbox-1/flexbox_flex-natural-mixed-basis-auto.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-basic-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-boundary-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-ruby-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-valign-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001.html [ Failure ]
+crbug.com/626703 external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005.xht [ Failure ]
+crbug.com/626703 external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004.xht [ Failure ]
 crbug.com/626703 external/csswg-test/css-writing-modes-3/sizing-orthog-prct-htb-in-vrl-002.xht [ Failure ]
 crbug.com/626703 external/csswg-test/css-writing-modes-3/sizing-orthog-htb-in-vrl-020.xht [ Failure ]
 crbug.com/626703 external/csswg-test/css-writing-modes-3/sizing-orthog-vlr-in-htb-020.xht [ Failure ]
@@ -2324,19 +2333,8 @@
 crbug.com/659610 fast/css-grid-layout/grid-baseline.html [ Failure ]
 crbug.com/659610 fast/css-grid-layout/grid-baseline-margins.html [ Failure ]
 crbug.com/511177 external/csswg-test/css-grid-1/grid-layout-properties.html [ Failure ]
-# TODO(rego): Skipping tests related to "Implied Minimum Size of Grid Items"
-# because the test suite needs to be updated after the CSS WG resolves
-# the following issue: https://github.com/w3c/csswg-drafts/issues/283
-# See crbug.com/666940 for more details.
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-001.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-002.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-003.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-004.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-005.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-006.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-007.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-008.xht [ Skip ]
-crbug.com/666940 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-009.xht [ Skip ]
+crbug.com/555027 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-007.xht [ Failure ]
+crbug.com/555027 external/csswg-test/css-grid-1/grid-items/grid-minimum-size-grid-items-009.xht [ Failure ]
 
 # TODO(chrishall): this is a temporary mediation step as part of the P0 issue crbug.com/657646
 # this is not meant to be here for more than a few days (from 2016-11-03 SYD)

diff --git a/third_party/WebKit/LayoutTests/canvas/philip/tests/2d.path.arcTo.shape.curve2.html b/third_party/WebKit/LayoutTests/canvas/philip/tests/2d.path.arcTo.shape.curve2.html
index 018ebd0..97e07f2 100644
--- a/third_party/WebKit/LayoutTests/canvas/philip/tests/2d.path.arcTo.shape.curve2.html
+++ b/third_party/WebKit/LayoutTests/canvas/philip/tests/2d.path.arcTo.shape.curve2.html

@@ -40,7 +40,7 @@
 _assertPixel(canvas, 65,21, 0,255,0,255, "65,21", "0,255,0,255");
 _assertPixel(canvas, 72,28, 0,255,0,255, "72,28", "0,255,0,255");
 _assertPixel(canvas, 73,27, 0,255,0,255, "73,27", "0,255,0,255");
-_assertPixel(canvas, 78,36, 0,255,0,255, "78,36", "0,255,0,255");
+_assertPixel(canvas, 78,36, 0,255,0,254, "78,36", "0,255,0,255");
 _assertPixel(canvas, 79,35, 0,255,0,255, "79,35", "0,255,0,255");
 _assertPixel(canvas, 80,44, 0,255,0,255, "80,44", "0,255,0,255");
 _assertPixel(canvas, 80,45, 0,255,0,255, "80,45", "0,255,0,255");

diff --git a/third_party/WebKit/LayoutTests/compositing/images/direct-image-clip-path-expected.png b/third_party/WebKit/LayoutTests/compositing/images/direct-image-clip-path-expected.png
index 5ebbe7a..ba84a79 100644
--- a/third_party/WebKit/LayoutTests/compositing/images/direct-image-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/images/direct-image-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/images/direct-image-dynamic-clip-path-expected.png b/third_party/WebKit/LayoutTests/compositing/images/direct-image-dynamic-clip-path-expected.png
index 5ebbe7a..ba84a79 100644
--- a/third_party/WebKit/LayoutTests/compositing/images/direct-image-dynamic-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/images/direct-image-dynamic-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
new file mode 100644
index 0000000..31ce3d9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/border-radius-styles-with-composited-child-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
index 8e90d0c..e33c9ba 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/border-radius-styles-with-composited-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png
index a887344..1331e03 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png
index a887344..1331e03 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png
index a887344..1331e03 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png
index 7b9ed33..63e7dd7 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-with-border-radius-ancestor-expected.png b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-with-border-radius-ancestor-expected.png
index 2ccc2bf..e3bd89e 100644
--- a/third_party/WebKit/LayoutTests/compositing/overflow/siblings-with-border-radius-ancestor-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/overflow/siblings-with-border-radius-ancestor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/rounded-corners-expected.png b/third_party/WebKit/LayoutTests/compositing/rounded-corners-expected.png
index c99092e..7a903a6 100644
--- a/third_party/WebKit/LayoutTests/compositing/rounded-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/compositing/rounded-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
index a5e7976c..19dccd1 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-child-expected.txt

@@ -136,11 +136,6 @@
           "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
           "rect": [0, 0, 100, 100],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='smallbox'",
-          "rect": [20, 25, 50, 50],
-          "reason": "style change"
         }
       ]
     },

diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
index d2a68910..349b643 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt

@@ -136,11 +136,6 @@
           "object": "LayoutBlockFlow (positioned) DIV class='box middle'",
           "rect": [0, 0, 100, 100],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='smallbox'",
-          "rect": [12, 17, 66, 66],
-          "reason": "style change"
         }
       ]
     },

diff --git a/third_party/WebKit/LayoutTests/crypto/subtle/resources/common.js b/third_party/WebKit/LayoutTests/crypto/subtle/resources/common.js
index bdfae256..39640d7 100644
--- a/third_party/WebKit/LayoutTests/crypto/subtle/resources/common.js
+++ b/third_party/WebKit/LayoutTests/crypto/subtle/resources/common.js

@@ -113,7 +113,7 @@
     if (internals) {
         // Removing the version tag from the output so serialization format changes don't need to update all the crypto tests.
         var serialized = internals.serializeObject(o);
-        var serializedWithoutVersion = new Uint8Array(serialized, 2);
+        var serializedWithoutVersion = new Uint8Array(serialized, 4);
         debug("Serialized key bytes: " + bytesToHexString(serializedWithoutVersion));
     }
 }

diff --git a/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-data-uri-svg-image-expected.png b/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-data-uri-svg-image-expected.png
index f1c581e3..d41d9808 100644
--- a/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-data-uri-svg-image-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-data-uri-svg-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-svg-color-expected.png b/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-svg-color-expected.png
index 31f67dc4..b1db387 100644
--- a/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-svg-color-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/blending/background-blend-mode-svg-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/filters/filter-repaint-child-layers-expected.png b/third_party/WebKit/LayoutTests/css3/filters/filter-repaint-child-layers-expected.png
index c4b92fa..c79bc09 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/filter-repaint-child-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/filters/filter-repaint-child-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/filters/filter-with-transform-expected.png b/third_party/WebKit/LayoutTests/css3/filters/filter-with-transform-expected.png
index a1d9dd8..1902418 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/filter-with-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/filters/filter-with-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/filters/nested-filter-expected.png b/third_party/WebKit/LayoutTests/css3/filters/nested-filter-expected.png
index e353d4e..f499671b 100644
--- a/third_party/WebKit/LayoutTests/css3/filters/nested-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/filters/nested-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-expected.png
index 30b5c44..7940648 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-filter-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-filter-expected.png
index 886c8f6..d0ea2eeb 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-expected.png
index eaae4a8..1dd095d5 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-hidden-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-hidden-expected.png
index 30b5c44..7940648 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-hidden-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-overflow-hidden-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.png
index 37ed84d3..f4a16be6 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-circle-relative-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-ellipse-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-ellipse-expected.png
index b44bb8b..ef000b8 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-ellipse-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-ellipse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-evenodd-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-evenodd-expected.png
index 02da7696..d60da36 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-evenodd-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-evenodd-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-expected.png
index 3b355b67..4b98f1d 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-nonzero-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-nonzero-expected.png
index 3b355b67..4b98f1d 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-nonzero-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-polygon-nonzero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/css3/masking/clip-path-restore-expected.png b/third_party/WebKit/LayoutTests/css3/masking/clip-path-restore-expected.png
index 2ededb4..8726937 100644
--- a/third_party/WebKit/LayoutTests/css3/masking/clip-path-restore-expected.png
+++ b/third_party/WebKit/LayoutTests/css3/masking/clip-path-restore-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/csspaint/paint2d-zoom-expected.png b/third_party/WebKit/LayoutTests/csspaint/paint2d-zoom-expected.png
index 2385f47..0fd690d 100644
--- a/third_party/WebKit/LayoutTests/csspaint/paint2d-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/csspaint/paint2d-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/editing/spelling/no_marker_in_blurred_input.html b/third_party/WebKit/LayoutTests/editing/spelling/no_marker_in_blurred_input.html
new file mode 100644
index 0000000..86d9707
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/editing/spelling/no_marker_in_blurred_input.html

@@ -0,0 +1,21 @@
+<!doctype html>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../assert_selection.js"></script>
+<script src="spellcheck_test.js"></script>
+<input id=input>
+<textarea id=textarea></textarea>
+<script>
+spellcheck_test(
+    '<input>',
+    document => {
+      const input = document.querySelector('input');
+      document.getSelection().setClipboardData('zz.');
+      input.focus();
+      document.execCommand('paste');
+      document.execCommand('paste');
+      input.blur();
+    },
+    '<input value="zz.zz.">',
+    'Markers should not be added to INPUT without focus.');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001-expected.html
new file mode 100644
index 0000000..595aa7f7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001-expected.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
+<style>
+  .container {
+    display: flex;
+    width: 300px;
+    height: 300px;
+    align-items: center;
+    border: 2px solid purple;
+  }
+  .container > div {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    align-self: auto;
+  }
+</style>
+<p>Test passes if there's a blue square vertically centered inside the box.</p>
+<div class="container">
+  <div></div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001.html
new file mode 100644
index 0000000..6a6bf8c7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-001.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: flex container align-items is used for flex item regardless of intermediate display: contents ancestors</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
+<link rel="help" href="https://drafts.csswg.org/css-align/#align-items-property">
+<link rel="match" href="display-contents-alignment-001-ref.html">
+<style>
+  .container {
+    display: flex;
+    width: 300px;
+    height: 300px;
+    align-items: center;
+    border: 2px solid purple;
+  }
+  .contents {
+    display: contents;
+    align-items: flex-start;
+  }
+  .contents > div {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    align-self: auto;
+  }
+</style>
+<p>Test passes if there's a blue square vertically centered inside the box.</p>
+<div class="container">
+  <div class="contents">
+    <div></div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002-expected.html
new file mode 100644
index 0000000..f58ccf0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002-expected.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
+<style>
+  .container {
+    display: grid;
+    width: 300px;
+    height: 300px;
+    justify-items: center;
+    border: 2px solid purple;
+  }
+  .container > div {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    justify-self: auto;
+  }
+</style>
+<p>Test passes if there's a blue square horizontally centered inside the box.</p>
+<div class="container">
+  <div></div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002.html
new file mode 100644
index 0000000..d8fa0d9e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-alignment-002.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: grid container justify-items is used for grid item regardless of intermediate display: contents ancestors</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:ecobos@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-contents">
+<link rel="help" href="https://drafts.csswg.org/css-align/#justify-items-property">
+<link rel="match" href="display-contents-alignment-002-ref.html">
+<style>
+  .container {
+    display: grid;
+    width: 300px;
+    height: 300px;
+    justify-items: center;
+    border: 2px solid purple;
+  }
+  .contents {
+    display: contents;
+    justify-items: start;
+  }
+  .contents > div {
+    width: 100px;
+    height: 100px;
+    background: blue;
+    justify-self: auto;
+  }
+</style>
+<p>Test passes if there's a blue square horizontally centered inside the box.</p>
+<div class="container">
+  <div class="contents">
+    <div></div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style-expected.txt b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style-expected.txt
new file mode 100644
index 0000000..4597b288
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style-expected.txt

@@ -0,0 +1,8 @@
+This is a testharness.js-based test.
+PASS Serialization of computed style value for display:contents 
+PASS display:contents element as inherit parent - explicit inheritance 
+PASS display:contents element as inherit parent - implicit inheritance 
+FAIL Resolved value should be computed value, not used value, for display:contents assert_equals: expected "auto" but got "588px"
+PASS display:contents is blockified for root elements 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style.html
index 5f232f2..e7c428b 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style.html
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-display-3/display-contents-computed-style.html

@@ -15,11 +15,7 @@
 
     #t3 .contents { color: green }
 
-    #t4 { display: flex; align-items: center }
-    #t4 .contents { align-items: baseline }
-    #t4 span { align-self: auto }
-
-    #t5 {
+    #t4 {
         width: auto;
         height: 50%;
         margin-left: 25%;
@@ -42,7 +38,7 @@
         <span></span>
     </div>
 </div>
-<div id="t5" class="contents"></div>
+<div id="t4" class="contents"></div>
 <script>
     test(function(){
         assert_equals(getComputedStyle(document.querySelector("#t1")).display, "contents");
@@ -57,11 +53,7 @@
     }, "display:contents element as inherit parent - implicit inheritance");
 
     test(function(){
-        assert_equals(getComputedStyle(document.querySelector("#t4 span")).alignSelf, "baseline");
-    }, "align-self:auto resolution for flex item inside display:contents");
-
-    test(function(){
-        var computed = getComputedStyle(document.querySelector("#t5"));
+        var computed = getComputedStyle(document.querySelector("#t4"));
         assert_equals(computed.width, "auto");
         assert_equals(computed.height, "50%");
         assert_equals(computed.marginLeft, "25%");

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x100-green.png b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x100-green.png
index 3883542..0dcda08 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x100-green.png
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x100-green.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x50-green.png b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x50-green.png
index 9dae3116..67f3eaa6 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x50-green.png
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/100x50-green.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/200x200-green.png b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/200x200-green.png
index 7a47c0e..e8b591f 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/200x200-green.png
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/200x200-green.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/50x100-green.png b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/50x100-green.png
index 2854698..c10c9a7f 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/50x100-green.png
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-grid-1/grid-items/support/50x100-green.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001-expected.html
new file mode 100644
index 0000000..e277021
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001-expected.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step basic layout reference</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.ref {
+  line-height: 60px;
+}
+</style>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>XXXXX</div>
+  <div>XXXXX XXXXX XXXXX</div>
+  <div><br>X<br>X</div>
+</div>
+<div class="ref">
+  <div>XXXXX</div>
+  <div>XXXXX XXXXX XXXXX</div>
+  <div><br>X<br>X</div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001.html
new file mode 100644
index 0000000..19727e3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-basic-001.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step basic layout</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-basic-001.html">
+<meta name="assert" content="This test asserts the line-height-step property rounds up line box height.">
+<meta name="flags" content="ahem">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.test {
+  line-height: 40px;
+  line-height-step: 60px;
+}
+.ref {
+  line-height: 60px;
+}
+</style>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>XXXXX</div>
+  <div>XXXXX XXXXX XXXXX</div>
+  <div><br>X<br>X</div>
+</div>
+<div class="test">
+  <div>XXXXX</div>
+  <div>XXXXX XXXXX XXXXX</div>
+  <div><br>X<br>X</div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001-expected.html
new file mode 100644
index 0000000..17e7515
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001-expected.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step boundary test</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 30px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+</style>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 120px">XXXXX</div>
+</div>
+<div class="ref">
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 120px">XXXXX</div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001.html
new file mode 100644
index 0000000..50681bf
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-boundary-001.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step boundary test</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-boundary-001.html">
+<meta name="assert" content="This test asserts the line-height-step property rounds up line box height.">
+<meta name="flags" content="ahem">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 30px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.test {
+  line-height-step: 40px;
+}
+</style>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 120px">XXXXX</div>
+</div>
+<div class="test">
+  <div style="line-height: 39px">XXXXX</div>
+  <div style="line-height: 40px">XXXXX</div>
+  <div style="line-height: 41px">XXXXX</div>
+  <div style="line-height: 79px">XXXXX</div>
+  <div style="line-height: 80px">XXXXX</div>
+  <div style="line-height: 81px">XXXXX</div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001-expected.txt b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001-expected.txt
new file mode 100644
index 0000000..0cd352295
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001-expected.txt

@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL Height must change when line-height-step changes assert_not_equals: got disallowed value 28
+PASS Height must not change after relayout 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001.html
new file mode 100644
index 0000000..d6f7bd9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-dynamic-001.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step dynamic change</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<meta name="assert" content="This test asserts changing the line-height-step property takes effects.">
+<meta name="flags" content="dom">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  font-size: 20px;
+  line-height: 1;
+}
+</style>
+<div id="log"></div>
+<div id="target">X</div>
+<div id="next">X</div>
+<script>
+runTests();
+function runTests() {
+  var before = next.offsetTop;
+  target.style.lineHeightStep = "40px";
+  var after = next.offsetTop;
+  forceRelayout(document.documentElement);
+  var afterRelayout = next.offsetTop;
+
+  test(function () {
+    assert_not_equals(after, before);
+  }, "Height must change when line-height-step changes");
+  test(function () {
+    assert_equals(after, afterRelayout);
+  }, "Height must not change after relayout");
+}
+
+function forceRelayout(element) {
+  var saved = element.style.display;
+  element.style.display = "none";
+  element.offsetTop;
+  element.style.display = saved;
+  element.offsetTop;
+}
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001-expected.txt b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001-expected.txt
new file mode 100644
index 0000000..2c8f95e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001-expected.txt

@@ -0,0 +1,12 @@
+This is a testharness.js-based test.
+FAIL initial value should be '0px' assert_equals: expected (string) "0px" but got (undefined) undefined
+FAIL 'line-height-step: 20px' should compute to '20px' assert_equals: expected (string) "20px" but got (undefined) undefined
+FAIL line-height-step should inherit assert_equals: expected (string) "20px" but got (undefined) undefined
+FAIL 'line-height-step: initial' should compute to '0px' assert_equals: expected (string) "0px" but got (undefined) undefined
+FAIL 'line-height-step: 40px' should compute to '40px' assert_equals: expected (string) "40px" but got (undefined) undefined
+FAIL '0' should be a valid length assert_equals: expected (string) "0px" but got (undefined) undefined
+FAIL Interger should be invalid assert_equals: expected (string) "20px" but got (undefined) undefined
+FAIL Negative length should be invalid assert_equals: expected (string) "20px" but got (undefined) undefined
+FAIL Computed value should be the absolute length Cannot read property 'slice' of undefined
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001.html
new file mode 100644
index 0000000..3febf057
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-parsing-001.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: parsing line-height-step</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<meta name="assert" content="This test asserts the parsing and getComputedStyle works correctly for the line-height-step property.">
+<meta name="flags" content="dom">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div title="initial value should be '0px'" data-expected="0px"></div>
+
+<div style="line-height-step: 20px" data-expected="20px">
+  <div title="line-height-step should inherit" data-expected="20px"></div>
+  <div style="line-height-step: initial" data-expected="0px"></div>
+
+  <div style="line-height-step: 40px" data-expected="40px"></div>
+
+  <div title="'0' should be a valid length" style="line-height-step: 0" data-expected="0px"></div>
+
+  <div title="Interger should be invalid" style="line-height-step: 1" data-expected="20px"></div>
+  <div title="Negative length should be invalid" style="line-height-step: -1px" data-expected="20px"></div>
+</div>
+
+<div id="pt" style="line-height-step: 40pt"></div>
+
+<script>
+Array.prototype.forEach.call(document.querySelectorAll("[data-expected]"), function (element) {
+  var expected = element.dataset.expected;
+  test(function () {
+    var actual = getComputedStyle(element).lineHeightStep;
+    assert_equals(actual, expected);
+  }, element.title || "'" + element.getAttribute("style") + "' should compute to '" + expected + "'");
+});
+
+test(function () {
+  assert_equals(getComputedStyle(document.getElementById("pt")).lineHeightStep.slice(-2), "px");
+}, "Computed value should be the absolute length");
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001-expected.html
new file mode 100644
index 0000000..a358c1d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001-expected.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step and ruby</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001.html
new file mode 100644
index 0000000..f79f13b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-ruby-001.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step and ruby</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-ruby-001.html">
+<meta name="assert" content="This test asserts the line-height-step property and ruby.">
+<meta name="flags" content="ahem">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.test {
+  line-height: 40px;
+  line-height-step: 120px;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+<div class="test">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001-expected.html
new file mode 100644
index 0000000..4925fbc0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001-expected.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step vertical-align test</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.ref {
+  line-height: 1;
+}
+.adjuster {
+  line-height: 80px;
+  color: transparent;
+}
+.top {
+  vertical-align: top;
+}
+.text-top {
+  vertical-align: text-top;
+}
+.text-bottom {
+  vertical-align: text-bottom;
+}
+.bottom {
+  vertical-align: bottom;
+}
+</style>
+<p class="instructions">Test passes if two lines are the same.
+<div class="ref">
+  <div>XX<span class="top">X</span><span class="text-top">X</span><span class="text-bottom">X</span><span class="bottom">X</span><span class="adjuster">X</span></div>
+</div>
+<div class="ref">
+  <div>XX<span class="top">X</span><span class="text-top">X</span><span class="text-bottom">X</span><span class="bottom">X</span><span class="adjuster">X</span></div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001.html
new file mode 100644
index 0000000..032b3c0a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-valign-001.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step vertical-align test</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-valign-001.html">
+<meta name="assert" content="This test asserts the vertical-align property with the line-height-step property.">
+<meta name="flags" content="ahem">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test {
+  line-height-step: 80px;
+}
+.ref {
+  line-height: 1;
+}
+.adjuster {
+  line-height: 80px;
+  color: transparent;
+}
+.top {
+  vertical-align: top;
+}
+.text-top {
+  vertical-align: text-top;
+}
+.text-bottom {
+  vertical-align: text-bottom;
+}
+.bottom {
+  vertical-align: bottom;
+}
+</style>
+<p class="instructions">Test passes if two lines are the same.
+<div class="ref">
+  <div>XX<span class="top">X</span><span class="text-top">X</span><span class="text-bottom">X</span><span class="bottom">X</span><span class="adjuster">X</span></div>
+</div>
+<div class="test">
+  <div>XX<span class="top">X</span><span class="text-top">X</span><span class="text-bottom">X</span><span class="bottom">X</span></div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001-expected.html
new file mode 100644
index 0000000..a358c1d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001-expected.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step and ruby</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001.html
new file mode 100644
index 0000000..4d07493
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-001.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step in vertical-rl</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-ruby-001.html">
+<meta name="assert" content="This test asserts the line-height-step property in vertical-rl writing mode.">
+<meta name="flags" content="ahem">
+<style>
+.container {
+  font-family: Ahem;
+  font-size: 40px;
+  writing-mode: vertical-rl;
+  width: 5em;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+}
+.test {
+  line-height: 40px;
+  line-height-step: 120px;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if top and bottom are the same.
+<div class="container">
+  <div class="ref">
+    <div>XXXXX</div>
+  </div>
+  <div class="test">
+    <div>XXXXX</div>
+  </div>
+</div>
+</body>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001-expected.html
new file mode 100644
index 0000000..a358c1d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001-expected.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step and ruby</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<style>
+div {
+  font-family: Ahem;
+  font-size: 40px;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+  width: 5em;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if left and right are the same.
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+<div class="ref">
+  <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+</div>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001.html
new file mode 100644
index 0000000..1c633339
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/line-height-step-writing-mode-vrl-ruby-001.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>CSS Rhythmic Sizing: line-height-step with ruby in vertical-rl</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#line-height-step">
+<link rel="match" href="reference/line-height-step-ruby-001.html">
+<meta name="assert" content="This test asserts the line-height-step property with ruby in vertical-rl writing mode.">
+<meta name="flags" content="ahem">
+<style>
+.container {
+  font-family: Ahem;
+  font-size: 40px;
+  writing-mode: vertical-rl;
+  width: 5em;
+}
+.test, .ref {
+  display: inline-block;
+  vertical-align: top;
+}
+.test {
+  line-height: 40px;
+  line-height-step: 120px;
+}
+.ref {
+  line-height: 120px;
+}
+</style>
+<body>
+<p class="instructions">Test passes if top and bottom are the same.
+<div class="container">
+  <div class="ref">
+    <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+  </div>
+  <div class="test">
+    <div>X<ruby>XX<rt>XX</rt></ruby>X</div>
+  </div>
+</div>
+</body>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001-expected.html
deleted file mode 100644
index 0bb3137..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001-expected.html
+++ /dev/null

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: snap-height baseline</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<style>
-div {
-  font-family: Ahem;
-  font-size: 40px;
-  line-height: 40px;
-}
-.test, .ref {
-  display: inline-block;
-  vertical-align: top;
-  width: 5em;
-}
-.test {
-  snap-height: 64px 50;
-}
-.ref > div {
-  margin-bottom: 24px;
-}
-.transparent {
-  color: transparent;
-}
-</style>
-<p class="instructions">Test passes if left and right are the same.
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div class="transparent">X</div>
-  <div>X</div>
-  <div>X</div>
-</div>
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div class="transparent">X</div>
-  <div>X</div>
-  <div>X</div>
-</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001.html
deleted file mode 100644
index fa40852..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-baseline-001.html
+++ /dev/null

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: snap-height baseline</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#snap-height">
-<link rel="match" href="reference/snap-height-baseline-001.html">
-<meta name="assert" content="This test asserts the snap-height property rounds up line box height and set the baseline position.">
-<meta name="flags" content="ahem">
-<style>
-div {
-  font-family: Ahem;
-  font-size: 40px;
-  line-height: 40px;
-}
-.test, .ref {
-  display: inline-block;
-  vertical-align: top;
-  width: 5em;
-}
-.test {
-  snap-height: 64px 50;
-}
-.ref > div {
-  margin-bottom: 24px;
-}
-.transparent {
-  color: transparent;
-}
-</style>
-<p class="instructions">Test passes if left and right are the same.
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div>XXXXX</div>
-  <div class="transparent">X</div>
-  <div>X</div>
-  <div>X</div>
-</div>
-<div class="test">
-  <div>XXXXX</div>
-  <div>XXXXX XXXXX XXXXX</div>
-  <div><br>X<br>X</div>
-</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001-expected.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001-expected.html
deleted file mode 100644
index 7ab6834..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001-expected.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: snap-height center</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<style>
-div {
-  font-family: Ahem;
-  font-size: 40px;
-}
-.test, .ref {
-  display: inline-block;
-  vertical-align: top;
-  width: 5em;
-}
-.test {
-  line-height: 40px;
-  snap-height: 60px;
-}
-.ref {
-  line-height: 60px;
-}
-</style>
-<p class="instructions">Test passes if left and right are the same.
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX XXXXX XXXXX</div>
-  <div><br>X<br>X</div>
-</div>
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX XXXXX XXXXX</div>
-  <div><br>X<br>X</div>
-</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001.html
deleted file mode 100644
index ce647ad..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-center-001.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: snap-height center</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#snap-height">
-<link rel="match" href="reference/snap-height-center-001.html">
-<meta name="assert" content="This test asserts the snap-height property rounds up line box height.">
-<meta name="flags" content="ahem">
-<style>
-div {
-  font-family: Ahem;
-  font-size: 40px;
-}
-.test, .ref {
-  display: inline-block;
-  vertical-align: top;
-  width: 5em;
-}
-.test {
-  line-height: 40px;
-  snap-height: 60px;
-}
-.ref {
-  line-height: 60px;
-}
-</style>
-<p class="instructions">Test passes if left and right are the same.
-<div class="ref">
-  <div>XXXXX</div>
-  <div>XXXXX XXXXX XXXXX</div>
-  <div><br>X<br>X</div>
-</div>
-<div class="test">
-  <div>XXXXX</div>
-  <div>XXXXX XXXXX XXXXX</div>
-  <div><br>X<br>X</div>
-</div>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-dynamic-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-dynamic-001.html
deleted file mode 100644
index 3af90aed..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-dynamic-001.html
+++ /dev/null

@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: snap-height dynamic change</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#snap-height">
-<meta name="assert" content="This test asserts changing the snap-height property takes effects.">
-<meta name="flags" content="dom">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-div {
-  font-size: 20px;
-  line-height: 1;
-}
-</style>
-<div id="log"></div>
-<div id="target">X</div>
-<div id="next">X</div>
-<script>
-var before = next.offsetTop;
-target.style.snapHeight = "40px";
-var after = next.offsetTop;
-forceRelayout(document.documentElement);
-var afterRelayout = next.offsetTop;
-
-test(function () {
-  assert_not_equals(after, before, "Height must change when snap-height changes");
-  assert_equals(after, afterRelayout, "Height must not change after relayout");
-});
-
-function forceRelayout(element) {
-  var saved = element.style.display;
-  element.style.display = "none";
-  element.offsetTop;
-  element.style.display = saved;
-  element.offsetTop;
-}
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-parsing-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-parsing-001.html
deleted file mode 100644
index b574de9..0000000
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-rhythm-1/snap-height-parsing-001.html
+++ /dev/null

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Snap Size: parsing snap-height</title>
-<link rel="author" title="Koji Ishii" href="mailto:kojiishi@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/css-rhythm-1/#snap-height">
-<meta name="assert" content="This test asserts the parsing and getComputedStyle works correctly for the snap-height property.">
-<meta name="flags" content="dom">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<div data-expected="0px" title="initial value"></div>
-
-<div style="snap-height: 20px 60" data-expected="20px 60">
-  <div data-expected="20px 60" title="snap-height should inherit"></div>
-  <div style="snap-height: initial" data-expected="0px"></div>
-  <div style="snap-height: initial; snap-height: inherit" data-expected="20px 60"></div>
-
-  <div style="snap-height: 40px" data-expected="40px"></div>
-
-  <div style="snap-height: 0" data-expected="0px"></div>
-
-  <div style="snap-height: 1" data-expected="20px 60"></div>
-
-  <div style="snap-height: -1px" data-expected="20px 60"></div>
-  <div style="snap-height: 40px -1" data-expected="20px 60"></div>
-  <div style="snap-height: 40px 0" data-expected="20px 60"></div>
-  <div style="snap-height: 40px 101" data-expected="20px 60"></div>
-</div>
-
-<div id="pt" style="snap-height: 40pt"></div>
-
-<script>
-Array.prototype.forEach.call(document.querySelectorAll("[data-expected]"), function (element) {
-  test(function () {
-    var actual = getComputedStyle(element).snapHeight;
-    assert_equals(actual, element.dataset.expected);
-  }, element.title || element.getAttribute("style"));
-});
-
-test(function () {
-  assert_equals(getComputedStyle(document.getElementById("pt")).snapHeight.slice(-2), "px");
-}, "Computed value must be the absolute length");
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003-expected.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003-expected.xht
new file mode 100644
index 0000000..9fe444c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003-expected.xht

@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <meta content="image" name="flags" />
+
+  <style type="text/css"><![CDATA[
+  div
+    {
+      margin-left: 0.5em;
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+
+  img#green-square
+    {
+      position: relative;
+      left: 96px; /* 80px + p's margin-left (1em) */
+      top: 160px;
+    }
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /><img id="green-square" src="support/swatch-green.png" width="80" height="80" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003.xht
new file mode 100644
index 0000000..481a0289
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-003.xht

@@ -0,0 +1,153 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: non-replaced block in normal flow with 'direction: ltr' in vertical-lr (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout" title="7.4 Flow-Relative Mappings" />
+  <link rel="match" href="abs-pos-non-replaced-vlr-007-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="This test checks that when an inline dimension of a non-replaced block in normal flow is over-constrained, the inline-end margin is dropped and recalculated so that the equation involving inline-size is balanced; such equation takes under account the inline's direction (ltr or rtl). In this test, the inline-end margin (physical margin-bottom) is recalculated." />
+
+  <!--
+  "
+  the margin that is dropped when a box’s inline dimension is over-constrained is the end margin as determined by the writing mode of the containing block.
+  "
+  7.4 Flow-Relative Mappings
+  http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+  "
+  'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
+
+  If all of the above have a computed value other than 'auto', the values are said to be "over-constrained" and one of the used values will have to be different from its computed value. If the 'direction' property of the containing block has the value 'ltr', the specified value of 'margin-right' is ignored and the value is calculated so as to make the equality true. If the value of 'direction' is 'rtl', this happens to 'margin-left' instead.
+  "
+  CSS 2.1, section 10.3.3 Block-level, non-replaced elements in normal flow
+  http://www.w3.org/TR/CSS21/visudet.html#blockwidth
+  -->
+
+  <meta name="DC.date.created" content="2015-10-16T09:54:03+11:00" scheme="W3CDTF" />
+  <meta name="DC.date.modified" content="2017-02-18T09:54:03+11:00" scheme="W3CDTF" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      writing-mode: vertical-lr;
+    }
+
+  body#containing-block
+    {
+      background-image: url("support/bg-red-3col-3row-320x320.png");
+      background-position: 198px 8px;
+      /* first value represents the horizontal position and the second represents the vertical position */
+
+      /*
+         16px (p's margin-left)
+     +
+        246px (img's width)
+     +
+         16px (p's margin-right)
+      ========
+        278px
+     -
+         80px (1 column of 80px)
+      ========
+        198px
+      */
+      background-repeat: no-repeat;
+      direction: ltr;
+      height: 320px;
+      margin: 8px;
+    }
+
+  p
+    {
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+
+  div
+    {
+      background-color: green;
+      margin-top: 160px;
+      border-top: green solid 20px;
+      padding-top: 20px;
+      height: 0px;
+      padding-bottom: 20px;
+      border-bottom: green solid 20px;
+      margin-bottom: -160px;
+
+      margin-left: 96px; /* 80px + 16px necessary so that we can reuse an already created and available reference file */
+      width: 80px;
+    }
+
+/*
+"
+Layout calculation rules (such as those in CSS2.1, Section 10.3) that apply to the horizontal dimension in horizontal writing modes instead apply to the vertical dimension in vertical writing modes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#vertical-layout
+
+So here, *-top and *-bottom properties are input into the §10.3.3 algorithms where *-top properties refer to *-left properties in the layout rules and where *-bottom properties refer to *-right properties in the layout rules.
+
+'margin-top' + 'border-top-width' + 'padding-top' + 'height' + 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' = height of containing block
+
+So:
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+    -160px : margin-bottom
+   ========================
+      80px : while the height of containing block of div is 320px
+
+So, here, the specified value of 'margin-bottom' is ignored and the value is calculated so as to make the equality true
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+   (solve) : margin-bottom
+   ========================
+     320px : height of containing block
+
+And so computed margin-bottom value must be 80px .
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body id="containing-block">
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+  <!--
+  The image says:
+  Test passes if there is a filled
+  green square and <strong>no red</strong>.
+  -->
+
+  <div></div>
+
+ </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005-expected.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005-expected.xht
new file mode 100644
index 0000000..299aff3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005-expected.xht

@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <meta content="image" name="flags" />
+
+  <style type="text/css"><![CDATA[
+  div
+    {
+      margin-left: 0.5em;
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+
+  img#green-square
+    {
+      position: relative;
+      left: 96px; /* 80px + p's margin-left (1em) */
+      top: 80px;
+    }
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /><img id="green-square" src="support/swatch-green.png" width="80" height="80" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005.xht
new file mode 100644
index 0000000..2754e24
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vlr-005.xht

@@ -0,0 +1,154 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: non-replaced block in normal flow with 'direction: rtl' in vertical-lr (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout" title="7.4 Flow-Relative Mappings" />
+  <link rel="match" href="abs-pos-non-replaced-vlr-013-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="This test checks that when an inline dimension of a non-replaced block in normal flow is over-constrained, the inline-end margin is dropped and recalculated so that the equation involving inline-size is balanced; such equation takes under account the inline's direction (ltr or rtl). In this test, the inline-end margin (physical margin-top) is recalculated." />
+
+  <!--
+  "
+  the margin that is dropped when a box’s inline dimension is over-constrained is the end margin as determined by the writing mode of the containing block.
+  "
+  7.4 Flow-Relative Mappings
+  http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+  "
+  'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
+
+  If all of the above have a computed value other than 'auto', the values are said to be "over-constrained" and one of the used values will have to be different from its computed value. If the 'direction' property of the containing block has the value 'ltr', the specified value of 'margin-right' is ignored and the value is calculated so as to make the equality true. If the value of 'direction' is 'rtl', this happens to 'margin-left' instead.
+  "
+  CSS 2.1, section 10.3.3 Block-level, non-replaced elements in normal flow
+  http://www.w3.org/TR/CSS21/visudet.html#blockwidth
+  -->
+
+  <meta name="DC.date.created" content="2015-10-16T09:54:03+11:00" scheme="W3CDTF" />
+  <meta name="DC.date.modified" content="2017-02-18T09:54:03+11:00" scheme="W3CDTF" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      writing-mode: vertical-lr;
+    }
+
+  body#containing-block
+    {
+      background-image: url("support/bg-red-3col-2row-320x320.png");
+      background-position: 198px 8px;
+      /* first value represents the horizontal position and the second represents the vertical position */
+
+      /*
+         16px (p's margin-left)
+     +
+        246px (img's width)
+     +
+         16px (p's margin-right)
+      ========
+        278px
+     -
+         80px (1 column of 80px)
+      ========
+        198px
+      */
+      background-repeat: no-repeat;
+      direction: rtl;
+      height: 320px;
+      margin: 8px;
+    }
+
+  p
+    {
+      direction: ltr;
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+
+  div
+    {
+      background-color: green;
+      margin-top: 160px;
+      border-top: green solid 20px;
+      padding-top: 20px;
+      height: 0px;
+      padding-bottom: 20px;
+      border-bottom: green solid 20px;
+      margin-bottom: 160px;
+
+      margin-left: 96px; /* 80px + 16px necessary so that we can reuse an already created and available reference file */
+      width: 80px;
+    }
+
+/*
+"
+Layout calculation rules (such as those in CSS2.1, Section 10.3) that apply to the horizontal dimension in horizontal writing modes instead apply to the vertical dimension in vertical writing modes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#vertical-layout
+
+So here, *-top and *-bottom properties are input into the §10.3.3 algorithms where *-top properties refer to *-left properties in the layout rules and where *-bottom properties refer to *-right properties in the layout rules.
+
+'margin-top' + 'border-top-width' + 'padding-top' + 'height' + 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' = height of containing block
+
+So:
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+     160px : margin-bottom
+   ========================
+     400px : while the height of containing block of div is 320px
+
+So, here, the specified value of 'margin-top' is ignored and the value is calculated so as to make the equality true
+
+   (solve) : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+     160px : margin-bottom
+   ========================
+     320px : height of containing block
+
+And so computed margin-top value must be 80px .
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body id="containing-block">
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+  <!--
+  The image says:
+  Test passes if there is a filled
+  green square and <strong>no red</strong>.
+  -->
+
+  <div></div>
+
+ </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002-expected.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002-expected.xht
new file mode 100644
index 0000000..344ecda5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002-expected.xht

@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <meta content="image" name="flags" />
+
+  <style type="text/css"><![CDATA[
+  body
+    {
+      direction: rtl;
+    }
+
+  div
+    {
+      margin-right: 0.5em;
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+
+  img#green-square
+    {
+      position: relative;
+      right: 96px; /* 80px + p's margin-left (1em) */
+      top: 160px;
+    }
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /><img id="green-square" src="support/swatch-green.png" width="80" height="80" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002.xht
new file mode 100644
index 0000000..ce43f2e3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-002.xht

@@ -0,0 +1,149 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: non-replaced block in normal flow with 'direction: ltr' in vertical-rl (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout" title="7.4 Flow-Relative Mappings" />
+  <link rel="match" href="abs-pos-non-replaced-vrl-006-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="This test checks that when an inline dimension of a non-replaced block in normal flow is over-constrained, the inline-end margin is dropped and recalculated so that the equation involving inline-size is balanced; such equation takes under account the inline's direction (ltr or rtl). In this test, the inline-end margin (physical margin-bottom) is recalculated." />
+
+  <!--
+  "
+  the margin that is dropped when a box’s inline dimension is over-constrained is the end margin as determined by the writing mode of the containing block.
+  "
+  7.4 Flow-Relative Mappings
+  http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+  "
+  'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
+
+  If all of the above have a computed value other than 'auto', the values are said to be "over-constrained" and one of the used values will have to be different from its computed value. If the 'direction' property of the containing block has the value 'ltr', the specified value of 'margin-right' is ignored and the value is calculated so as to make the equality true. If the value of 'direction' is 'rtl', this happens to 'margin-left' instead.
+  "
+  CSS 2.1, section 10.3.3 Block-level, non-replaced elements in normal flow
+  http://www.w3.org/TR/CSS21/visudet.html#blockwidth
+  -->
+
+  <meta name="DC.date.created" content="2015-10-16T09:54:03+11:00" scheme="W3CDTF" />
+  <meta name="DC.date.modified" content="2017-02-18T09:54:03+11:00" scheme="W3CDTF" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      writing-mode: vertical-rl;
+    }
+
+  body#containing-block
+    {
+      background-image: url("support/bg-red-3col-3row-320x320.png");
+      background-position: -152px 8px;
+      /* first value represents the horizontal position and the second represents the vertical position */
+
+      /*
+         8px (body's margin-left)
+      -
+        80px (4th column width)
+      -
+        80px (3rd column width)
+      ========
+      -152px
+      */
+      background-repeat: no-repeat;
+      direction: ltr;
+      height: 320px;
+      margin: 8px;
+    }
+
+  p
+    {
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+
+  div
+    {
+      background-color: green;
+      margin-top: 160px;
+      border-top: green solid 20px;
+      padding-top: 20px;
+      height: 0px;
+      padding-bottom: 20px;
+      border-bottom: green solid 20px;
+      margin-bottom: -160px;
+
+      margin-right: 96px; /* 80px + 16px necessary so that we can reuse an already created and available reference file */
+      width: 80px;
+    }
+
+/*
+"
+Layout calculation rules (such as those in CSS2.1, Section 10.3) that apply to the horizontal dimension in horizontal writing modes instead apply to the vertical dimension in vertical writing modes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#vertical-layout
+
+So here, *-top and *-bottom properties are input into the §10.3.3 algorithms where *-top properties refer to *-left properties in the layout rules and where *-bottom properties refer to *-right properties in the layout rules.
+
+'margin-top' + 'border-top-width' + 'padding-top' + 'height' + 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' = height of containing block
+
+So:
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+    -160px : margin-bottom
+   ========================
+      80px : while the height of containing block of div is 320px
+
+So, here, the specified value of 'margin-bottom' is ignored and the value is calculated so as to make the equality true
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+   (solve) : margin-bottom
+   ========================
+     320px : height of containing block
+
+And so computed margin-bottom value must be 80px .
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body id="containing-block">
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+  <!--
+  The image says:
+  Test passes if there is a filled
+  green square and <strong>no red</strong>.
+  -->
+
+  <div></div>
+
+ </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004-expected.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004-expected.xht
new file mode 100644
index 0000000..a5b83e4b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004-expected.xht

@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+  <meta content="image" name="flags" />
+
+  <style type="text/css"><![CDATA[
+  body
+    {
+      direction: rtl;
+    }
+
+  div
+    {
+      margin-right: 0.5em;
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+
+  img#green-square
+    {
+      position: relative;
+      right: 96px; /* 80px + p's margin-left (1em) */
+      top: 80px;
+    }
+  ]]></style>
+ </head>
+
+ <body>
+
+  <div><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /><img id="green-square" src="support/swatch-green.png" width="80" height="80" alt="Image download support must be enabled" /></div>
+
+ </body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004.xht b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004.xht
new file mode 100644
index 0000000..472405d1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/normal-flow-overconstrained-vrl-004.xht

@@ -0,0 +1,150 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Writing Modes Test: non-replaced block in normal flow with 'direction: rtl' in vertical-rl (overconstrained)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+  <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout" title="7.4 Flow-Relative Mappings" />
+  <link rel="match" href="abs-pos-non-replaced-vrl-012-ref.xht" />
+
+  <meta name="flags" content="ahem image" />
+  <meta name="assert" content="This test checks that when an inline dimension of a non-replaced block in normal flow is over-constrained, the inline-end margin is dropped and recalculated so that the equation involving inline-size is balanced; such equation takes under account the inline's direction (ltr or rtl). In this test, the inline-end margin (physical margin-top) is recalculated." />
+
+  <!--
+  "
+  the margin that is dropped when a box’s inline dimension is over-constrained is the end margin as determined by the writing mode of the containing block.
+  "
+  7.4 Flow-Relative Mappings
+  http://www.w3.org/TR/css-writing-modes-3/#logical-direction-layout
+
+  "
+  'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
+
+  If all of the above have a computed value other than 'auto', the values are said to be "over-constrained" and one of the used values will have to be different from its computed value. If the 'direction' property of the containing block has the value 'ltr', the specified value of 'margin-right' is ignored and the value is calculated so as to make the equality true. If the value of 'direction' is 'rtl', this happens to 'margin-left' instead.
+  "
+  CSS 2.1, section 10.3.3 Block-level, non-replaced elements in normal flow
+  http://www.w3.org/TR/CSS21/visudet.html#blockwidth
+  -->
+
+  <meta name="DC.date.created" content="2015-10-16T09:54:03+11:00" scheme="W3CDTF" />
+  <meta name="DC.date.modified" content="2017-02-18T09:54:03+11:00" scheme="W3CDTF" />
+
+  <style type="text/css"><![CDATA[
+  html
+    {
+      writing-mode: vertical-rl;
+    }
+
+  body#containing-block
+    {
+      background-image: url("support/bg-red-3col-2row-320x320.png");
+      background-position: -152px 8px;
+      /* first value represents the horizontal position and the second represents the vertical position */
+
+      /*
+         8px (body's margin-left)
+      -
+        80px (4th column width)
+      -
+        80px (3rd column width)
+      ========
+      -152px
+      */
+      background-repeat: no-repeat;
+      direction: rtl;
+      height: 320px;
+      margin: 8px;
+    }
+
+  p
+    {
+      direction: ltr;
+      margin-left: 16px;
+      margin-right: 16px;
+    }
+
+  div
+    {
+      background-color: green;
+      margin-top: 160px;
+      border-top: green solid 20px;
+      padding-top: 20px;
+      height: 0px;
+      padding-bottom: 20px;
+      border-bottom: green solid 20px;
+      margin-bottom: 160px;
+
+      margin-right: 96px; /* 80px + 16px necessary so that we can reuse an already created and available reference file */
+      width: 80px;
+    }
+
+/*
+"
+Layout calculation rules (such as those in CSS2.1, Section 10.3) that apply to the horizontal dimension in horizontal writing modes instead apply to the vertical dimension in vertical writing modes.
+"
+7.1 Principles of Layout in Vertical Writing Modes
+http://www.w3.org/TR/css-writing-modes-3/#vertical-layout
+
+So here, *-top and *-bottom properties are input into the §10.3.3 algorithms where *-top properties refer to *-left properties in the layout rules and where *-bottom properties refer to *-right properties in the layout rules.
+
+'margin-top' + 'border-top-width' + 'padding-top' + 'height' + 'padding-bottom' + 'border-bottom-width' + 'margin-bottom' = height of containing block
+
+So:
+
+     160px : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+     160px : margin-bottom
+   ========================
+     400px : while the height of containing block of div is 320px
+
+So, here, the specified value of 'margin-top' is ignored and the value is calculated so as to make the equality true
+
+   (solve) : margin-top
+  +
+      20px : border-top-width
+  +
+      20px : padding-top
+  +
+       0px : height
+  +
+      20px : padding-bottom
+  +
+      20px : border-bottom-width
+  +
+     160px : margin-bottom
+   ========================
+     320px : height of containing block
+
+And so computed margin-top value must be 80px .
+*/
+
+  ]]></style>
+
+ </head>
+
+ <body id="containing-block">
+
+  <p><img src="support/pass-cdts-abs-pos-non-replaced.png" width="246" height="36" alt="Image download support must be enabled" /></p>
+  <!--
+  The image says:
+  Test passes if there is a filled
+  green square and <strong>no red</strong>.
+  -->
+
+  <div></div>
+
+ </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/support/mplus-1p-regular.ttf b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/support/mplus-1p-regular.ttf
new file mode 100644
index 0000000..d7adacb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/support/mplus-1p-regular.ttf
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/text-combine-upright-value-all-001.html b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/text-combine-upright-value-all-001.html
index 31378a2..cd6f35c 100644
--- a/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/text-combine-upright-value-all-001.html
+++ b/third_party/WebKit/LayoutTests/external/csswg-test/css-writing-modes-3/text-combine-upright-value-all-001.html

@@ -7,7 +7,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-writing-modes-3/#text-combine-upright">
 <link rel="match" href="reference/text-combine-upright-value-single-character.html">
 <meta name="assert" content="'text-combine-upright: all' rotates the composition even if tate-chu-yoko">
-<meta name="flags" content="font">
+<meta name="flags" content="">
 <style>
 @font-face {
   font-family: tcu-font;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke-expected.txt
index b194d7b0..742cdc1 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke-expected.txt
+++ b/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke-expected.txt

@@ -1,4 +1,5 @@
 This is a testharness.js-based test.
-FAIL Revoking blob URL used with XMLHttpRequest assert_equals: expected "test" but got ""
+FAIL Revoke blob URL after open(), will fetch assert_equals: expected "test" but got ""
+FAIL Revoke blob URL before open(), network error (after send()) assert_unreached: Got unexpected load event Reached unreachable code
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke.html b/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke.html
index fea313e..a38caaf 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/FileAPI/blob/Blob-XHR-revoke.html

@@ -17,12 +17,22 @@
 
     xhr.send();
 
-    xhr.onload = t.step_func(function() {
+    xhr.onload = t.step_func_done(function() {
         assert_equals(xhr.response, "test");
-        t.done();
     })
     xhr.onerror = t.step_func(function() {
         assert_unreached("Got unexpected error event");
     })
-});
-</script>
\ No newline at end of file
+}, "Revoke blob URL after open(), will fetch");
+
+async_test(t => {
+  const blob = new Blob(["test"]),
+        blobURL = URL.createObjectURL(blob),
+        client = new XMLHttpRequest
+  URL.revokeObjectURL(blobURL)
+  client.open("GET", blobURL)
+  client.onload = t.step_func(() => assert_unreached("Got unexpected load event"))
+  client.onerror = t.step_func_done()
+  client.send()
+}, "Revoke blob URL before open(), network error (after send())")
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/abort-in-initial-upgradeneeded.html b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/abort-in-initial-upgradeneeded.html
index 6330ecb0..20040158 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/abort-in-initial-upgradeneeded.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/abort-in-initial-upgradeneeded.html

@@ -12,7 +12,7 @@
 open_rq.onupgradeneeded = function(e) {
     db = e.target.result;
     assert_equals(db.version, 2);
-    transaction = e.target.transaction;
+    var transaction = e.target.transaction;
     transaction.oncomplete = fail(this, "unexpected transaction.complete");
     transaction.onabort = function(e) {
         assert_equals(e.target.db.version, 0);

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/close-in-upgradeneeded.html b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/close-in-upgradeneeded.html
index eda823a..402906f 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/close-in-upgradeneeded.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/close-in-upgradeneeded.html

@@ -7,6 +7,7 @@
 
 <script>
 
+var db
 var open_rq = createdb(async_test())
 var sawTransactionComplete = false
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbcursor_continue_objectstore.htm b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbcursor_continue_objectstore.htm
index 76750c9..e86edc46 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbcursor_continue_objectstore.htm
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbcursor_continue_objectstore.htm

@@ -25,7 +25,7 @@
         var store = db.transaction("test")
                       .objectStore("test");
 
-        cursor_rq = store.openCursor();
+        var cursor_rq = store.openCursor();
         cursor_rq.onsuccess = t.step_func(function(e) {
             var cursor = e.target.result;
             if (!cursor) {

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html
new file mode 100644
index 0000000..058116f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>IDBFactory.deleteDatabase() and opaque origins</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+
+function load_iframe(src, sandbox) {
+  return new Promise(resolve => {
+    const iframe = document.createElement('iframe');
+    iframe.onload = () => { resolve(iframe); };
+    if (sandbox)
+      iframe.sandbox = sandbox;
+    iframe.srcdoc = src;
+    iframe.style.display = 'none';
+    document.documentElement.appendChild(iframe);
+  });
+}
+
+function wait_for_message(iframe) {
+  return new Promise(resolve => {
+    self.addEventListener('message', function listener(e) {
+      if (e.source === iframe.contentWindow) {
+        resolve(e.data);
+        self.removeEventListener('message', listener);
+      }
+    });
+  });
+}
+
+const script =
+  '<script>' +
+  '  window.onmessage = () => {' +
+  '    try {' +
+  '      const r = indexedDB.deleteDatabase("opaque-origin-test");' +
+  '      window.parent.postMessage({result: "no exception"}, "*");' +
+  '    } catch (ex) {' +
+  '      window.parent.postMessage({result: ex.name}, "*");' +
+  '    };' +
+  '  };' +
+  '<\/script>';
+
+promise_test(t => {
+  return load_iframe(script)
+    .then(iframe => {
+      iframe.contentWindow.postMessage({}, '*');
+      return wait_for_message(iframe);
+    })
+    .then(message => {
+      assert_equals(message.result, 'no exception',
+                    'IDBFactory.deleteDatabase() should not throw');
+    });
+}, 'IDBFactory.deleteDatabase() in non-sandboxed iframe should not throw');
+
+promise_test(t => {
+  return load_iframe(script, 'allow-scripts')
+    .then(iframe => {
+      iframe.contentWindow.postMessage({}, '*');
+      return wait_for_message(iframe);
+    })
+    .then(message => {
+      assert_equals(message.result, 'SecurityError',
+                    'Exception should be SecurityError');
+    });
+}, 'IDBFactory.deleteDatabase() in sandboxed iframe should throw SecurityError');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-open-opaque-origin.html b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-open-opaque-origin.html
new file mode 100644
index 0000000..f69c47d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory-open-opaque-origin.html

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>IDBFactory.open() and opaque origins</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+
+function load_iframe(src, sandbox) {
+  return new Promise(resolve => {
+    const iframe = document.createElement('iframe');
+    iframe.onload = () => { resolve(iframe); };
+    if (sandbox)
+      iframe.sandbox = sandbox;
+    iframe.srcdoc = src;
+    iframe.style.display = 'none';
+    document.documentElement.appendChild(iframe);
+  });
+}
+
+function wait_for_message(iframe) {
+  return new Promise(resolve => {
+    self.addEventListener('message', function listener(e) {
+      if (e.source === iframe.contentWindow) {
+        resolve(e.data);
+        self.removeEventListener('message', listener);
+      }
+    });
+  });
+}
+
+const script =
+  '<script>' +
+  '  window.onmessage = () => {' +
+  '    try {' +
+  '      indexedDB.deleteDatabase("opaque-origin-test");' +
+  '      const r = indexedDB.open("opaque-origin-test");' +
+  '      r.onupgradeneeded = () => { r.transaction.abort(); };' +
+  '      window.parent.postMessage({result: "no exception"}, "*");' +
+  '    } catch (ex) {' +
+  '      window.parent.postMessage({result: ex.name}, "*");' +
+  '    };' +
+  '  };' +
+  '<\/script>';
+
+promise_test(t => {
+  return load_iframe(script)
+    .then(iframe => {
+      iframe.contentWindow.postMessage({}, '*');
+      return wait_for_message(iframe);
+    })
+    .then(message => {
+      assert_equals(message.result, 'no exception',
+                    'IDBFactory.open() should not throw');
+    });
+}, 'IDBFactory.open() in non-sandboxed iframe should not throw');
+
+promise_test(t => {
+  return load_iframe(script, 'allow-scripts')
+    .then(iframe => {
+      iframe.contentWindow.postMessage({}, '*');
+      return wait_for_message(iframe);
+    })
+    .then(message => {
+      assert_equals(message.result, 'SecurityError',
+                    'Exception should be SecurityError');
+    });
+}, 'IDBFactory.open() in sandboxed iframe should throw SecurityError');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory_deleteDatabase4.htm b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory_deleteDatabase4.htm
index 3a4e9944..f3ceeb0 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory_deleteDatabase4.htm
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbfactory_deleteDatabase4.htm

@@ -12,6 +12,7 @@
     var t = async_test("Delete an existing database");
 
     t.step(function() {
+        var db;
         var openrq = indexedDB.open('db', 3);
 
         openrq.onupgradeneeded = function(e) {
@@ -44,8 +45,8 @@
         deleterq.onupgradeneeded = fail(t, "delete.upgradeneeded");
     }
 
-    async_test("Delete a nonexistant database").step(function(e) {
-        var deleterq = indexedDB.deleteDatabase('nonexistant');
+    async_test("Delete a nonexistent database").step(function(e) {
+        var deleterq = indexedDB.deleteDatabase('nonexistent');
 
         deleterq.onsuccess = this.step_func(function(e) { this.done(); });
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbindex_get.htm b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbindex_get.htm
index 835cbef..5afd8b5 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbindex_get.htm
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbindex_get.htm

@@ -7,7 +7,7 @@
 <script src="support.js"></script>
 
 <script>
-    var db,
+    var db, index,
       t = async_test(),
       record = { key: 1, indexedProperty: "data" };
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbobjectstore_createIndex13.htm b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbobjectstore_createIndex13.htm
index fb70cc72..ac32df6 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbobjectstore_createIndex13.htm
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/idbobjectstore_createIndex13.htm

@@ -19,7 +19,7 @@
 
     open_rq.onsuccess = function (event) {
         var txn = db.transaction("store", "readwrite");
-        ostore = txn.objectStore("store");
+        var ostore = txn.objectStore("store");
         t.step(function(){
             assert_throws("InvalidStateError", function(){
                 ostore.createIndex("index", "indexedProperty");

diff --git a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/keypath_invalid.htm b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/keypath_invalid.htm
index 9c5bd6c..1a4357b 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/keypath_invalid.htm
+++ b/third_party/WebKit/LayoutTests/external/wpt/IndexedDB/keypath_invalid.htm

@@ -24,7 +24,7 @@
                     db.createObjectStore(store_name, { keyPath: keypath })
                 }, "createObjectStore with keyPath");
 
-            store = db.createObjectStore(store_name);
+            var store = db.createObjectStore(store_name);
             assert_throws('SyntaxError', function() {
                     store.createIndex('index', keypath);
                 }, "createIndex with keyPath");

diff --git a/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json b/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json
index c4464d8..d370ed2 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json
+++ b/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json

@@ -13,6 +13,18 @@
      {}
     ]
    ],
+   "fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html": [
+    [
+     "/fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html",
+     {}
+    ]
+   ],
+   "fullscreen/api/document-exit-fullscreen-nested-manual.html": [
+    [
+     "/fullscreen/api/document-exit-fullscreen-nested-manual.html",
+     {}
+    ]
+   ],
    "fullscreen/api/document-exit-fullscreen-timing-manual.html": [
     [
      "/fullscreen/api/document-exit-fullscreen-timing-manual.html",
@@ -313,6 +325,12 @@
      {}
     ]
    ],
+   "mediacapture-streams/MediaStreamTrack-end-manual.html": [
+    [
+     "/mediacapture-streams/MediaStreamTrack-end-manual.html",
+     {}
+    ]
+   ],
    "pointerevents/compat/pointerevent_touch-action_two-finger_interaction-manual.html": [
     [
      "/pointerevents/compat/pointerevent_touch-action_two-finger_interaction-manual.html",
@@ -355,6 +373,12 @@
      {}
     ]
    ],
+   "pointerevents/pointerevent_click_during_capture-manual.html": [
+    [
+     "/pointerevents/pointerevent_click_during_capture-manual.html",
+     {}
+    ]
+   ],
    "pointerevents/pointerevent_element_haspointercapture-manual.html": [
     [
      "/pointerevents/pointerevent_element_haspointercapture-manual.html",
@@ -6499,11 +6523,6 @@
      {}
     ]
    ],
-   "./MANIFEST.json": [
-    [
-     {}
-    ]
-   ],
    "./README.md": [
     [
      {}
@@ -17669,11 +17688,6 @@
      {}
     ]
    ],
-   "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers": [
-    [
-     {}
-    ]
-   ],
    "html/syntax/parsing-html-fragments/the-input-byte-stream-016.html.headers": [
     [
      {}
@@ -18444,6 +18458,51 @@
      {}
     ]
    ],
+   "mediacapture-streams/GUM-deny.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/GUM-empty-option-param.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/GUM-impossible-constraint.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/GUM-unknownkey-option-param.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaStream-MediaElement-preload-none.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaStream-MediaElement-srcObject.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-streams/MediaStreamTrack-init.https-expected.txt": [
+    [
+     {}
+    ]
+   ],
    "mediasession/README.md": [
     [
      {}
@@ -23164,6 +23223,11 @@
      {}
     ]
    ],
+   "streams/writable-streams/reentrant-strategy.js": [
+    [
+     {}
+    ]
+   ],
    "streams/writable-streams/start.js": [
     [
      {}
@@ -25594,36 +25658,6 @@
      {}
     ]
    ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/align-expected.txt": [
-    [
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML-expected.txt": [
-    [
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/line-expected.txt": [
-    [
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines-expected.txt": [
-    [
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/text-expected.txt": [
-    [
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/vertical-expected.txt": [
-    [
-     {}
-    ]
-   ],
    "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/buildtests.py": [
     [
      {}
@@ -27110,6 +27144,18 @@
      {}
     ]
    ],
+   "IndexedDB/idbfactory-deleteDatabase-opaque-origin.html": [
+    [
+     "/IndexedDB/idbfactory-deleteDatabase-opaque-origin.html",
+     {}
+    ]
+   ],
+   "IndexedDB/idbfactory-open-opaque-origin.html": [
+    [
+     "/IndexedDB/idbfactory-open-opaque-origin.html",
+     {}
+    ]
+   ],
    "IndexedDB/idbfactory_cmp.htm": [
     [
      "/IndexedDB/idbfactory_cmp.htm",
@@ -37956,12 +38002,6 @@
      {}
     ]
    ],
-   "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html": [
-    [
-     "/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html",
-     {}
-    ]
-   ],
    "html/syntax/parsing-html-fragments/the-input-byte-stream-016.html": [
     [
      "/html/syntax/parsing-html-fragments/the-input-byte-stream-016.html",
@@ -40016,12 +40056,6 @@
      {}
     ]
    ],
-   "mediacapture-streams/MediaStreamTrack-end.https.html": [
-    [
-     "/mediacapture-streams/MediaStreamTrack-end.https.html",
-     {}
-    ]
-   ],
    "mediacapture-streams/MediaStreamTrack-id.https.html": [
     [
      "/mediacapture-streams/MediaStreamTrack-id.https.html",
@@ -49916,6 +49950,12 @@
      {}
     ]
    ],
+   "selection/removeRange.html": [
+    [
+     "/selection/removeRange.html",
+     {}
+    ]
+   ],
    "selection/selectAllChildren.html": [
     [
      "/selection/selectAllChildren.html",
@@ -51322,6 +51362,12 @@
      {}
     ]
    ],
+   "storage/opaque-origin.https.html": [
+    [
+     "/storage/opaque-origin.https.html",
+     {}
+    ]
+   ],
    "streams/byte-length-queuing-strategy.dedicatedworker.html": [
     [
      "/streams/byte-length-queuing-strategy.dedicatedworker.html",
@@ -52138,6 +52184,30 @@
      {}
     ]
    ],
+   "streams/writable-streams/reentrant-strategy.dedicatedworker.html": [
+    [
+     "/streams/writable-streams/reentrant-strategy.dedicatedworker.html",
+     {}
+    ]
+   ],
+   "streams/writable-streams/reentrant-strategy.html": [
+    [
+     "/streams/writable-streams/reentrant-strategy.html",
+     {}
+    ]
+   ],
+   "streams/writable-streams/reentrant-strategy.serviceworker.https.html": [
+    [
+     "/streams/writable-streams/reentrant-strategy.serviceworker.https.html",
+     {}
+    ]
+   ],
+   "streams/writable-streams/reentrant-strategy.sharedworker.html": [
+    [
+     "/streams/writable-streams/reentrant-strategy.sharedworker.html",
+     {}
+    ]
+   ],
    "streams/writable-streams/start.dedicatedworker.html": [
     [
      "/streams/writable-streams/start.dedicatedworker.html",
@@ -52726,6 +52796,12 @@
      {}
     ]
    ],
+   "web-animations/timing-model/animation-effects/local-time.html": [
+    [
+     "/web-animations/timing-model/animation-effects/local-time.html",
+     {}
+    ]
+   ],
    "web-animations/timing-model/animation-effects/phases-and-states.html": [
     [
      "/web-animations/timing-model/animation-effects/phases-and-states.html",
@@ -53662,48 +53738,132 @@
      {}
     ]
    ],
+   "webvtt/api/VTTCue/align.html": [
+    [
+     "/webvtt/api/VTTCue/align.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/constructor.html": [
+    [
+     "/webvtt/api/VTTCue/constructor.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/getCueAsHTML.html": [
+    [
+     "/webvtt/api/VTTCue/getCueAsHTML.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/line.html": [
+    [
+     "/webvtt/api/VTTCue/line.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/lineAlign.html": [
+    [
+     "/webvtt/api/VTTCue/lineAlign.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/position.html": [
+    [
+     "/webvtt/api/VTTCue/position.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/positionAlign.html": [
+    [
+     "/webvtt/api/VTTCue/positionAlign.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/region.html": [
+    [
+     "/webvtt/api/VTTCue/region.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/size.html": [
+    [
+     "/webvtt/api/VTTCue/size.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/snapToLines.html": [
+    [
+     "/webvtt/api/VTTCue/snapToLines.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/text.html": [
+    [
+     "/webvtt/api/VTTCue/text.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTCue/vertical.html": [
+    [
+     "/webvtt/api/VTTCue/vertical.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/constructor.html": [
+    [
+     "/webvtt/api/VTTRegion/constructor.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/lines.html": [
+    [
+     "/webvtt/api/VTTRegion/lines.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/regionAnchorX.html": [
+    [
+     "/webvtt/api/VTTRegion/regionAnchorX.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/regionAnchorY.html": [
+    [
+     "/webvtt/api/VTTRegion/regionAnchorY.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/scroll.html": [
+    [
+     "/webvtt/api/VTTRegion/scroll.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/viewportAnchorX.html": [
+    [
+     "/webvtt/api/VTTRegion/viewportAnchorX.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/viewportAnchorY.html": [
+    [
+     "/webvtt/api/VTTRegion/viewportAnchorY.html",
+     {}
+    ]
+   ],
+   "webvtt/api/VTTRegion/width.html": [
+    [
+     "/webvtt/api/VTTRegion/width.html",
+     {}
+    ]
+   ],
    "webvtt/interfaces.html": [
     [
      "/webvtt/interfaces.html",
      {}
     ]
    ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/align.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/align.html",
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html",
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/line.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/line.html",
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html",
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/text.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/text.html",
-     {}
-    ]
-   ],
-   "webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html": [
-    [
-     "/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html",
-     {}
-    ]
-   ],
    "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/entities.html": [
     [
      "/webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/tests/entities.html",
@@ -54766,7 +54926,7 @@
    "support"
   ],
   "./MANIFEST.json": [
-   "9308ccf7a833b8f021128cebbb59c78a5b03a9ae",
+   "49ed1806559e344b58eda2479a32992e41b5ecdd",
    "support"
   ],
   "./README.md": [
@@ -54774,7 +54934,7 @@
    "support"
   ],
   "./check_stability.py": [
-   "0a0ea60b590564b4099d05d82131da247ee63c33",
+   "5f8efc8738edef4c84109e3547658d4cab37357d",
    "support"
   ],
   "./ci_built_diff.sh": [
@@ -54834,7 +54994,7 @@
    "support"
   ],
   "FileAPI/blob/Blob-XHR-revoke.html": [
-   "3db9200582a45806ecfae1d0f10bbd6f934de448",
+   "5858a79442dcad6325b3ab4bb6a20fc302fcf64c",
    "testharness"
   ],
   "FileAPI/blob/Blob-constructor-expected.txt": [
@@ -55006,7 +55166,7 @@
    "support"
   ],
   "IndexedDB/abort-in-initial-upgradeneeded.html": [
-   "efc9c2476e812f1bb378665f397f71c590439006",
+   "4cd712bd5fed3581ed770c4dbc4200f3a50c5299",
    "testharness"
   ],
   "IndexedDB/bindings-inject-key.html": [
@@ -55018,7 +55178,7 @@
    "testharness"
   ],
   "IndexedDB/close-in-upgradeneeded.html": [
-   "949f5e8a429a7524c9a68ef0d19baf04dadbd84a",
+   "835c1e1a408e9a6a2c5347eb3a98ba4b40571bb1",
    "testharness"
   ],
   "IndexedDB/cursor-overloads.htm": [
@@ -55222,7 +55382,7 @@
    "testharness"
   ],
   "IndexedDB/idbcursor_continue_objectstore.htm": [
-   "10ae006680c7963f0b09dcfcf26eaf5d62aed3cc",
+   "d494e8553d1ff8c72cd3b39cbf32b55d4d299710",
    "testharness"
   ],
   "IndexedDB/idbcursor_continue_objectstore2.htm": [
@@ -55481,6 +55641,14 @@
    "6a20bae0d687ff41608e222d1f477606831e2164",
    "testharness"
   ],
+  "IndexedDB/idbfactory-deleteDatabase-opaque-origin.html": [
+   "faebbda16f92e9d993086578e12fd5ccdb794749",
+   "testharness"
+  ],
+  "IndexedDB/idbfactory-open-opaque-origin.html": [
+   "f29edb81b7c6cf534d48e1485f219d51c047c02e",
+   "testharness"
+  ],
   "IndexedDB/idbfactory_cmp.htm": [
    "6a00456a5f0011cf389d2f327f370b21829713cd",
    "testharness"
@@ -55510,7 +55678,7 @@
    "testharness"
   ],
   "IndexedDB/idbfactory_deleteDatabase4.htm": [
-   "bdd320c4530d4ec4c9aa92d7283e5458ea92ec25",
+   "10109da5b09ab80f71c69422662840c8b637c560",
    "testharness"
   ],
   "IndexedDB/idbfactory_open.htm": [
@@ -55614,7 +55782,7 @@
    "testharness"
   ],
   "IndexedDB/idbindex_get.htm": [
-   "32d6d204c0d52f2e4ebf4649ddb1482d2ca2bbf7",
+   "fe9ff4b4c3d8ea03ace7ff6dd9cec91ed9b6e118",
    "testharness"
   ],
   "IndexedDB/idbindex_get2.htm": [
@@ -55882,7 +56050,7 @@
    "testharness"
   ],
   "IndexedDB/idbobjectstore_createIndex13.htm": [
-   "180c2699b841636a3bec5a857ad1690af2e7d729",
+   "04af5554d0a8f1c8d4ffce81662ba8b69501b011",
    "testharness"
   ],
   "IndexedDB/idbobjectstore_createIndex14-exception_order.htm": [
@@ -56178,7 +56346,7 @@
    "testharness"
   ],
   "IndexedDB/keypath_invalid.htm": [
-   "d5ac98199a0ab7a4e05c88d9480613d9d34f4181",
+   "7d6bf2f7cf77bdafd5b3b5e3f82299f844bd7225",
    "testharness"
   ],
   "IndexedDB/keypath_maxsize.htm": [
@@ -61393,6 +61561,14 @@
    "673d72414fab3dbb677d21a05008d9014daf71bf",
    "manual"
   ],
+  "fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html": [
+   "521f776f725c48e6f38bd8af3e6bff498c8ea604",
+   "manual"
+  ],
+  "fullscreen/api/document-exit-fullscreen-nested-manual.html": [
+   "5ddaf5fd8c2aef02fc4cefffa80a569e513a5491",
+   "manual"
+  ],
   "fullscreen/api/document-exit-fullscreen-timing-manual-expected.txt": [
    "bb2508e35e8e52593e6fc4282f17c186f31e6bd3",
    "support"
@@ -62194,7 +62370,7 @@
    "support"
   ],
   "html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html": [
-   "c98f22b2c05a3c6e3df1d90e88f5d59dd5f4cd86",
+   "3164df75ba277feef3b5c9a1ff6021f3e51d48de",
    "testharness"
   ],
   "html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back-1.html": [
@@ -63090,11 +63266,11 @@
    "support"
   ],
   "html/browsers/offline/application-cache-api/api_update.html": [
-   "d749e9f18bb01cf2e9fb114b86210b18a93b28b4",
+   "99e4b5d9ebec73a932fe522aceece7fb3b94ef26",
    "testharness"
   ],
   "html/browsers/offline/application-cache-api/api_update_error.html": [
-   "51873cf265052ac2c96f155c564e1900e29a4063",
+   "a08540b1a71a7512a8b9cc2b0af28fd5c64bfe25",
    "testharness"
   ],
   "html/browsers/offline/browser-state/navigator_online_online.html": [
@@ -63430,7 +63606,7 @@
    "testharness"
   ],
   "html/browsers/the-window-object/support/noopener-target.html": [
-   "a2872e4bb40c8b186774d82eea5db6d9875a8b50",
+   "8b54eda2f83525a82588c889a0a24e2356cac670",
    "support"
   ],
   "html/browsers/the-window-object/the-windowproxy-object/test-window-proxy-locationbar-manual.html": [
@@ -63486,7 +63662,7 @@
    "testharness"
   ],
   "html/browsers/the-window-object/window-open-noopener.html": [
-   "d362bf2698f0d6f752bba6b9b094e6c41026ccd9",
+   "2e20bfcd1dfe9bee00a9747b87cdaf42004d6415",
    "testharness"
   ],
   "html/browsers/the-window-object/window-properties-expected.txt": [
@@ -69202,7 +69378,7 @@
    "testharness"
   ],
   "html/semantics/document-metadata/styling/LinkStyle.html": [
-   "d1d35da0a14099a63d595edfc42b1570342d36eb",
+   "9204127131c4ff7c7fc7753733c54f4a13242131",
    "testharness"
   ],
   "html/semantics/document-metadata/styling/support/alternate.css": [
@@ -70942,7 +71118,7 @@
    "testharness"
   ],
   "html/semantics/forms/the-select-element/selected-index.html": [
-   "3ab30abb683f3fb42b6fdc84555126379d472a3d",
+   "0753a7487a10bde3b879d4c2ed10ba3d0260a48a",
    "testharness"
   ],
   "html/semantics/forms/the-textarea-element/cloning-steps.html": [
@@ -72465,14 +72641,6 @@
    "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
    "support"
   ],
-  "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html": [
-   "3189757330f3abc8d209f9c75827d6ea616800b8",
-   "testharness"
-  ],
-  "html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers": [
-   "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
-   "support"
-  ],
   "html/syntax/parsing-html-fragments/the-input-byte-stream-016.html": [
    "60de0ad291a918bacc47556736867f671bdd1bb8",
    "testharness"
@@ -72974,7 +73142,7 @@
    "testharness"
   ],
   "html/syntax/parsing/test.js": [
-   "601fc3cf58080c100c5f0a16f097d5d518d91efe",
+   "2ac20d68953dd8e0374d8bb35616277a6f1d1eeb",
    "support"
   ],
   "html/syntax/parsing/the-end.html": [
@@ -73274,7 +73442,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html": [
-   "0a588a749377d21e08f33da857500f921a07be99",
+   "6f49f9b984646f1738988f16d57c18278754c31e",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-cross-origin.html": [
@@ -73302,7 +73470,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html": [
-   "ad60cdcd56908e83491aa08adf3c65c9fb0dc839",
+   "ef844547e22243e00605fe61dae98fc4799849b1",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout-expected.txt": [
@@ -73310,7 +73478,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html": [
-   "f7e2f3cb84041a8fd81eef525697348460f02d34",
+   "a76b8a140592153305d33c6cebe987754d6d42d3",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/compile-error-same-origin-with-hash-expected.txt": [
@@ -73346,7 +73514,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html": [
-   "8eb05dee678b74a75a37ca556c8db3c6ce90cd49",
+   "b97829dfacc9ff0e1ef650cdd3cf4ccb9138f7fc",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-cross-origin.html": [
@@ -73370,7 +73538,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html": [
-   "7130ee175c71eac941e471f8d387d6fc96a699a4",
+   "7e8952fe584c9f7e8e04777d2d4946d54eb6f288",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout-expected.txt": [
@@ -73378,7 +73546,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html": [
-   "18eee3a24d9569ff4bf8d48e5480da0adc42b724",
+   "51840a7f6f72e730c7d7410bdbe80e9c9d9eb6fe",
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html": [
@@ -73402,7 +73570,7 @@
    "testharness"
   ],
   "html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js": [
-   "125f465530468196b263492b0d7ff48b2f5aa27e",
+   "35395df72ad9dd2ba9138588ad29a348f9b7ac44",
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/support/syntax-error-in-setTimeout.js": [
@@ -73414,7 +73582,7 @@
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js": [
-   "5a5ed170634b7d057b962ef3fa6c849f97e0ac9d",
+   "17951f5292839ac7fd3d761946e8fefdcfe815f5",
    "support"
   ],
   "html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setTimeout.js": [
@@ -73909,14 +74077,26 @@
    "6f4e3b2b4fdb287f99935193f273cb21becb9669",
    "testharness"
   ],
+  "mediacapture-streams/GUM-deny.https-expected.txt": [
+   "a139d610439c4e0bb551e8b045841b33d6301126",
+   "support"
+  ],
   "mediacapture-streams/GUM-deny.https.html": [
    "58581b53ff1a1edd5144c428145d668b073ef22f",
    "testharness"
   ],
+  "mediacapture-streams/GUM-empty-option-param.https-expected.txt": [
+   "8f79868c0b4c44940c4cc094ba09dd30d0b6db64",
+   "support"
+  ],
   "mediacapture-streams/GUM-empty-option-param.https.html": [
    "64d32a60ba62577a02f7314db5c1e43d3b0d51a9",
    "testharness"
   ],
+  "mediacapture-streams/GUM-impossible-constraint.https-expected.txt": [
+   "83ef33025b6b7776852d8501718b670185056542",
+   "support"
+  ],
   "mediacapture-streams/GUM-impossible-constraint.https.html": [
    "d0f93cff7289917b298a33691204509188bb633d",
    "testharness"
@@ -73929,6 +74109,10 @@
    "46175d553affeaa8c801359261816430f8b1fdb8",
    "testharness"
   ],
+  "mediacapture-streams/GUM-unknownkey-option-param.https-expected.txt": [
+   "9a5065e1618f5d521471588f2c663964fcc4eb7c",
+   "support"
+  ],
   "mediacapture-streams/GUM-unknownkey-option-param.https.html": [
    "bfd825c8fb46797d043d57d70689a766fa557bd3",
    "testharness"
@@ -73941,10 +74125,18 @@
    "a515deeec87c394b4a826b538df6dd0baa05cae6",
    "testharness"
   ],
+  "mediacapture-streams/MediaStream-MediaElement-preload-none.https-expected.txt": [
+   "14e91f187214e8302a40719cb4ef2f69e1b1f59d",
+   "support"
+  ],
   "mediacapture-streams/MediaStream-MediaElement-preload-none.https.html": [
-   "f80c766d154b39a83b9a09b5a1c099ddb7336351",
+   "0f2bbd7581f2f51376b7fada199b4d436f411dba",
    "testharness"
   ],
+  "mediacapture-streams/MediaStream-MediaElement-srcObject.https-expected.txt": [
+   "06ea90d42bbf5737624f3582a8726301e938540b",
+   "support"
+  ],
   "mediacapture-streams/MediaStream-MediaElement-srcObject.https.html": [
    "f90dade04a03631f9c56333f621fd6379eb48998",
    "testharness"
@@ -73981,22 +74173,34 @@
    "5f3e3390b52c567894cbcdf610489fc5b17ec94d",
    "testharness"
   ],
+  "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https-expected.txt": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
   "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html": [
    "48620661c2947245554e227d559d551a93787ae2",
    "testharness"
   ],
+  "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https-expected.txt": [
+   "4034d28ea06d606101c2f0be58bcc312075da025",
+   "support"
+  ],
   "mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html": [
    "ff30dfac08aae859ad469c15fd7e5469b830d3a9",
    "testharness"
   ],
-  "mediacapture-streams/MediaStreamTrack-end.https.html": [
+  "mediacapture-streams/MediaStreamTrack-end-manual.html": [
    "e5550adb1a9ce03ba672271aa1cdcec7ffde27d6",
-   "testharness"
+   "manual"
   ],
   "mediacapture-streams/MediaStreamTrack-id.https.html": [
    "ea67395aec0f0c619ba7b94eb4bd26b317a945d3",
    "testharness"
   ],
+  "mediacapture-streams/MediaStreamTrack-init.https-expected.txt": [
+   "502d913f8ca1178e71eec066f3761a726607b93e",
+   "support"
+  ],
   "mediacapture-streams/MediaStreamTrack-init.https.html": [
    "5cbc929d8add4eea27950f9b193001566d838f9e",
    "testharness"
@@ -75917,6 +76121,10 @@
    "c1bc66cc70a1d58ab31d00717a688c66e39533c2",
    "manual"
   ],
+  "pointerevents/pointerevent_click_during_capture-manual.html": [
+   "19fedd25b597078b6a828e6fa0cd997e68cdf661",
+   "manual"
+  ],
   "pointerevents/pointerevent_constructor.html": [
    "0b247d3b7dfd047c217a78c59652a3c32df0fcfa",
    "testharness"
@@ -83265,6 +83473,10 @@
    "23385a72a586db288b282eb251f9384048532666",
    "testharness"
   ],
+  "selection/removeRange.html": [
+   "9a4f6531d510b781edd02acae9ffd2453bf48423",
+   "testharness"
+  ],
   "selection/selectAllChildren.html": [
    "1951e6d34c7959c038146efde2d49a7898eaee29",
    "testharness"
@@ -83962,7 +84174,7 @@
    "testharness"
   ],
   "service-workers/service-worker/request-end-to-end.https.html": [
-   "751848110fcccb77528114424511fd53857e38ff",
+   "1e2b1ee0455beeb2a609e927d2bf2655a9a801f6",
    "testharness"
   ],
   "service-workers/service-worker/resource-timing.https-expected.txt": [
@@ -84454,7 +84666,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/request-end-to-end-worker.js": [
-   "90e12e47594d86ca558d755880c80c1fba257a87",
+   "cafcb5f15ae073a68fbd10629374d8ad8f2b3b3c",
    "support"
   ],
   "service-workers/service-worker/resources/request-headers.py": [
@@ -85146,7 +85358,7 @@
    "testharness"
   ],
   "shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html": [
-   "a849b5ce7ab54771eed9315851665f54f8169ee2",
+   "aa57cc92b2ce5ba36a9ef1b5d307ffb9d35ccc01",
    "testharness"
   ],
   "shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-002.html": [
@@ -85317,6 +85529,10 @@
    "da11cf56486fe08214f91d181b3a19775f6aa59c",
    "testharness"
   ],
+  "storage/opaque-origin.https.html": [
+   "6ce5a9b14d80030f0adfa1808857294e8c923cb2",
+   "testharness"
+  ],
   "streams/README.md": [
    "301e457a14a26ed154a55d2811e32d5ceb4b004c",
    "support"
@@ -86038,7 +86254,7 @@
    "testharness"
   ],
   "streams/writable-streams/bad-strategies.js": [
-   "58cf46e9e07c61e2a7d170cb93837b9e16aa66e3",
+   "a7a30fd91bba81c332a3447c99a5a0354dda04b4",
    "support"
   ],
   "streams/writable-streams/bad-strategies.serviceworker-expected.txt": [
@@ -86241,6 +86457,26 @@
    "44f9ceaa3bfc9d8b92885997d322486bd0f237a6",
    "testharness"
   ],
+  "streams/writable-streams/reentrant-strategy.dedicatedworker.html": [
+   "5d9e5a6b69fbe79183ac6e0d2c8559f13be6e386",
+   "testharness"
+  ],
+  "streams/writable-streams/reentrant-strategy.html": [
+   "c05bf8306c3fe8e97b936a26c6de1649e9d0d243",
+   "testharness"
+  ],
+  "streams/writable-streams/reentrant-strategy.js": [
+   "e5e39b5045b532bbb9999c3c87c998ed0f6f33b1",
+   "support"
+  ],
+  "streams/writable-streams/reentrant-strategy.serviceworker.https.html": [
+   "663075ee687ea54010f76d0e37191e46f37b9a49",
+   "testharness"
+  ],
+  "streams/writable-streams/reentrant-strategy.sharedworker.html": [
+   "5dabe1367481c57c58fe208ba66d8c13d4e2b796",
+   "testharness"
+  ],
   "streams/writable-streams/start.dedicatedworker.html": [
    "cef789c53d44cdb3e20a1187c90aae8c5d25d488",
    "testharness"
@@ -87078,27 +87314,27 @@
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/delay.html": [
-   "e70fdbf4ae3afd405f53fc3e2efcdf2d9d71204b",
+   "ee2d870fae13e77e500e7067b89dbb79bd2d209a",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/direction.html": [
-   "ab150d71daf36949d4d6804033e19c734a68552d",
+   "87eb8b9a7b954e0eb77566eefb3034cd6235296f",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/duration.html": [
-   "2e0f0a270b8acd3d345732327ee2eabd32bdb2b2",
+   "4db95d7e5f518fc812886e7dcfddd40943077f90",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/easing.html": [
-   "5d21bb3ae43da1226f9510595b47b452b3b8f223",
+   "3d0175c4879d60ee04442debf32b00ee8241bda5",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/endDelay.html": [
-   "644eed9bf43bb0332ee33842ba0ad4423d90fc90",
+   "fde46c549f70439c80e3990ebf6897d6d6dfb76e",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/fill.html": [
-   "bf5b77d3c96e737700e51f8a2c5b8e2b9629902f",
+   "adc56d3ce3595154045cb87e1cb89fe7ce2096ba",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/getAnimations.html": [
@@ -87118,11 +87354,11 @@
    "support"
   ],
   "web-animations/interfaces/AnimationEffectTiming/iterationStart.html": [
-   "3fc37ef76990ed1b4f742c0478985fcaa03b6ff8",
+   "1ddaceeb8b5e3fc93e5bf4dc1136e8714a08f474",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffectTiming/iterations.html": [
-   "1eadd48065f48cb9cb0cbcf7ac08e96b985ff0e5",
+   "9a6eae75862dec36b7839dc68edc31891a651284",
    "testharness"
   ],
   "web-animations/interfaces/AnimationTimeline/document-timeline.html": [
@@ -87253,6 +87489,10 @@
    "b08a35ae832ce33da7fe7fee22e589a6b85a6353",
    "testharness"
   ],
+  "web-animations/timing-model/animation-effects/local-time.html": [
+   "4b24cf2374a690395398f8caed9d340667dd0a9d",
+   "testharness"
+  ],
   "web-animations/timing-model/animation-effects/phases-and-states-expected.txt": [
    "502697f5bcde3a851b4fd5eb441f62974cd103da",
    "support"
@@ -88045,6 +88285,86 @@
    "ecfd51818c20d46b9983bb1d045a9308fc9a26b7",
    "testharness"
   ],
+  "webvtt/api/VTTCue/align.html": [
+   "be0efb52616f9447139c536269f8365cf78027d0",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/constructor.html": [
+   "c844f513868cbf4053c70f37bbb630b53a763a2a",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/getCueAsHTML.html": [
+   "2c4a14607efdc17772f2878e9c0943300a2f8840",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/line.html": [
+   "2b57866c1bec1c074f18218a994194c9adfc4b7a",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/lineAlign.html": [
+   "72c3bc90e36c046c170e5c5cfb035c3efc990068",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/position.html": [
+   "af2af913e9d0bd5bc52f7900fe35ed6ab5a405c6",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/positionAlign.html": [
+   "8629fc577988d8594f550d12b8ffc1a45bc3e376",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/region.html": [
+   "13857e6b5fdd7091ea05829c333f90575f3502f4",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/size.html": [
+   "54aecea9f627426c7126fa15b4e0295417d68874",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/snapToLines.html": [
+   "aaca4c55f900600f7334f196d7275d69ffe7f0f9",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/text.html": [
+   "d7597ca893a7d2be17b908efa55cb70727d64f0b",
+   "testharness"
+  ],
+  "webvtt/api/VTTCue/vertical.html": [
+   "9f415b3a239e0a380a03411827c38abd4532ef1a",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/constructor.html": [
+   "0ee58bc32daf656ddc1c8ea6eec84f487b2bf010",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/lines.html": [
+   "c0a1332a0d0c9b0d079d369c2dcf53687d478005",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/regionAnchorX.html": [
+   "1ec595b78b2a28b04395db6eb9d79055a0eca9fc",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/regionAnchorY.html": [
+   "c100e095d0abf50e43d2bde458b8968c33aedead",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/scroll.html": [
+   "48c364fe76b641dddef42ac9ed7ecc14e01254b1",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/viewportAnchorX.html": [
+   "51d892bf9b458b9eb3556d51a5aab5ad1e6f3d71",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/viewportAnchorY.html": [
+   "d6628d8cd499e8d6fb0a1e9823e3adf947110759",
+   "testharness"
+  ],
+  "webvtt/api/VTTRegion/width.html": [
+   "c091d65379708544f68000e8938d45257d9fc292",
+   "testharness"
+  ],
   "webvtt/interfaces-expected.txt": [
    "8dd4d09321332d620e50160d2f7f60ea4a2d2bd6",
    "support"
@@ -90121,54 +90441,6 @@
    "f2372a492268a1b17763a42a808351128128fd89",
    "reftest"
   ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/align-expected.txt": [
-   "e82503e83ba539f896b353dd6a358f2475c063c8",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/align.html": [
-   "49a9bf76b1a8d907e48ca95d3e8d3b0afc306566",
-   "testharness"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML-expected.txt": [
-   "1ad453df49e45ff18cd6a6681ecad254f18c10ee",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html": [
-   "79c03cfbda74f1047bd88886fa6ab44ce0c9cded",
-   "testharness"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/line-expected.txt": [
-   "3e11ceaab25e30c8c1aabed811b884bdccda9441",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/line.html": [
-   "f76ca4b827ed42faa1c46e6a8a6a4dc66938f6e3",
-   "testharness"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines-expected.txt": [
-   "c456dfc5bb6f8a876ed57b51c7158f5e88e3fff3",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html": [
-   "365542b9a68ddb679408e5b9df16ff77027e125a",
-   "testharness"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/text-expected.txt": [
-   "c070481c2ea2189090684786662a3009d3ba544a",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/text.html": [
-   "a02594bd42c9564554bb876b1d931a28877b8315",
-   "testharness"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/vertical-expected.txt": [
-   "e3069a394386c4d75cd72d8c500a2f45aa3a9536",
-   "support"
-  ],
-  "webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html": [
-   "a0754c219568a19cbd244b7adabaffb0afc6eedc",
-   "testharness"
-  ],
   "webvtt/webvtt-file-format-parsing/webvtt-cue-text-parsing-rules/buildtests.py": [
    "5fe90ed238ef80fd3f69f72ca5df90984451d044",
    "support"

diff --git a/third_party/WebKit/LayoutTests/external/wpt/check_stability.py b/third_party/WebKit/LayoutTests/external/wpt/check_stability.py
index a411f33..dc0bfd66 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/check_stability.py
+++ b/third_party/WebKit/LayoutTests/external/wpt/check_stability.py

@@ -137,8 +137,8 @@
         count[0] += length
 
         if count[0] > capacity:
-            sys.stdout.disable()
-            sys.stderr.disable()
+            wrapped_stdout.disable()
+            wrapped_stderr.disable()
             handle.write(msg[0:capacity - count[0]])
             handle.flush()
             stderr.write("\n%s\n" % warning_msg)
@@ -146,8 +146,10 @@
 
         return True
 
-    sys.stdout = FilteredIO(sys.stdout, on_write)
-    sys.stderr = FilteredIO(sys.stderr, on_write)
+    # Store local references to the replaced streams to guard against the case
+    # where other code replace the global references.
+    sys.stdout = wrapped_stdout = FilteredIO(sys.stdout, on_write)
+    sys.stderr = wrapped_stderr = FilteredIO(sys.stderr, on_write)
 
 
 class Browser(object):
@@ -183,7 +185,11 @@
     def install(self):
         """Install Firefox."""
         call("pip", "install", "-r", os.path.join(wptrunner_root, "requirements_firefox.txt"))
-        resp = get("https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-53.0a1.en-US.linux-x86_64.tar.bz2")
+        index = get("https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/")
+        latest = re.compile("<a[^>]*>(firefox-\d+\.\d(?:\w\d)?.en-US.linux-x86_64\.tar\.bz2)</a>")
+        filename = latest.search(index.text).group(1)
+        resp = get("https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/%s" %
+                   filename)
         untar(resp.raw)
 
         if not os.path.exists("profiles"):

diff --git a/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html b/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html
new file mode 100644
index 0000000..11e6a6a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-in-iframe-manual.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>Document#exitFullscreen() for nested fullscreen inside an iframe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../trusted-click.js"></script>
+<iframe allowfullscreen></iframe>
+<script>
+window.t = async_test();
+t.step(() => {
+  const iframe = document.querySelector("iframe");
+  iframe.srcdoc = "<div><div></div></div>";
+  iframe.onload = t.step_func(() => {
+    const doc = iframe.contentDocument;
+    const outer = doc.querySelector("div");
+    const inner = outer.firstChild;
+
+    // First request fullscreen for the outer element.
+    trusted_request(t, outer);
+    doc.onfullscreenchange = t.step_func(() => {
+      assert_equals(document.fullscreenElement, iframe);
+      assert_equals(doc.fullscreenElement, outer);
+
+      // Then request fullscreen for the inner element.
+      trusted_request(t, inner);
+      doc.onfullscreenchange = t.step_func(() => {
+        assert_equals(document.fullscreenElement, iframe);
+        assert_equals(doc.fullscreenElement, inner);
+
+        // Now exit fullscreen for the iframe's content document.
+        doc.exitFullscreen();
+        doc.onfullscreenchange = t.step_func_done(() => {
+          assert_equals(document.fullscreenElement, iframe);
+          assert_equals(doc.fullscreenElement, outer);
+        });
+      });
+    });
+    doc.onfullscreenerror = t.unreached_func("fullscreenerror event");
+  });
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-manual.html b/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-manual.html
new file mode 100644
index 0000000..dfd53bc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/fullscreen/api/document-exit-fullscreen-nested-manual.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Document#exitFullscreen() for nested fullscreen</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../trusted-click.js"></script>
+<div><div></div></div>
+<script>
+async_test(t => {
+  const outer = document.querySelector("div");
+  const inner = outer.firstChild;
+
+  // First request fullscreen for the outer element.
+  trusted_request(t, outer);
+  document.onfullscreenchange = t.step_func(() => {
+    assert_equals(document.fullscreenElement, outer);
+
+    // Then request fullscreen for the inner element.
+    trusted_request(t, inner);
+    document.onfullscreenchange = t.step_func(() => {
+      assert_equals(document.fullscreenElement, inner);
+
+      // Now exit fullscreen.
+      document.exitFullscreen();
+      document.onfullscreenchange = t.step_func_done(() => {
+        assert_equals(document.fullscreenElement, outer);
+      });
+    });
+  });
+  document.onfullscreenerror = t.unreached_func("fullscreenerror event");
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html
index f330bfdc..b415ac2 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/browsing-the-web/unloading-documents/beforeunload-canceling.html

@@ -118,7 +118,10 @@
   }
 ];
 
-for (const testCase of testCases) {
+var testCaseIndex = 0;
+function runNextTest() {
+  const testCase = testCases[testCaseIndex];
+
   const labelAboutReturnValue = testCase.setReturnValue === undefined ? "" :
     `; setting returnValue to ${testCase.setReturnValue}`;
 
@@ -126,10 +129,14 @@
     const iframe = document.createElement("iframe");
     iframe.onload = t.step_func(() => {
       iframe.contentWindow.runTest(t, testCase);
+      if (++testCaseIndex < testCases.length)
+        runNextTest();
     });
 
     iframe.src = "beforeunload-canceling-1.html";
     document.body.appendChild(iframe);
   }, `Returning ${testCase.valueToReturn} with a real iframe unloading${labelAboutReturnValue}`);
 }
+
+runNextTest();
 </script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update.html b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update.html
index 452daa7..0cb281fb 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update.html

@@ -11,12 +11,19 @@
     <script>
       var cache = window.applicationCache;
 
-      test(function() {
-        try {
+      async_test(function(t) {
+        var next = t.step_func(function() {
+          cache.onnoupdate = cache.oncached = null;
+
           cache.update()
-          assert_true(true, "update method test")
-        } catch (e) {
-          assert_unreached("update method failed.");
+
+          t.done();
+        });
+
+        if (cache.status === cache.IDLE) {
+          next();
+        } else {
+          cache.onnoupdate = cache.oncached = next;
         }
       });
     </script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update_error.html b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update_error.html
index ef88158..469baea 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update_error.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/offline/application-cache-api/api_update_error.html

@@ -1,16 +1,11 @@
 <!DOCTYPE HTML>
-<html manifest="../resources/manifest/clock.manifest">
+<html manifest="./non-existent-file.manifest">
   <head>
     <title>Offline Application Cache - API_update_error</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
   <body>
-    <ol>
-      <li>Remove the manifest file (manifest/clock.manifest) from the server.</li>
-      <li>Refresh the page, then calling update() will throw InvalidStateError exception.</li>
-    </ol>
-
     <div id="log"></div>
 
     <script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/support/noopener-target.html b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/support/noopener-target.html
index d0d0360..41e197a 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/support/noopener-target.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/support/noopener-target.html

@@ -4,5 +4,12 @@
   var channel = new BroadcastChannel(channelName);
   channel.postMessage({ name: window.name,
                         haveOpener: window.opener !== null });
-  window.close();
+
+  // Because messages are not delivered synchronously and because closing a
+  // browsing context prompts the eventual clearing of all task sources, this
+  // document should not be closed until the opener document has confirmed
+  // receipt.
+  channel.onmessage = function() {
+    window.close();
+  };
 </script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-open-noopener.html b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-open-noopener.html
index 808f55e2..f9489c3 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-open-noopener.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/browsers/the-window-object/window-open-noopener.html

@@ -64,7 +64,10 @@
   } else {
     t.step(function() {
       var w1;
-      this.add_cleanup(function() { w1.close(); });
+      this.add_cleanup(function() {
+        w1.close();
+        channel.postMessage(null);
+      });
 
       var windowName = this.windowName;
       var channel = new BroadcastChannel(windowName);

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/semantics/document-metadata/styling/LinkStyle.html b/third_party/WebKit/LayoutTests/external/wpt/html/semantics/document-metadata/styling/LinkStyle.html
index 09278d20..d1bb4335 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/semantics/document-metadata/styling/LinkStyle.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/semantics/document-metadata/styling/LinkStyle.html

@@ -29,14 +29,27 @@
     <div id="test" style="display:none">STYLING TEST</div>
 
     <script>
-      test(function() {
-        var style = null,
-            i;
-        for (i = 1; i < 5; i++) {
-          style = document.getElementById("style" + i);
-          assert_equals(style.sheet, null, "The sheet attribute of style" + i + " should be null.");
-          assert_false(style.disabled, "The disabled attribute of style" + i + " should be false.");
-        }
+      /**
+       * Browsers may incorrectly issue requests for these resources and defer
+       * definition of the `sheet` attribute until after loading is complete.
+       * In such cases, synchronous assertions regarding the absence of
+       * attributes will spuriously pass.
+       *
+       * In order to account for this incorrect behavior (exhibited at the time
+       * of this writing most notably by the Chromium browser), defer the
+       * assertions until the "load" event has been triggered.
+       */
+      async_test(function(t) {
+        window.addEventListener("load", t.step_func(function() {
+          var style = null,
+              i;
+          for (i = 1; i < 5; i++) {
+            style = document.getElementById("style" + i);
+            assert_equals(style.sheet, null, "The sheet attribute of style" + i + " should be null.");
+            assert_false(style.disabled, "The disabled attribute of style" + i + " should be false.");
+          }
+          t.done();
+        }));
       }, "The LinkStyle interface's sheet attribute must return null; the disabled attribute must be false");
 
       test(function() {
@@ -46,14 +59,17 @@
         assert_equals(link.sheet, null, "The sheet attribute of the link element not in a document should be null.");
       }, "The LinkStyle interface's sheet attribute must return null if the corresponding element is not in a Document");
 
-      test(function() {
-        var style = null,
-            i;
-        for (i = 5; i < 8; i++) {
-          style = document.getElementById("style" + i);
-          assert_true(style.sheet instanceof StyleSheet, "The sheet attribute of style" + i + " should be a StyleSheet object.");
-          assert_equals(style.disabled, style.sheet.disabled, "The disabled attribute of style" + i + " should equal to the same attribute of StyleSheet.");
-        }
+      async_test(function(t) {
+        window.addEventListener("load", t.step_func(function() {
+          var style = null,
+              i;
+          for (i = 5; i < 8; i++) {
+            style = document.getElementById("style" + i);
+            assert_true(style.sheet instanceof StyleSheet, "The sheet attribute of style" + i + " should be a StyleSheet object.");
+            assert_equals(style.disabled, style.sheet.disabled, "The disabled attribute of style" + i + " should equal to the same attribute of StyleSheet.");
+          }
+          t.done();
+        }));
       }, "The LinkStyle interface's sheet attribute must return StyleSheet object; the disabled attribute must be same as the StyleSheet's disabled attribute");
 
       test(function() {

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/semantics/forms/the-select-element/selected-index.html b/third_party/WebKit/LayoutTests/external/wpt/html/semantics/forms/the-select-element/selected-index.html
index 1be5378..6c30698a 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/semantics/forms/the-select-element/selected-index.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/semantics/forms/the-select-element/selected-index.html

@@ -28,46 +28,76 @@
 </form>
 
 <script>
+function assertSelectedIndex(select, value) {
+  assert_equals(select.selectedIndex, value);
+  assert_equals(select.options.selectedIndex, value);
+}
+
 test(function () {
   var select = document.getElementById('empty');
-  assert_equals(select.selectedIndex, -1);
+  assertSelectedIndex(select, -1);
 }, "get empty");
 
 test(function () {
   var select = document.getElementById('default');
-  assert_equals(select.selectedIndex, 0);
+  assertSelectedIndex(select, 0);
 }, "get default");
 
 test(function () {
   var select = document.getElementById('disabled');
-  assert_equals(select.selectedIndex, 1);
+  assertSelectedIndex(select, 1);
 }, "get disabled");
 
 test(function () {
   var select = document.getElementById('selected');
-  assert_equals(select.selectedIndex, 1);
+  assertSelectedIndex(select, 1);
 }, "get unselected");
 
 test(function () {
   var select = document.getElementById('empty');
   select.selectedIndex = 1;
-  assert_equals(select.selectedIndex, -1);
-}, "set empty");
+  assertSelectedIndex(select, -1);
+}, "set empty (HTMLSelectElement)");
+
+test(function () {
+  var select = document.getElementById('empty');
+  select.options.selectedIndex = 1;
+  assertSelectedIndex(select, -1);
+}, "set empty (HTMLOptionsCollection)");
 
 test(function () {
   var select = document.getElementById('default');
-  assert_equals(select.selectedIndex, 0);
+  assertSelectedIndex(select, 0);
   select.selectedIndex = 2;
-  assert_equals(select.selectedIndex, 2);
-}, "set");
+  assertSelectedIndex(select, 2);
+  this.add_cleanup(() => select.selectedIndex = 0);
+}, "set (HTMLSelectElement)");
+
+test(function () {
+  var select = document.getElementById('default');
+  assertSelectedIndex(select, 0);
+  select.options.selectedIndex = 2;
+  assertSelectedIndex(select, 2);
+  this.add_cleanup(() => select.selectedIndex = 0);
+}, "set (HTMLOptionsCollection)");
 
 test(function () {
   var select = document.getElementById('selected');
   var form = document.getElementById('form');
-  assert_equals(select.selectedIndex, 1);
+  assertSelectedIndex(select, 1);
   select.selectedIndex = 0;
-  assert_equals(select.selectedIndex, 0);
+  assertSelectedIndex(select, 0);
   form.reset();
-  assert_equals(select.selectedIndex, 1);
-}, "set and reset");
+  assertSelectedIndex(select, 1);
+}, "set and reset (HTMLSelectElement)");
+
+test(function () {
+  var select = document.getElementById('selected');
+  var form = document.getElementById('form');
+  assertSelectedIndex(select, 1);
+  select.options.selectedIndex = 0;
+  assertSelectedIndex(select, 0);
+  form.reset();
+  assertSelectedIndex(select, 1);
+}, "set and reset (HTMLOptionsCollection)");
 </script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html
deleted file mode 100644
index 9be6f5f..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html
+++ /dev/null

@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-  <title>No encoding declaration</title>
-<meta charset="utf-8"/>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='https://html.spec.whatwg.org/multipage/#the-input-byte-stream'>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="support/encodingtests-utf8.css">
-</head>
-<body>
-
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-<!--Notes:
-
-The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.
-
--->
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, "A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.");
-</script>
-
-<div id='log'></div>
-
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers
deleted file mode 100644
index 156209f9..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing-html-fragments/the-input-byte-stream-015.html.headers
+++ /dev/null

@@ -1 +0,0 @@
-Content-Type: text/html

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing/test.js b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing/test.js
index 6f4afba..6dc6e19 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing/test.js
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/syntax/parsing/test.js

@@ -320,7 +320,7 @@
     var x = tests[test_id];
     var t = x[0];
     iframe_map[t.name] = iframe.id;
-    setTimeout(function() {
+    step_timeout(function() {
                  t.step(function() {
                    var string_uri_encoded_input = x[1];
                    var string_escaped_expected = x[2];

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html
index ba3be9d0..7c46cc2 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-cross-origin-setTimeout.html

@@ -29,4 +29,4 @@
     document.body.appendChild(script);
   </script>
  </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html
index 39a0133..79ca7d5 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html

@@ -23,7 +23,7 @@
         assert_equals(typeof c, 'number', 'third arg');
     });
     interval = setInterval("{", 10);
-    setTimeout(function(){
+    step_timeout(function(){
         t.step(function(){
             clearInterval(interval);
             assert_true(ran, 'ran');

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html
index 8796603..1bb730e1 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html

@@ -33,4 +33,4 @@
     }, 20);
   </script>
  </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html
index 20ee21c..6f9add5 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-cross-origin-setTimeout.html

@@ -29,4 +29,4 @@
     document.body.appendChild(script);
   </script>
  </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html
index fcfb6c5..090e1dd 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html

@@ -23,7 +23,7 @@
         assert_equals(typeof c, 'number', 'third arg');
     });
     interval = setInterval("undefined_variable;", 10);
-    setTimeout(function(){
+    step_timeout(function(){
         clearInterval(interval);
         t.step(function(){
             assert_true(ran, 'ran');

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html
index c0c69ad..cebcd434 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html

@@ -33,4 +33,4 @@
     }, 20);
   </script>
  </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js
index 812c0dae..3b42fd9 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/syntax-error-in-setInterval.js

@@ -1,5 +1,5 @@
 interval = setInterval('{', 10);
-setTimeout(function(){
+step_timeout(function(){
     clearInterval(interval);
     t.step(function(){
         assert_true(ran, 'ran');

diff --git a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js
index 2950fdb5..4aa7da8 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js
+++ b/third_party/WebKit/LayoutTests/external/wpt/html/webappapis/scripting/processing-model-2/support/undefined-variable-in-setInterval.js

@@ -1,5 +1,5 @@
 interval = setInterval('undefined_variable;', 10);
-setTimeout(function(){
+step_timeout(function(){
     clearInterval(interval);
     t.step(function(){
         assert_true(ran, 'ran');

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-deny.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-deny.https-expected.txt
new file mode 100644
index 0000000..61a12c2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-deny.https-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL Tests that the error callback is triggered when permission is denied assert_unreached: The success callback should not be triggered since access is to be denied Reached unreachable code
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-empty-option-param.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-empty-option-param.https-expected.txt
new file mode 100644
index 0000000..a303a5a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-empty-option-param.https-expected.txt

@@ -0,0 +1,11 @@
+This is a testharness.js-based test.
+FAIL Tests that getUserMedia raises a NOT_SUPPORTED_ERR exception when used with an empty options parameter assert_throws: function "function () {
+      navigator.getUserMedia({}, t.step_func(function (stream) {
+        assert_unreached("This should never be triggered since the constraints parameter is empty");
+        t.done();
+      }), t.step_func(function (error) {
+        assert_unreached("This should never be triggered since the constraints parameter is empty");
+      }));
+  }" threw object "TypeError: Failed to execute 'getUserMedia' on 'Navigator': At least one of audio and video must be requested" that is not a DOMException NOT_SUPPORTED_ERR: property "code" is equal to undefined, expected 9
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-impossible-constraint.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-impossible-constraint.https-expected.txt
new file mode 100644
index 0000000..d2c418e3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-impossible-constraint.https-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL Tests that setting an impossible constraint in getUserMedia fails assert_unreached: a Video stream of width 100M cannot be created Reached unreachable code
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-unknownkey-option-param.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-unknownkey-option-param.https-expected.txt
new file mode 100644
index 0000000..4f7004f9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/GUM-unknownkey-option-param.https-expected.txt

@@ -0,0 +1,12 @@
+This is a testharness.js-based test.
+FAIL getUserMedia({doesnotexist:true}) aborts with NOT_SUPPORTED_ERR assert_throws: function "function () {
+        navigator.getUserMedia(
+            {doesnotexist:true},
+            t.step_func(function (stream) {
+              assert_unreached("This should never be triggered since the constraints parameter is unrecognized");
+            }), t.step_func(function (error) {
+              assert_unreached("This should never be triggered since the constraints parameter is unrecognized");
+            }));
+      }" threw object "ReferenceError: t is not defined" that is not a DOMException NOT_SUPPORTED_ERR: property "code" is equal to undefined, expected 9
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https-expected.txt
new file mode 100644
index 0000000..f30de268
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https-expected.txt

@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL Test that preload 'none' is ignored for MediaStream object URL used as src assert_unreached: 'error' should not be fired, code=4 Reached unreachable code
+PASS Test that preload 'none' is ignored for MediaStream used as srcObject 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html
index ce97806a..6b9da9ce 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html

@@ -21,6 +21,9 @@
             {
                 // The optional deferred load steps (for preload none) for MediaStream resources should be skipped.
                 mediaElement.addEventListener("suspend", t.unreached_func("'suspend' should not be fired."));
+                mediaElement.addEventListener("error", t.step_func(function() {
+                  assert_unreached("'error' should not be fired, code=" + mediaElement.error.code);
+                }));
 
                 mediaElement.addEventListener("loadeddata", t.step_func(function()
                 {

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-srcObject.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-srcObject.https-expected.txt
new file mode 100644
index 0000000..2a5c612e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStream-MediaElement-srcObject.https-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL Tests that a MediaStream can be assigned to a video element with srcObject assert_equals:  A MediaStream does not have a pre-defined duration.  expected Infinity but got NaN
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https-expected.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https-expected.txt

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https-expected.txt
new file mode 100644
index 0000000..71bbea7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL Tests that a disabled video track in a MediaStream is rendered as blackness assert_equals: No red component in pixel #0 expected 0 but got 255
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-end.https.html b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-end-manual.https.html
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-end.https.html
rename to third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-end-manual.https.html

diff --git a/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-init.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-init.https-expected.txt
new file mode 100644
index 0000000..7205be5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-init.https-expected.txt

@@ -0,0 +1,62 @@
+This is a testharness.js-based test.
+PASS Tests that the video MediaStreamTrack objects are properly initialized 
+PASS EventTarget interface: existence and properties of interface object 
+PASS EventTarget interface object length 
+PASS EventTarget interface object name 
+FAIL EventTarget interface: existence and properties of interface prototype object assert_equals: class string of EventTarget.prototype expected "[object EventTargetPrototype]" but got "[object EventTarget]"
+PASS EventTarget interface: existence and properties of interface prototype object's "constructor" property 
+PASS EventTarget interface: operation addEventListener(DOMString,EventListener,boolean) 
+PASS EventTarget interface: operation removeEventListener(DOMString,EventListener,boolean) 
+PASS EventTarget interface: operation dispatchEvent(Event) 
+PASS MediaStreamTrack interface: existence and properties of interface object 
+PASS MediaStreamTrack interface object length 
+PASS MediaStreamTrack interface object name 
+FAIL MediaStreamTrack interface: existence and properties of interface prototype object assert_equals: class string of MediaStreamTrack.prototype expected "[object MediaStreamTrackPrototype]" but got "[object MediaStreamTrack]"
+PASS MediaStreamTrack interface: existence and properties of interface prototype object's "constructor" property 
+PASS MediaStreamTrack interface: attribute kind 
+PASS MediaStreamTrack interface: attribute id 
+PASS MediaStreamTrack interface: attribute label 
+PASS MediaStreamTrack interface: attribute enabled 
+PASS MediaStreamTrack interface: attribute muted 
+PASS MediaStreamTrack interface: attribute onmute 
+PASS MediaStreamTrack interface: attribute onunmute 
+FAIL MediaStreamTrack interface: attribute readonly assert_true: The prototype object must have a property "readonly" expected true got false
+PASS MediaStreamTrack interface: attribute remote 
+PASS MediaStreamTrack interface: attribute readyState 
+PASS MediaStreamTrack interface: attribute onended 
+FAIL MediaStreamTrack interface: attribute onoverconstrained assert_true: The prototype object must have a property "onoverconstrained" expected true got false
+PASS MediaStreamTrack interface: operation clone() 
+PASS MediaStreamTrack interface: operation stop() 
+FAIL MediaStreamTrack interface: operation getCapabilities() assert_own_property: interface prototype object missing non-static operation expected property "getCapabilities" missing
+PASS MediaStreamTrack interface: operation getConstraints() 
+PASS MediaStreamTrack interface: operation getSettings() 
+FAIL MediaStreamTrack interface: operation applyConstraints(MediaTrackConstraints) assert_own_property: interface prototype object missing non-static operation expected property "applyConstraints" missing
+PASS MediaStreamTrack must be primary interface of track 
+PASS Stringification of track 
+PASS MediaStreamTrack interface: track must inherit property "kind" with the proper type (0) 
+PASS MediaStreamTrack interface: track must inherit property "id" with the proper type (1) 
+PASS MediaStreamTrack interface: track must inherit property "label" with the proper type (2) 
+PASS MediaStreamTrack interface: track must inherit property "enabled" with the proper type (3) 
+PASS MediaStreamTrack interface: track must inherit property "muted" with the proper type (4) 
+FAIL MediaStreamTrack interface: track must inherit property "onmute" with the proper type (5) Unrecognized type EventHandler
+FAIL MediaStreamTrack interface: track must inherit property "onunmute" with the proper type (6) Unrecognized type EventHandler
+FAIL MediaStreamTrack interface: track must inherit property "readonly" with the proper type (7) assert_inherits: property "readonly" not found in prototype chain
+PASS MediaStreamTrack interface: track must inherit property "remote" with the proper type (8) 
+FAIL MediaStreamTrack interface: track must inherit property "readyState" with the proper type (9) Unrecognized type MediaStreamTrackState
+FAIL MediaStreamTrack interface: track must inherit property "onended" with the proper type (10) Unrecognized type EventHandler
+FAIL MediaStreamTrack interface: track must inherit property "onoverconstrained" with the proper type (11) assert_inherits: property "onoverconstrained" not found in prototype chain
+PASS MediaStreamTrack interface: track must inherit property "clone" with the proper type (12) 
+PASS MediaStreamTrack interface: track must inherit property "stop" with the proper type (13) 
+FAIL MediaStreamTrack interface: track must inherit property "getCapabilities" with the proper type (14) assert_inherits: property "getCapabilities" not found in prototype chain
+PASS MediaStreamTrack interface: track must inherit property "getConstraints" with the proper type (15) 
+PASS MediaStreamTrack interface: track must inherit property "getSettings" with the proper type (16) 
+FAIL MediaStreamTrack interface: track must inherit property "applyConstraints" with the proper type (17) assert_inherits: property "applyConstraints" not found in prototype chain
+FAIL MediaStreamTrack interface: calling applyConstraints(MediaTrackConstraints) on track with too few arguments must throw TypeError assert_inherits: property "applyConstraints" not found in prototype chain
+PASS EventTarget interface: track must inherit property "addEventListener" with the proper type (0) 
+PASS EventTarget interface: calling addEventListener(DOMString,EventListener,boolean) on track with too few arguments must throw TypeError 
+PASS EventTarget interface: track must inherit property "removeEventListener" with the proper type (1) 
+PASS EventTarget interface: calling removeEventListener(DOMString,EventListener,boolean) on track with too few arguments must throw TypeError 
+PASS EventTarget interface: track must inherit property "dispatchEvent" with the proper type (2) 
+PASS EventTarget interface: calling dispatchEvent(Event) on track with too few arguments must throw TypeError 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/pointerevents/pointerevent_click_during_capture-manual.html b/third_party/WebKit/LayoutTests/external/wpt/pointerevents/pointerevent_click_during_capture-manual.html
new file mode 100644
index 0000000..ed0e3e2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/pointerevents/pointerevent_click_during_capture-manual.html

@@ -0,0 +1,108 @@
+<!doctype html>
+<html>
+    <head>
+        <title>click event target during capture</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="pointerevent_support.js"></script>
+        <style>
+        .box {
+          margin: 10px;
+        }
+        #grey {
+          background: grey;
+        }
+        #blue {
+          background: blue;
+        }
+        #green {
+          background: green;
+        }
+        </style>
+        <script type="text/javascript">
+            PhaseEnum = {
+              Phase1:               "phase1",
+              Phase2:               "phase2",
+              Phase1WithCapturing:  "phase1withcapturing",
+              Phase2WithCapturing:  "phase2withcapturing",
+            }
+            var phase;
+            var receivedEvents;
+
+            function resetTestState() {
+              phase = PhaseEnum.Phase1;
+              receivedEvents = [];
+            }
+        
+            function run() {
+                var test_pointerEvent = setup_pointerevent_test("click target during capture", ['mouse']);
+                var grey = document.getElementById('grey');
+                var blue = document.getElementById('blue');
+                var green = document.getElementById('green');
+                
+                ['gotpointercapture', 'lostpointercapture', 'pointerdown', 'pointerup', 'click'].forEach(function(eventName) {
+                  [grey, blue, green].forEach(function(target) {
+                    target.addEventListener(eventName, function(event) {
+                      if (event.eventPhase == event.AT_TARGET) {
+                        receivedEvents.push(event.type + '@' + target.id);
+                        if (phase == PhaseEnum.Phase1 && target == green && event.type == 'click') {
+                            test(function() {
+                              assert_equals(receivedEvents.join(','), 'pointerdown@green,pointerup@green,click@green', 'An element should only receive click when it is the first common ancestor of pointerdown and pointerup targets'); 
+                            }, "Click target when pointerup/down targeted at the same element with no capture");
+                            phase = PhaseEnum.Phase2;
+                            receivedEvents = [];
+                        }
+                        if (phase == PhaseEnum.Phase2 && target == grey && event.type == 'click') {
+                            test(function() {
+                              assert_equals(receivedEvents.join(','), 'pointerdown@blue,pointerup@green,click@grey', 'An element should only receive click when it is the first common ancestor of pointerdown and pointerup targets'); 
+                            }, "Click target when pointerup/down targeted at different elements with no capture");
+                            phase = PhaseEnum.Phase1WithCapturing;
+                            receivedEvents = [];
+                        }
+                        if (target == blue && event.type == 'lostpointercapture') {
+                          if (phase == PhaseEnum.Phase1WithCapturing) {
+                            test_pointerEvent.step(function() {
+                              assert_equals(receivedEvents.join(','), 'pointerdown@green,gotpointercapture@blue,pointerup@blue,click@grey,lostpointercapture@blue', 'An element should only receive click when it is the first common ancestor of pointerdown and pointerup targets'); 
+                            });
+                            phase = PhaseEnum.Phase2WithCapturing;
+                            receivedEvents = [];
+                          } else if (phase == PhaseEnum.Phase2WithCapturing) {
+                            test_pointerEvent.step(function() {
+                              assert_equals(receivedEvents.join(','), 'pointerdown@blue,gotpointercapture@blue,pointerup@blue,click@blue,lostpointercapture@blue', 'An element should only receive click when it is the first common ancestor of pointerdown and pointerup targets'); 
+                            });
+                            test_pointerEvent.done();
+                          }
+                        }
+                        if (event.type == 'pointerdown' && (target == blue || target == green)) {
+                          if (phase == PhaseEnum.Phase1WithCapturing || phase == PhaseEnum.Phase2WithCapturing)
+                            blue.setPointerCapture(event.pointerId);
+                        }
+                      }
+                    });
+                  });
+                });
+            }
+        </script>
+    </head>
+    <body onload="run()">
+        <h1>Pointer Event: click event during capture</h1>
+        <h2 id="pointerTypeDescription"></h2>
+        <h4>Test Description:
+            Click event should be sent to the first common ancestor of the pointerdown and pointerup targets.
+            <ol>
+                 <li>Click on the green box with the left button of mouse.</li>
+                 <li>Press down the left button on the blue box and drag to the green box and release the button.</li>
+                 <li>Repeat the two steps above once again.</li>
+            </ol>
+        </h4>
+        <br>
+        <div>
+          <div id="grey" class="box">
+            <div id="green" class="box"></div>
+            <div id="blue" class="box"></div>
+          </div>
+        </div>
+    </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/selection/interfaces-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/selection/interfaces-expected.txt
index 7f1b8c1..f940f9f 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/selection/interfaces-expected.txt
+++ b/third_party/WebKit/LayoutTests/external/wpt/selection/interfaces-expected.txt

@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 59 tests; 55 PASS, 4 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 59 tests; 58 PASS, 1 FAIL, 0 TIMEOUT, 0 NOTRUN.
 PASS Selection interface: existence and properties of interface object 
 PASS Selection interface object length 
 PASS Selection interface object name 
@@ -14,7 +14,7 @@
 PASS Selection interface: attribute type 
 PASS Selection interface: operation getRangeAt(unsigned long) 
 PASS Selection interface: operation addRange(Range) 
-FAIL Selection interface: operation removeRange(Range) assert_own_property: interface prototype object missing non-static operation expected property "removeRange" missing
+PASS Selection interface: operation removeRange(Range) 
 PASS Selection interface: operation removeAllRanges() 
 PASS Selection interface: operation empty() 
 PASS Selection interface: operation collapse(Node,unsigned long) 
@@ -40,8 +40,8 @@
 PASS Selection interface: calling getRangeAt(unsigned long) on getSelection() with too few arguments must throw TypeError 
 PASS Selection interface: getSelection() must inherit property "addRange" with the proper type (8) 
 PASS Selection interface: calling addRange(Range) on getSelection() with too few arguments must throw TypeError 
-FAIL Selection interface: getSelection() must inherit property "removeRange" with the proper type (9) assert_inherits: property "removeRange" not found in prototype chain
-FAIL Selection interface: calling removeRange(Range) on getSelection() with too few arguments must throw TypeError assert_inherits: property "removeRange" not found in prototype chain
+PASS Selection interface: getSelection() must inherit property "removeRange" with the proper type (9) 
+PASS Selection interface: calling removeRange(Range) on getSelection() with too few arguments must throw TypeError 
 PASS Selection interface: getSelection() must inherit property "removeAllRanges" with the proper type (10) 
 PASS Selection interface: getSelection() must inherit property "empty" with the proper type (11) 
 PASS Selection interface: getSelection() must inherit property "collapse" with the proper type (12) 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/selection/removeRange.html b/third_party/WebKit/LayoutTests/external/wpt/selection/removeRange.html
new file mode 100644
index 0000000..723f510
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/selection/removeRange.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<title>Selection.removeRange tests</title>
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="common.js"></script>
+<script>
+"use strict";
+
+testRanges.forEach(function(rangeData, index) {
+    var endpoints = eval(rangeData);
+    if (!isSelectableNode(endpoints[0]) || !isSelectableNode(endpoints[2]))
+        return;
+    test(function() {
+        var selection = getSelection();
+        selection.removeAllRanges();
+        var range = ownerDocument(endpoints[0]).createRange();
+        range.setStart(endpoints[0], endpoints[1]);
+        range.setEnd(endpoints[2], endpoints[3]);
+
+        selection.addRange(range);
+        assert_equals(selection.rangeCount, 1);
+        selection.removeRange(range);
+        assert_equals(selection.rangeCount, 0, 'Range should be correctly removed.');
+        assert_equals(selection.anchorNode, null);
+        assert_equals(selection.focusNode, null);
+
+        selection.addRange(range);
+        assert_equals(selection.rangeCount, 1);
+        var equivalentRange = ownerDocument(endpoints[0]).createRange();
+        equivalentRange.setStart(endpoints[0], endpoints[1]);
+        equivalentRange.setEnd(endpoints[2], endpoints[3]);
+        selection.removeRange(equivalentRange);
+        assert_equals(selection.rangeCount, 1, 'Equivalent Range should not remove the registered Range.');
+
+    }, 'removeRange() with Range ' + index);
+});
+
+test(function() {
+    var selection = getSelection();
+    assert_throws(new TypeError(), function() { selection.removeRange(null); });
+    assert_throws(new TypeError(), function() { selection.removeRange(selection); });
+}, 'removeRange() argument is non-optional Range');
+</script>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt
deleted file mode 100644
index bfdba03..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-load.https-expected.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL controller is set for a controlled document Cannot read property 'active' of undefined
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt
deleted file mode 100644
index 752f699..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https-expected.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-This is a testharness.js-based test.
-FAIL controller is set upon reload after registration promise_test: Unhandled rejection with value: object "TypeError: Cannot read property 'active' of undefined"
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html
index 4490c707..e0beb72 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/controller-on-reload.https.html

@@ -6,7 +6,8 @@
 <body>
 <script>
 promise_test(function(t) {
-    var scope = 'resources/blank.html';
+    const iframe_scope = 'blank.html';
+    const scope = 'resources/' + iframe_scope;
     var frame;
     var registration;
     var controller;
@@ -17,7 +18,7 @@
       .then(function(f) {
           frame = f;
           return frame.contentWindow.navigator.serviceWorker.register(
-              'resources/empty-worker.js', {scope: scope});
+              'empty-worker.js', {scope: iframe_scope});
         })
       .then(function(swr) {
           registration = swr;
@@ -42,7 +43,7 @@
           // objects from separate windows should not be equal
           assert_not_equals(controller, registration.active);
 
-          return w.navigator.serviceWorker.getRegistration();
+          return w.navigator.serviceWorker.getRegistration(iframe_scope);
         })
       .then(function(frameRegistration) {
           assert_equals(frameRegistration.active, controller);

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multi-globals/url-parsing.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multi-globals/url-parsing.https-expected.txt
deleted file mode 100644
index 49b9b15a..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multi-globals/url-parsing.https-expected.txt
+++ /dev/null

@@ -1,6 +0,0 @@
-This is a testharness.js-based test.
-FAIL register should use the relevant global of the object it was called on to resolve the script URL and the default scope URL assert_equals: the script URL should be parsed against the relevant global expected "https://web-platform.test:8444/service-workers/service-worker/multi-globals/relevant/test-sw.js" but got "https://web-platform.test:8444/service-workers/service-worker/multi-globals/test-sw.js"
-PASS register should use the relevant global of the object it was called on to resolve the script URL and the given scope URL 
-FAIL getRegistration should use the relevant global of the object it was called on to resolve the script URL assert_equals: the retrieved registration's scope should be equal to the original's scope expected "https://web-platform.test:8444/service-workers/service-worker/multi-globals/relevant/" but got "https://web-platform.test:8444/service-workers/service-worker/multi-globals/"
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multiple-register.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multiple-register.https.html
index 1089cffd..e1d94802 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multiple-register.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/multiple-register.https.html

@@ -45,7 +45,8 @@
     .then(function(f) {
         frame = f;
         return frame.contentWindow.navigator.serviceWorker.register(
-            worker_url, { scope: scope });
+            'empty-worker.js',
+            { scope: 'scope/subsequent-register-from-different-iframe' });
       })
     .then(function(new_registration) {
         assert_not_equals(

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/registration-iframe.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/registration-iframe.https.html
index fb60afe..7918f40 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/registration-iframe.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/registration-iframe.https.html

@@ -5,15 +5,15 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-// Set script url and scope url relative to the calling frame's document's url.
-// Assert the implementation parses the urls against the calling frame's
-// document's url.
+
+// Set script url and scope url relative to the iframe's document's url. Assert
+// the implementation parses the urls against the iframe's document's url.
 async_test(function(t) {
   var url = 'resources/blank.html';
-  var scope = 'resources/registration-for-iframe-from-calling-frame';
-  var parsed_scope = normalizeURL(scope);
-  var script = 'resources/empty-worker.js';
-  var parsed_script = normalizeURL(script);
+  var scope = 'registration-for-iframe-from-parent-frame';
+  var expected_scope = normalizeURL('resources/' + scope);
+  var script = 'empty-worker.js';
+  var expected_script = normalizeURL('resources/' + script);
   var frame;
   var registration;
 
@@ -30,27 +30,56 @@
         return wait_for_state(t, r.installing, 'activated');
       })
     .then(function() {
-        assert_equals(
-          registration.scope, parsed_scope,
-          'registration\'s scope must be the scope parsed against calling ' +
-          'document\'s url');
-        assert_equals(
-          registration.active.scriptURL, parsed_script,
-          'worker\'s script must be the url parsed against calling ' +
-          'document\'s url');
+        assert_equals(registration.scope, expected_scope,
+                      'registration\'s scope must be parsed against the ' +
+                      '"relevant global object"');
+        assert_equals(registration.active.scriptURL, expected_script,
+                      'worker\'s scriptURL must be parsed against the ' +
+                      '"relevant global object"');
         frame.remove();
         return service_worker_unregister_and_done(t, scope);
       })
     .catch(unreached_rejection(t));
-  }, 'Subframe\'s container\'s register method should use calling frame\'s ' +
-     'document\'s url as a base url for parsing its script url and scope url ' +
-     '- normal case');
+  }, 'register method should use the "relevant global object" to parse its ' +
+     'scriptURL and scope - normal case');
 
-// Set script url and scope url relative to the iframe's document's url.
-// Assert the implementation throws a NetworkError exception.
+// Set script url and scope url relative to the parent frame's document's url.
+// Assert the implementation throws a TypeError exception.
 async_test(function(t) {
   var url = 'resources/blank.html';
-  var scope = 'registration-for-iframe-from-calling-frame';
+  var scope = 'resources/registration-for-iframe-from-parent-frame';
+  var script = 'resources/empty-worker.js';
+  var frame;
+  var registration;
+
+  service_worker_unregister(t, scope)
+    .then(function() { return with_iframe(url); })
+    .then(function(f) {
+        frame = f;
+        return frame.contentWindow.navigator.serviceWorker.register(
+            script,
+            { scope: scope });
+      })
+    .then(
+      function() {
+        assert_unreached('register() should reject');
+      },
+      function(e) {
+        assert_equals(e.name, 'TypeError',
+                      'register method with scriptURL and scope parsed to ' +
+                      'nonexistent location should reject with TypeError');
+        frame.remove();
+        return service_worker_unregister_and_done(t, scope);
+      })
+    .catch(unreached_rejection(t));
+  }, 'register method should use the "relevant global object" to parse its ' +
+     'scriptURL and scope - error case');
+
+// Set the scope url to a non-subdirectory of the script url. Assert the
+// implementation throws a SecurityError exception.
+async_test(function(t) {
+  var url = 'resources/blank.html';
+  var scope = '../registration-for-iframe-from-parent-frame';
   var script = 'empty-worker.js';
   var frame;
   var registration;
@@ -68,41 +97,13 @@
         assert_unreached('register() should reject');
       },
       function(e) {
-        assert_equals(e.name, 'TypeError');
-        frame.remove();
-        return service_worker_unregister_and_done(t, scope);
-      })
-    .catch(unreached_rejection(t));
-  }, 'Subframe\'s container\'s register method should use calling frame\'s ' +
-     'document\'s url as a base url for parsing its script url and scope url ' +
-     '- error case');
-
-// Set the scope url to a non-subdirectory of the script url.
-// Assert the implementation throws a SecurityError exception.
-async_test(function(t) {
-  var url = 'resources/blank.html';
-  var scope = 'registration-for-iframe-from-calling-frame';
-  var script = 'resources/empty-worker.js';
-  var frame;
-  var registration;
-
-  service_worker_unregister(t, scope)
-    .then(function() { return with_iframe(url); })
-    .then(function(f) {
-        frame = f;
-        return frame.contentWindow.navigator.serviceWorker.register(
-            script,
-            { scope: scope });
-      })
-    .then(
-      function() {
-        assert_unreached('register() should reject');
-      },
-      function(e) {
-        assert_equals(e.name, 'SecurityError');
+        assert_equals(e.name, 'SecurityError',
+                      'The scope set to a non-subdirectory of the scriptURL ' +
+                      'should reject with SecurityError');
         frame.remove();
         return service_worker_unregister_and_done(t, scope);
       })
     .catch(unreached_rejection(t));
   }, 'A scope url should start with the given script url');
+
 </script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/request-end-to-end.https.html b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/request-end-to-end.https.html
index c9c3b304..e952332 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/request-end-to-end.https.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/request-end-to-end.https.html

@@ -22,22 +22,34 @@
 
     function onRegister(registration) {
         var sw = registration.installing;
+        sw.addEventListener('statechange', t.step_func(function(event) {
+            if (event.target.state == 'activated') {
+                onActive(sw);
+            }
+        }));
+    }
+
+    function onActive(sw) {
         var port = sendMessagePort(sw);
         port.addEventListener('message', t.step_func(function(event) {
             onMessage(event);
         }), false);
         port.start();
-        sw.addEventListener('statechange', t.step_func(function(event) {
-            if (event.target.state == 'activated')
-                onActive();
-        }));
-    }
-
-    function onActive() {
-        with_iframe(scope).then(function(f) { frames.push(f); });
     }
 
     function onMessage(event) {
+        if (event.data === 'received port') {
+            onPortReady();
+        } else {
+            onResult(event);
+        }
+    }
+
+    function onPortReady() {
+        with_iframe(scope).then(function(f) { frames.push(f); });
+    }
+
+    function onResult(event) {
         assert_equals(
             event.data.url,
             location.href.substring(0, location.href.lastIndexOf('/') + 1) +

diff --git a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/resources/request-end-to-end-worker.js b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/resources/request-end-to-end-worker.js
index 323c7f2..dcf6fee 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/resources/request-end-to-end-worker.js
+++ b/third_party/WebKit/LayoutTests/external/wpt/service-workers/service-worker/resources/request-end-to-end-worker.js

@@ -1,9 +1,20 @@
 var port = undefined;
+// Create a then-able object that is never resolved.
+function createPending() {
+  return { then: createPending };
+}
 
 onmessage = function(e) {
   var message = e.data;
   if (typeof message === 'object' && 'port' in message) {
     port = message.port;
+
+    port.postMessage('received port');
+    // The ServiceWorker which handles the "message" event must persist long
+    // enough to handle the subsequent "fetch" event. To promote test
+    // simplicity, the worker prevents its own termination indefinitely via a
+    // then-able that is never resolved.
+    e.waitUntil(createPending());
   }
 };
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html b/third_party/WebKit/LayoutTests/external/wpt/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html
index 33bdf69..b3a8213 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html

@@ -72,7 +72,7 @@
     // should be reloaded, so iframe context shouldn't be affected
 
     // set timeout to give the iframe time to load content
-    setTimeout('A_08_01_01_T01.checkIframeContent()', 2000);
+    step_timeout(A_08_01_01_T01.checkIframeContent, 2000);
 });
 </script>
 </body>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https-expected.txt
new file mode 100644
index 0000000..ad133a80
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https-expected.txt

@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS navigator.storage.persist() in non-sandboxed iframe should not reject 
+FAIL navigator.storage.persist() in sandboxed iframe should reject with TypeError assert_equals: navigator.storage.persist() should reject with TypeError expected "TypeError" but got "NotSupportedError"
+PASS navigator.storage.persisted() in non-sandboxed iframe should not reject 
+FAIL navigator.storage.persisted() in sandboxed iframe should reject with TypeError assert_equals: navigator.storage.persisted() should reject with TypeError expected "TypeError" but got "no rejection"
+PASS navigator.storage.estimate() in non-sandboxed iframe should not reject 
+FAIL navigator.storage.estimate() in sandboxed iframe should reject with TypeError assert_equals: navigator.storage.estimate() should reject with TypeError expected "TypeError" but got "NotSupportedError"
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https.html b/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https.html
new file mode 100644
index 0000000..563f2fe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/storage/opaque-origin.https.html

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>StorageManager API and opaque origins</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+function load_iframe(src, sandbox) {
+  return new Promise(resolve => {
+    const iframe = document.createElement('iframe');
+    iframe.onload = () => { resolve(iframe); };
+    if (sandbox)
+      iframe.sandbox = sandbox;
+    iframe.srcdoc = src;
+    iframe.style.display = 'none';
+    document.documentElement.appendChild(iframe);
+  });
+}
+
+function wait_for_message(iframe) {
+  return new Promise(resolve => {
+    self.addEventListener('message', function listener(e) {
+      if (e.source === iframe.contentWindow) {
+        resolve(e.data);
+        self.removeEventListener('message', listener);
+      }
+    });
+  });
+}
+
+function make_script(snippet) {
+  return '<script>' +
+         '  window.onmessage = () => {' +
+         '    try {' +
+         '      (' + snippet + ')' +
+         '        .then(' +
+         '          result => {' +
+         '            window.parent.postMessage({result: "no rejection"}, "*");' +
+         '          }, ' +
+         '          error => {' +
+         '            window.parent.postMessage({result: error.name}, "*");' +
+         '          });' +
+         '    } catch (ex) {' +
+         // Report if not implemented/exposed, rather than time out.
+         '      window.parent.postMessage({result: ex.message}, "*");' +
+         '    }' +
+         '  };' +
+         '<\/script>';
+}
+
+['navigator.storage.persist()',
+ 'navigator.storage.persisted()',
+ 'navigator.storage.estimate()'
+].forEach(snippet => {
+  promise_test(t => {
+    return load_iframe(make_script(snippet))
+      .then(iframe => {
+        iframe.contentWindow.postMessage({}, '*');
+        return wait_for_message(iframe);
+      })
+      .then(message => {
+        assert_equals(message.result, 'no rejection',
+                      `${snippet} should not reject`);
+      });
+  }, `${snippet} in non-sandboxed iframe should not reject`);
+
+  promise_test(t => {
+    return load_iframe(make_script(snippet), 'allow-scripts')
+      .then(iframe => {
+        iframe.contentWindow.postMessage({}, '*');
+        return wait_for_message(iframe);
+      })
+      .then(message => {
+        assert_equals(message.result, 'TypeError',
+                      `${snippet} should reject with TypeError`);
+      });
+  }, `${snippet} in sandboxed iframe should reject with TypeError`);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies-expected.txt
new file mode 100644
index 0000000..781344df
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies-expected.txt

@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS Writable stream: throwing strategy.size getter 
+PASS reject any non-function value for strategy.size 
+PASS Writable stream: throwing strategy.highWaterMark getter 
+PASS Writable stream: invalid strategy.highWaterMark 
+FAIL Writable stream: throwing strategy.size method assert_throws: write should reject with a TypeError function "function () { throw e }" threw object "error1: a unique string" ("error1") expected object "TypeError" ("TypeError")
+PASS Writable stream: invalid strategy.size return value 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.dedicatedworker-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.dedicatedworker-expected.txt
new file mode 100644
index 0000000..781344df
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.dedicatedworker-expected.txt

@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS Writable stream: throwing strategy.size getter 
+PASS reject any non-function value for strategy.size 
+PASS Writable stream: throwing strategy.highWaterMark getter 
+PASS Writable stream: invalid strategy.highWaterMark 
+FAIL Writable stream: throwing strategy.size method assert_throws: write should reject with a TypeError function "function () { throw e }" threw object "error1: a unique string" ("error1") expected object "TypeError" ("TypeError")
+PASS Writable stream: invalid strategy.size return value 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.js b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.js
index eb14cf2..0eed5fa 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.js
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.js

@@ -61,7 +61,7 @@
 
   const writer = ws.getWriter();
 
-  const p1 = promise_rejects(t, error1, writer.write('a'), 'write should reject with the thrown error');
+  const p1 = promise_rejects(t, new TypeError(), writer.write('a'), 'write should reject with a TypeError');
 
   const p2 = promise_rejects(t, error1, writer.closed, 'closed should reject with the thrown error');
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.serviceworker.https-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.serviceworker.https-expected.txt
new file mode 100644
index 0000000..a9652f9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.serviceworker.https-expected.txt

@@ -0,0 +1,10 @@
+This is a testharness.js-based test.
+PASS Service worker test setup 
+PASS Writable stream: throwing strategy.size getter 
+PASS reject any non-function value for strategy.size 
+PASS Writable stream: throwing strategy.highWaterMark getter 
+PASS Writable stream: invalid strategy.highWaterMark 
+FAIL Writable stream: throwing strategy.size method assert_throws: write should reject with a TypeError function "function () { throw e }" threw object "error1: a unique string" ("error1") expected object "TypeError" ("TypeError")
+PASS Writable stream: invalid strategy.size return value 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.sharedworker-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.sharedworker-expected.txt
new file mode 100644
index 0000000..781344df
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/bad-strategies.sharedworker-expected.txt

@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS Writable stream: throwing strategy.size getter 
+PASS reject any non-function value for strategy.size 
+PASS Writable stream: throwing strategy.highWaterMark getter 
+PASS Writable stream: invalid strategy.highWaterMark 
+FAIL Writable stream: throwing strategy.size method assert_throws: write should reject with a TypeError function "function () { throw e }" threw object "error1: a unique string" ("error1") expected object "TypeError" ("TypeError")
+PASS Writable stream: invalid strategy.size return value 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.dedicatedworker.html b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.dedicatedworker.html
new file mode 100644
index 0000000..52f26395
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.dedicatedworker.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>reentrant-strategy.js dedicated worker wrapper file</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+'use strict';
+fetch_tests_from_worker(new Worker('reentrant-strategy.js'));
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.html b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.html
new file mode 100644
index 0000000..4d9c33a5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>reentrant-strategy.js browser context wrapper file</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script src="../resources/test-utils.js"></script>
+<script src="../resources/recording-streams.js"></script>
+
+<script src="reentrant-strategy.js"></script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.js b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.js
new file mode 100644
index 0000000..4ef9957
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.js

@@ -0,0 +1,179 @@
+'use strict';
+
+// These tests exercise the pathological case of calling WritableStream* methods from within the strategy.size()
+// callback. This is not something any real code should ever do. Failures here indicate subtle deviations from the
+// standard that may affect real, non-pathological code.
+
+if (self.importScripts) {
+  self.importScripts('/resources/testharness.js');
+  self.importScripts('../resources/test-utils.js');
+  self.importScripts('../resources/recording-streams.js');
+}
+
+const error1 = { name: 'error1' };
+
+promise_test(() => {
+  let writer;
+  const strategy = {
+    size(chunk) {
+      if (chunk > 0) {
+        writer.write(chunk - 1);
+      }
+      return chunk;
+    }
+  };
+
+  const ws = recordingWritableStream({}, strategy);
+  writer = ws.getWriter();
+  return writer.write(2)
+      .then(() => {
+        assert_array_equals(ws.events, ['write', 0, 'write', 1, 'write', 2], 'writes should appear in order');
+      });
+}, 'writes should be written in the standard order');
+
+promise_test(() => {
+  let writer;
+  const events = [];
+  const strategy = {
+    size(chunk) {
+      events.push('size', chunk);
+      if (chunk > 0) {
+        writer.write(chunk - 1)
+            .then(() => events.push('writer.write done', chunk - 1));
+      }
+      return chunk;
+    }
+  };
+  const ws = new WritableStream({
+    write(chunk) {
+      events.push('sink.write', chunk);
+    }
+  }, strategy);
+  writer = ws.getWriter();
+  return writer.write(2)
+      .then(() => events.push('writer.write done', 2))
+      .then(() => flushAsyncEvents())
+      .then(() => {
+        assert_array_equals(events, ['size', 2, 'size', 1, 'size', 0,
+                                     'sink.write', 0, 'sink.write', 1, 'writer.write done', 0,
+                                     'sink.write', 2, 'writer.write done', 1,
+                                     'writer.write done', 2],
+                            'events should happen in standard order');
+      });
+}, 'writer.write() promises should resolve in the standard order');
+
+promise_test(t => {
+  let controller;
+  const strategy = {
+    size() {
+      controller.error(error1);
+      return 1;
+    }
+  };
+  const ws = recordingWritableStream({
+    start(c) {
+      controller = c;
+    }
+  }, strategy);
+  const resolved = [];
+  const writer = ws.getWriter();
+  const readyPromise1 = writer.ready.then(() => resolved.push('ready1'));
+  const writePromise = promise_rejects(t, new TypeError(), writer.write(),
+                                       'write() should reject with a TypeError')
+                                           .then(() => resolved.push('write'));
+  const readyPromise2 = promise_rejects(t, error1, writer.ready, 'ready should reject with error1')
+      .then(() => resolved.push('ready2'));
+  const closedPromise = promise_rejects(t, error1, writer.closed, 'closed should reject with error1')
+      .then(() => resolved.push('closed'));
+  return Promise.all([readyPromise1, writePromise, readyPromise2, closedPromise])
+      .then(() => {
+        assert_array_equals(resolved, ['ready1', 'write', 'ready2', 'closed'],
+                            'promises should resolve in standard order');
+        assert_array_equals(ws.events, [], 'underlying sink write should not be called');
+      });
+}, 'controller.error() should work when called from within strategy.size()');
+
+promise_test(t => {
+  let writer;
+  const strategy = {
+    size() {
+      writer.close();
+      return 1;
+    }
+  };
+
+  const ws = recordingWritableStream({}, strategy);
+  writer = ws.getWriter();
+  return promise_rejects(t, new TypeError(), writer.write('a'), 'write() promise should reject')
+      .then(() => {
+        assert_array_equals(ws.events, ['close'], 'sink.write() should not be called');
+      });
+}, 'close() should work when called from within strategy.size()');
+
+promise_test(t => {
+  let writer;
+  const strategy = {
+    size() {
+      writer.abort('nice');
+      return 1;
+    }
+  };
+
+  const ws = recordingWritableStream({}, strategy);
+  writer = ws.getWriter();
+  return promise_rejects(t, new TypeError(), writer.write('a'), 'write() promise should reject')
+      .then(() => {
+        assert_array_equals(ws.events, ['abort', 'nice'], 'sink.write() should not be called');
+      });
+}, 'abort() should work when called from within strategy.size()');
+
+promise_test(t => {
+  let writer;
+  const strategy = {
+    size() {
+      writer.releaseLock();
+      return 1;
+    }
+  };
+
+  const ws = recordingWritableStream({}, strategy);
+  writer = ws.getWriter();
+  const writePromise = promise_rejects(t, new TypeError(), writer.write('a'), 'write() promise should reject');
+  const readyPromise = promise_rejects(t, new TypeError(), writer.ready, 'ready promise should reject');
+  const closedPromise = promise_rejects(t, new TypeError(), writer.closed, 'closed promise should reject');
+  return Promise.all([writePromise, readyPromise, closedPromise])
+      .then(() => {
+        assert_array_equals(ws.events, [], 'sink.write() should not be called');
+      });
+}, 'releaseLock() should abort the write() when called within strategy.size()');
+
+promise_test(t => {
+  let writer1;
+  let ws;
+  let writePromise2;
+  let closePromise;
+  let closedPromise2;
+  const strategy = {
+    size(chunk) {
+      if (chunk > 0) {
+        writer1.releaseLock();
+        const writer2 = ws.getWriter();
+        writePromise2 = writer2.write(0);
+        closePromise = writer2.close();
+        closedPromise2 = writer2.closed;
+      }
+      return 1;
+    }
+  };
+  ws = recordingWritableStream({}, strategy);
+  writer1 = ws.getWriter();
+  const writePromise1 = promise_rejects(t, new TypeError(), writer1.write(1), 'write() promise should reject');
+  const readyPromise = promise_rejects(t, new TypeError(), writer1.ready, 'ready promise should reject');
+  const closedPromise1 = promise_rejects(t, new TypeError(), writer1.closed, 'closed promise should reject');
+  return Promise.all([writePromise1, readyPromise, closedPromise1, writePromise2, closePromise, closedPromise2])
+      .then(() => {
+        assert_array_equals(ws.events, ['write', 0, 'close'], 'sink.write() should only be called once');
+      });
+}, 'original reader should error when new reader is created within strategy.size()');
+
+done();

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.serviceworker.https.html b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.serviceworker.https.html
new file mode 100644
index 0000000..49fdf6da
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.serviceworker.https.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>reentrant-strategy.js service worker wrapper file</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<script>
+'use strict';
+service_worker_test('reentrant-strategy.js', 'Service worker test setup');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.sharedworker.html b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.sharedworker.html
new file mode 100644
index 0000000..1bd555a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/streams/writable-streams/reentrant-strategy.sharedworker.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>reentrant-strategy.js shared worker wrapper file</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+'use strict';
+fetch_tests_from_worker(new SharedWorker('reentrant-strategy.js'));
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/delay.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/delay.html
index d6e1cd9..1b34f7db 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/delay.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/delay.html

@@ -12,6 +12,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.delay, 0);
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] }, 100);
   anim.effect.timing.delay = 100;
@@ -57,5 +62,18 @@
   assert_equals(anim.effect.getComputedTiming().currentIteration, 0);
 }, 'Test finishing an animation using a large negative delay');
 
+test(function(t) {
+  var div = createDiv(t);
+  var anim = div.animate(null);
+  for (let invalid of [NaN, Infinity]) {
+    assert_throws({ name: 'TypeError' }, function() {
+      anim.effect.timing.delay = invalid;
+    }, 'setting ' + invalid);
+    assert_throws({ name: 'TypeError' }, function() {
+      div.animate({}, { delay: invalid });
+    }, 'animate() with ' + invalid);
+  }
+}, 'Setting invalid values should throw TypeError');
+
 </script>
 </body>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/direction.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/direction.html
index c3657f3..957181202 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/direction.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/direction.html

@@ -12,6 +12,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.direction, 'normal');
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/duration.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/duration.html
index 8e2a1a1..dbde1a43 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/duration.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/duration.html

@@ -12,6 +12,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.duration, 'auto');
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
   anim.effect.timing.duration = 123.45;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/easing.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/easing.html
index 6c3d305..73cdf66 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/easing.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/easing.html

@@ -11,6 +11,11 @@
 <script>
 'use strict';
 
+test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.easing, 'linear');
+}, 'Test default value');
+
 function assert_progress(animation, currentTime, easingFunction) {
   animation.currentTime = currentTime;
   var portion = currentTime / animation.effect.timing.duration;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/endDelay.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/endDelay.html
index 40136b4..c6c2e88 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/endDelay.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/endDelay.html

@@ -12,6 +12,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.endDelay, 0);
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
   anim.effect.timing.endDelay = 123.45;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/fill.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/fill.html
index 21e523b7..89f6a46 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/fill.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/fill.html

@@ -10,6 +10,11 @@
 <script>
 'use strict';
 
+test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.fill, 'auto');
+}, 'Test default value');
+
 ["none", "forwards", "backwards", "both", ].forEach(function(fill){
   test(function(t) {
     var div = createDiv(t);

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart-expected.txt
index d68877d..94b50ca 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart-expected.txt
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart-expected.txt

@@ -1,7 +1,8 @@
 This is a testharness.js-based test.
+PASS Test default value 
 FAIL Test that changing the iterationStart affects computed timing when backwards-filling assert_equals: expected 0.5 but got 0.4999999999999999
 FAIL Test that changing the iterationStart affects computed timing during the active phase assert_equals: expected 0.5 but got 0.4999999999999999
 FAIL Test that changing the iterationStart affects computed timing when forwards-filling assert_equals: expected 0.5 but got 0.4999999999999996
-PASS Test invalid iterationStart value 
+PASS Using invalid values should throw TypeError 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
index 0273fd1..df3f992d 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterationStart.html

@@ -12,6 +12,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.iterationStart, 0);
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] },
                          { iterationStart: 0.2,
@@ -56,17 +61,16 @@
 
 test(function(t) {
   var div = createDiv(t);
-  var anim = div.animate({ opacity: [ 0, 1 ] }, 100);
-  assert_throws({ name: 'TypeError' },
-                function() {
-                  anim.effect.timing.iterationStart = -1;
-                });
-  assert_throws({ name: 'TypeError' },
-                function() {
-                  div.animate({ opacity: [ 0, 1 ] },
-                              { iterationStart: -1 });
-                });
-}, 'Test invalid iterationStart value');
+  var anim = div.animate(null);
+  for (let invalid of [-1, NaN, Infinity]) {
+    assert_throws({ name: 'TypeError' }, function() {
+      anim.effect.timing.iterationStart = invalid;
+    }, 'setting ' + invalid);
+    assert_throws({ name: 'TypeError' }, function() {
+      div.animate({}, { iterationStart: invalid });
+    }, 'animate() with ' + invalid);
+  }
+}, 'Using invalid values should throw TypeError');
 
 </script>
 </body>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterations.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterations.html
index 1ba4102..8dfe1695 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterations.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/interfaces/AnimationEffectTiming/iterations.html

@@ -11,6 +11,11 @@
 'use strict';
 
 test(function(t) {
+  var anim = createDiv(t).animate(null);
+  assert_equals(anim.effect.timing.iterations, 1);
+}, 'Test default value');
+
+test(function(t) {
   var div = createDiv(t);
   var anim = div.animate({ opacity: [ 0, 1 ] }, 2000);
   anim.effect.timing.iterations = 2;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time-expected.txt
new file mode 100644
index 0000000..c172245
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time-expected.txt

@@ -0,0 +1,5 @@
+This is a testharness.js-based test.
+FAIL Local time is current time for animation effects associated with an animation assert_equals: expected (number) -1000 but got (object) null
+PASS Local time is unresolved for animation effects not associated with an animation 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time.html b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time.html
new file mode 100644
index 0000000..91c1ed4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/animation-effects/local-time.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>AnimationEffect local time tests</title>
+<link rel="help" href="https://w3c.github.io/web-animations/#local-time">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<body>
+<script>
+'use strict';
+
+test(function(t) {
+  var anim = createDiv(t).animate(null, 10 * MS_PER_SEC);
+  for (var seconds of [-1, 0, 5, 10, 20]) {
+    anim.currentTime = seconds * MS_PER_SEC;
+    assert_equals(anim.effect.getComputedTiming().localTime, seconds * MS_PER_SEC);
+  }
+}, 'Local time is current time for animation effects associated with an animation');
+
+test(function(t) {
+  var effect = new KeyframeEffect(createDiv(t), null, 10 * MS_PER_SEC);
+  assert_equals(effect.getComputedTiming().localTime, null);
+}, 'Local time is unresolved for animation effects not associated with an animation');
+
+</script>
+</body>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/time-transformations/transformed-progress-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/time-transformations/transformed-progress-expected.txt
new file mode 100644
index 0000000..ee5620bc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/web-animations/timing-model/time-transformations/transformed-progress-expected.txt

@@ -0,0 +1,28 @@
+This is a testharness.js-based test.
+PASS Transformed progress for step-start function 
+PASS Transformed progress for steps(1, start) function 
+PASS Transformed progress for steps(2, start) function 
+PASS Transformed progress for step-end function 
+PASS Transformed progress for steps(1) function 
+PASS Transformed progress for steps(1, end) function 
+PASS Transformed progress for steps(2, end) function 
+PASS Transformed progress for linear function 
+FAIL Transformed progress for ease function assert_approx_equals: The progress should be approximately 0.40851059137130497 at 250ms expected 0.40851059137130497 +/- 0.01 but got 0.41869212962962965
+PASS Transformed progress for ease-in function 
+PASS Transformed progress for ease-in-out function 
+PASS Transformed progress for ease-out function 
+PASS Transformed progress for easing function which produces values greater than 1 
+PASS Transformed progress for easing function which produces values less than 1 
+FAIL Test bounds point of step-start easing assert_equals: Progress at 0ms expected 0 but got 0.5
+FAIL Test bounds point of step-start easing with reverse direction assert_equals: Progress at 2000ms expected 0 but got 0.5
+PASS Test bounds point of step-start easing with iterationStart not at a transition point 
+FAIL Test bounds point of step-start easing with iterationStart and delay assert_equals: Progress at 0ms expected 0.5 but got 1
+FAIL Test bounds point of step-start easing with iterationStart and reverse direction assert_equals: Progress at 2000ms expected 0.5 but got 1
+FAIL Test bounds point of step(4, start) easing with iterationStart 0.75 and delay assert_equals: Progress at 0ms expected 0.75 but got 1
+FAIL Test bounds point of step-start easing with alternate direction assert_equals: Progress at 3000ms expected 0.5 but got 1
+FAIL Test bounds point of step-start easing with alternate-reverse direction assert_equals: Progress at 3000ms expected 0.5 but got 1
+PASS Test bounds point of step-end easing 
+FAIL Test bounds point of step-end easing with iterationStart and delay assert_equals: Progress at 0ms expected 0 but got 0.5
+PASS Test bounds point of step-end easing with iterationStart not at a transition point 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align-expected.txt
new file mode 100644
index 0000000..26a031d1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align-expected.txt
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align.html
new file mode 100644
index 0000000..df626189
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/align.html

@@ -0,0 +1,65 @@
+<!doctype html>
+<title>VTTCue.align</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-align">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+
+    var cue = new VTTCue(0, 1, 'text');
+    assert_equals(cue.align, 'center');
+
+    var track = document.createElement('track');
+    var t = track.track;
+    t.addCue(cue);
+
+    assert_equals(cue.align, 'center');
+
+    video.appendChild(track);
+    assert_equals(cue.align, 'center');
+
+    t.mode = 'showing';
+    assert_equals(cue.align, 'center');
+
+    cue.align = 'start';
+    assert_equals(cue.align, 'start');
+
+    cue.align = 'end';
+    assert_equals(cue.align, 'end');
+
+    ['start\u0000', 'centre', 'middle'].forEach(function(invalid) {
+        cue.align = invalid;
+        assert_equals(cue.align, 'end');
+    });
+}, document.title+', script-created cue');
+
+var t_parsed = async_test(document.title+', parsed cue');
+t_parsed.step(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+    var t = document.createElement('track');
+    t.onload = this.step_func(function(){
+        var c1 = t.track.cues[0];
+        var c2 = t.track.cues[1];
+        var c3 = t.track.cues[2];
+        var c4 = t.track.cues[3];
+        assert_equals(c1.align, 'center');
+        assert_equals(c2.align, 'start');
+        assert_equals(c3.align, 'center');
+        assert_equals(c4.align, 'end');
+        this.done();
+    });
+    t.onerror = this.step_func(function() {
+      assert_unreached('got error event');
+    });
+    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 align:start\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 align:center\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 align:end\ntest');
+    t.track.mode = 'showing';
+    video.appendChild(t);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor-expected.txt
new file mode 100644
index 0000000..293089c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor-expected.txt

@@ -0,0 +1,7 @@
+This is a testharness.js-based test.
+FAIL VTTCue(), initial values assert_equals: expected (string) "start" but got (undefined) undefined
+PASS VTTCue(), bad start time 
+PASS VTTCue(), bad end time 
+PASS VTTCue(), text formatting 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor.html
new file mode 100644
index 0000000..255ee8c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/constructor.html

@@ -0,0 +1,49 @@
+<!doctype html>
+<title>VTTCue()</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-vttcue">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var cue = new VTTCue(3, 12, 'foo bar');
+
+    assert_equals(cue.startTime, 3);
+    assert_equals(cue.endTime, 12);
+    assert_equals(cue.text, 'foo bar');
+    assert_equals(cue.id, '');
+    assert_equals(cue.region, null);
+    assert_equals(cue.pauseOnExit, false);
+    assert_equals(cue.snapToLines, true);
+    assert_equals(cue.line, 'auto');
+    assert_equals(cue.lineAlign, 'start');
+    assert_equals(cue.position, 'auto');
+    assert_equals(cue.positionAlign, 'auto');
+    assert_equals(cue.size, 100);
+    assert_equals(cue.align, 'center');
+}, document.title + ', initial values');
+
+test(function() {
+    var cue = new VTTCue(-1, 12, 'foo bar');
+
+    assert_equals(cue.startTime, -1);
+    assert_equals(cue.endTime, 12);
+}, document.title + ', bad start time');
+
+
+test(function() {
+    var cue = new VTTCue(2, -1, 'foo bar');
+
+    assert_equals(cue.startTime, 2);
+    assert_equals(cue.endTime, -1);
+}, document.title + ', bad end time');
+
+test(function() {
+    var cue = new VTTCue(3, 12, '<i>foo bar</i>');
+
+    var frag = cue.getCueAsHTML();
+    assert_equals(frag.childNodes.length, 1);
+    assert_equals(frag.childNodes[0].localName, 'i');
+    assert_equals(frag.childNodes[0].textContent, 'foo bar');
+}, document.title + ', text formatting');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/getCueAsHTML-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/getCueAsHTML-expected.txt

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/getCueAsHTML.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/getCueAsHTML.html
new file mode 100644
index 0000000..5c96644
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/getCueAsHTML.html

@@ -0,0 +1,93 @@
+<!doctype html>
+<title>VTTCue.getCueAsHTML()</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-getcueashtml">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var video = document.createElement('video');
+    var t1 = video.addTextTrack('subtitles');
+    document.body.appendChild(video);
+    var c1 = new VTTCue(0, 1, '<c></c><c.a.b></c><i></i><b></b><u></u><ruby><rt></rt></ruby><v></v><v a b></v><00:00:00.500>x\0');
+    t1.addCue(c1);
+    window.frag = c1.getCueAsHTML();
+    assert_equals(frag.childNodes.length, 10, 'childNodes.length');
+    assert_true(frag instanceof DocumentFragment, 'getCueAsHTML() should return DocumentFragment');
+}, document.title+', creating the cue');
+test(function(){
+    assert_equals(frag.childNodes[0].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[0].localName, 'span', 'localName');
+    assert_equals(frag.childNodes[0].attributes.length, 0, 'attributes');
+    assert_false(frag.childNodes[0].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[0] instanceof HTMLElement, 'instanceof');
+}, document.title+', <c>');
+test(function(){
+    assert_equals(frag.childNodes[1].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[1].localName, 'span', 'localName');
+    assert_equals(frag.childNodes[1].attributes.length, 1, 'attributes');
+    assert_equals(frag.childNodes[1].getAttributeNS('', 'class'), 'a b', 'class attribute');
+    assert_false(frag.childNodes[1].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[1] instanceof HTMLElement, 'instanceof');
+}, document.title+', <c.a.b>');
+test(function(){
+    assert_equals(frag.childNodes[2].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[2].localName, 'i', 'localName');
+    assert_equals(frag.childNodes[2].attributes.length, 0, 'attributes');
+    assert_false(frag.childNodes[2].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[2] instanceof HTMLElement, 'instanceof');
+}, document.title+', <i>');
+test(function(){
+    assert_equals(frag.childNodes[3].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[3].localName, 'b', 'localName');
+    assert_equals(frag.childNodes[3].attributes.length, 0, 'attributes');
+    assert_false(frag.childNodes[3].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[3] instanceof HTMLElement, 'instanceof');
+}, document.title+', <b>');
+test(function(){
+    assert_equals(frag.childNodes[4].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[4].localName, 'u', 'localName');
+    assert_equals(frag.childNodes[4].attributes.length, 0, 'attributes');
+    assert_false(frag.childNodes[4].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[4] instanceof HTMLElement, 'instanceof');
+}, document.title+', <u>');
+test(function(){
+    assert_equals(frag.childNodes[5].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[5].localName, 'ruby', 'localName');
+    assert_equals(frag.childNodes[5].attributes.length, 0, 'attributes');
+    assert_true(frag.childNodes[5].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[5] instanceof HTMLElement, 'instanceof');
+}, document.title+', <ruby>');
+test(function(){
+    assert_equals(frag.childNodes[5].firstChild.namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[5].firstChild.localName, 'rt', 'localName');
+    assert_equals(frag.childNodes[5].firstChild.attributes.length, 0, 'attributes');
+    assert_false(frag.childNodes[5].firstChild.hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[5].firstChild instanceof HTMLElement, 'instanceof');
+}, document.title+', <rt>');
+test(function(){
+    assert_equals(frag.childNodes[6].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[6].localName, 'span', 'localName');
+    assert_equals(frag.childNodes[6].attributes.length, 1, 'attributes');
+    assert_equals(frag.childNodes[6].getAttributeNS('', 'title'), '', 'title attribute');
+    assert_false(frag.childNodes[6].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[6] instanceof HTMLElement, 'instanceof');
+}, document.title+', <v>');
+test(function(){
+    assert_equals(frag.childNodes[7].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
+    assert_equals(frag.childNodes[7].localName, 'span', 'localName');
+    assert_equals(frag.childNodes[7].attributes.length, 1, 'attributes');
+    assert_equals(frag.childNodes[7].getAttributeNS('', 'title'), 'a b', 'title attribute');
+    assert_false(frag.childNodes[7].hasChildNodes(), 'hasChildNodes()');
+    assert_true(frag.childNodes[7] instanceof HTMLElement, 'instanceof');
+}, document.title+', <v a b>');
+test(function(){
+    assert_equals(frag.childNodes[8].target, 'timestamp', 'target');
+    assert_equals(frag.childNodes[8].data, '00:00:00.500', 'data');
+    assert_true(frag.childNodes[8] instanceof ProcessingInstruction, 'instanceof');
+}, document.title+', <00:00:00.500>');
+test(function(){
+    assert_equals(frag.childNodes[9].data, 'x\0', 'data');
+    assert_true(frag.childNodes[9] instanceof Text, 'instanceof');
+}, document.title+', x\\0');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/line-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/line-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/line-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/line-expected.txt

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/line.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/line.html
new file mode 100644
index 0000000..f2666c5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/line.html

@@ -0,0 +1,63 @@
+<!doctype html>
+<title>VTTCue.line</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-line">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+    var c1 = new VTTCue(0, 1, 'text1');
+    assert_equals(c1.line, "auto");
+    var track = document.createElement('track');
+    var t = track.track;
+    t.addCue(c1);
+    assert_equals(c1.line, "auto");
+    video.appendChild(track);
+    assert_equals(c1.line, "auto");
+    t.mode = 'showing';
+    assert_equals(c1.line, "auto");
+    var c2 = new VTTCue(0, 1, 'text2');
+    var track2 = document.createElement('track');
+    var t2 = track2.track;
+    t2.addCue(c2);
+    assert_equals(c2.line, "auto");
+    video.appendChild(track2);
+    t2.mode = 'showing';
+    assert_equals(c2.line, "auto");
+    assert_equals(c1.line, "auto");
+    c1.line = -5;
+    assert_equals(c1.line, -5);
+    assert_equals(c2.line, "auto");
+    c1.line = 0;
+    c1.snapToLines = false;
+    assert_equals(c1.line, 0);
+    assert_equals(c2.line, "auto");
+}, document.title+', script-created cue');
+
+var t_parsed = async_test(document.title+', parsed cue');
+t_parsed.step(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+    var t = document.createElement('track');
+    t.onload = this.step_func(function(){
+        var c1 = t.track.cues[0];
+        var c2 = t.track.cues[1];
+        var c3 = t.track.cues[2];
+        assert_equals(c1.line, "auto");
+        assert_equals(c2.line, 0);
+        assert_equals(c3.line, 0);
+
+        this.done();
+    });
+    t.onerror = this.step_func(function() {
+      assert_unreached('got error event');
+    });
+    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 line:0\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 line:0%\ntest');
+    t.track.mode = 'showing';
+    video.appendChild(t);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign-expected.txt
new file mode 100644
index 0000000..4c3e832
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL VTTCue.lineAlign, script-created cue assert_equals: expected (string) "start" but got (undefined) undefined
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign.html
new file mode 100644
index 0000000..db8dbef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/lineAlign.html

@@ -0,0 +1,38 @@
+<!doctype html>
+<title>VTTCue.lineAlign</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-linealign">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+
+    var cue = new VTTCue(0, 1, 'text');
+    assert_equals(cue.lineAlign, 'start');
+
+    var track = document.createElement('track');
+    var t = track.track;
+    t.addCue(cue);
+
+    assert_equals(cue.lineAlign, 'start');
+
+    video.appendChild(track);
+    assert_equals(cue.lineAlign, 'start');
+
+    t.mode = 'showing';
+    assert_equals(cue.lineAlign, 'start');
+
+    cue.lineAlign = 'center';
+    assert_equals(cue.lineAlign, 'center');
+
+    cue.lineAlign = 'end';
+    assert_equals(cue.lineAlign, 'end');
+
+    ['start\u0000', 'centre', 'middle'].forEach(function(invalid) {
+        cue.lineAlign = invalid;
+        assert_equals(cue.lineAlign, 'end');
+    });
+}, document.title+', script-created cue');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/position.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/position.html
new file mode 100644
index 0000000..ed5ba15f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/position.html

@@ -0,0 +1,28 @@
+<!doctype html>
+<title>VTTCue.position</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-position">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var cue = new VTTCue(0, 1, 'text');
+
+    cue.position = 'auto';
+    assert_equals(cue.position, 'auto');
+
+    for (i = 0; i <= 100; i++) {
+        cue.position = i;
+        assert_equals(cue.position, i);
+    }
+
+    [-1, -100, -101, 101, 200, 201].forEach(function(invalid) {
+        assert_throws('IndexSizeError', function() {
+            cue.position = invalid;
+        });
+    });
+
+    cue.position = 1.5;
+    assert_equals(cue.position, 1.5);
+}, document.title+', script-created cue');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign-expected.txt
new file mode 100644
index 0000000..9fb1c278
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL VTTCue.positionAlign, script-created cue assert_equals: expected "center" but got "auto\0"
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign.html
new file mode 100644
index 0000000..535c680
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/positionAlign.html

@@ -0,0 +1,22 @@
+<!doctype html>
+<title>VTTCue.positionAlign</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-positionalign">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var cue = new VTTCue(0, 1, 'text');
+
+    ['line-left', 'center', 'line-right', 'auto'].forEach(function(valid) {
+        cue.positionAlign = valid;
+        assert_equals(cue.positionAlign, valid);
+    });
+
+    cue.positionAlign = 'center';
+    ['auto\u0000', 'centre', 'middle'].forEach(function(invalid) {
+        cue.positionAlign = invalid;
+        assert_equals(cue.positionAlign, 'center');
+    });
+}, document.title+', script-created cue');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region-expected.txt
new file mode 100644
index 0000000..bbc8739
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL VTTCue.region, script-created cue Failed to set the 'region' property on 'VTTCue': The provided value is not of type 'VTTRegion'.
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region.html
new file mode 100644
index 0000000..f4c47a1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/region.html

@@ -0,0 +1,37 @@
+<!doctype html>
+<title>VTTCue.region</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-region">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+
+    var cue = new VTTCue(0, 1, 'text');
+    assert_equals(cue.region, null);
+
+    var track = document.createElement('track');
+    var t = track.track;
+    t.addCue(cue);
+
+    assert_equals(cue.region, null);
+
+    video.appendChild(track);
+    assert_equals(cue.region, null);
+
+    t.mode = 'showing';
+    assert_equals(cue.region, null);
+
+    var region = new VTTRegion();
+    cue.region = region;
+    assert_equals(cue.region, region);
+
+    cue.region = 'foo';
+    assert_equals(cue.region, region);
+
+    cue.region = null;
+    assert_equals(cue.region, null);
+}, document.title+', script-created cue');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/size.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/size.html
new file mode 100644
index 0000000..abb439f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/size.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTCue.size</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-size">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var cue = new VTTCue(0, 1, 'text');
+
+    for (i = 0; i <= 100; i++) {
+        cue.size = i;
+        assert_equals(cue.size, i);
+    }
+
+    [-1, -100, -101, 101, 200, 201].forEach(function(invalid) {
+        assert_throws('IndexSizeError', function() {
+            cue.size = invalid;
+        });
+    });
+
+    cue.size = 1.5;
+    assert_equals(cue.size, 1.5);
+}, document.title+', script-created cue');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/snapToLines-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/snapToLines-expected.txt

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/snapToLines.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/snapToLines.html
new file mode 100644
index 0000000..447e8da4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/snapToLines.html

@@ -0,0 +1,98 @@
+<!doctype html>
+<title>VTTCue.snapToLines</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-snaptolines">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+setup(function(){
+    window.video = document.createElement('video');
+    window.t1 = video.addTextTrack('subtitles');
+    document.body.appendChild(video);
+});
+test(function(){
+    var c1 = new VTTCue(0, 1, 'text1');
+    assert_true(c1.snapToLines);
+    c1.line = 101;
+    c1.snapToLines = false;
+    assert_false(c1.snapToLines);
+    c1.snapToLines = true;
+    assert_true(c1.snapToLines);
+    c1.line = -1;
+    c1.snapToLines = false;
+    assert_false(c1.snapToLines);
+    c1.snapToLines = true;
+    assert_true(c1.snapToLines);
+    c1.line = 0;
+    c1.snapToLines = false;
+    assert_false(c1.snapToLines);
+}, document.title+', script-created cue');
+
+var t_parsed = async_test(document.title+', parsed cue');
+t_parsed.step(function(){
+    var t = document.createElement('track');
+    t.onload = this.step_func(function(){
+        var c1 = t.track.cues[0];
+        assert_true(c1.snapToLines);
+        c1.line = 101;
+        c1.snapToLines = false;
+        assert_false(c1.snapToLines);
+        c1.snapToLines = true;
+        assert_true(c1.snapToLines);
+        c1.line = -1;
+        c1.snapToLines = false;
+        assert_false(c1.snapToLines);
+        c1.snapToLines = true;
+        assert_true(c1.snapToLines);
+        c1.line = 0;
+        c1.snapToLines = false;
+        assert_false(c1.snapToLines);
+
+        var c2 = t.track.cues[1];
+        assert_true(c2.snapToLines);
+        c2.line = 101;
+        c2.snapToLines = false;
+        assert_false(c2.snapToLines);
+        c2.snapToLines = true;
+        assert_true(c2.snapToLines);
+        c2.line = -1;
+        c2.snapToLines = false;
+        assert_false(c2.snapToLines);
+        c2.snapToLines = true;
+        assert_true(c2.snapToLines);
+        c2.line = 0;
+        c2.snapToLines = false;
+        assert_false(c2.snapToLines);
+
+        var c3 = t.track.cues[2];
+        assert_false(c3.snapToLines);
+        c3.snapToLines = false;
+        assert_false(c3.snapToLines);
+        c3.snapToLines = true;
+        assert_true(c3.snapToLines);
+        c3.line = 101;
+        c3.snapToLines = false;
+        assert_false(c3.snapToLines);
+        c3.snapToLines = true;
+        assert_true(c3.snapToLines);
+        c3.line = -1;
+        c3.snapToLines = false;
+        assert_false(c3.snapToLines);
+        c3.snapToLines = true;
+        assert_true(c3.snapToLines);
+        c3.line = 0;
+        c3.snapToLines = false;
+        assert_false(c3.snapToLines);
+
+        this.done();
+    });
+    t.onerror = this.step_func(function() {
+      assert_unreached('got error event');
+    });
+    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 line:0\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 line:0%\ntest');
+    t.track.mode = 'showing';
+    video.appendChild(t);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/text-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/text-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/text-expected.txt
rename to third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/text-expected.txt

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/text.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/text.html
new file mode 100644
index 0000000..df88a05
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/text.html

@@ -0,0 +1,39 @@
+<!doctype html>
+<title>VTTCue.text</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-text">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+setup(function(){
+    window.video = document.createElement('video');
+    window.t1 = video.addTextTrack('subtitles');
+    document.body.appendChild(video);
+});
+test(function(){
+    var c1 = new VTTCue(0, 1, 'text1\r\n\n\u0000');
+    assert_equals(c1.text, 'text1\r\n\n\u0000');
+    c1.text = c1.text;
+    assert_equals(c1.text, 'text1\r\n\n\u0000');
+    c1.text = null;
+    assert_equals(c1.text, 'null');
+}, document.title+', script-created cue');
+
+var t_parsed = async_test(document.title+', parsed cue');
+t_parsed.step(function(){
+    var t = document.createElement('track');
+    t.onload = this.step_func(function(){
+        var c = t.track.cues;
+        assert_equals(c[0].text, '');
+        assert_equals(c[1].text, 'test');
+        this.done();
+    });
+    t.onerror = this.step_func(function() {
+      assert_unreached('got error event');
+    });
+    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\n'+
+                                                      '\n\nfoobar\n00:00:00.000 --> 00:00:00.001\ntest');
+    t.track.mode = 'showing';
+    video.appendChild(t);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical-expected.txt
new file mode 100644
index 0000000..a319da6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical-expected.txt
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical.html
new file mode 100644
index 0000000..8244d83
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTCue/vertical.html

@@ -0,0 +1,55 @@
+<!doctype html>
+<title>VTTCue.vertical</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttcue-vertical">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+setup(function(){
+    window.video = document.createElement('video');
+    window.t1 = video.addTextTrack('subtitles');
+    document.body.appendChild(video);
+});
+test(function(){
+    var video = document.createElement('video');
+    document.body.appendChild(video);
+    var c1 = new VTTCue(0, 1, 'text1');
+    assert_equals(c1.vertical, '');
+    var track = document.createElement('track');
+    var t = track.track;
+    t.addCue(c1);
+    assert_equals(c1.vertical, '');
+    video.appendChild(track);
+    assert_equals(c1.vertical, '');
+    t.mode = 'showing';
+    assert_equals(c1.vertical, '');
+    c1.vertical = 'rl';
+    assert_equals(c1.vertical, 'rl');
+    c1.vertical = 'lr';
+    assert_equals(c1.vertical, 'lr');
+    c1.vertical = 'rl\u0000';
+    assert_equals(c1.vertical, 'lr');
+}, document.title+', script-created cue');
+
+var t_parsed = async_test(document.title+', parsed cue');
+t_parsed.step(function(){
+    var t = document.createElement('track');
+    t.onload = this.step_func(function(){
+        var c1 = t.track.cues[0];
+        var c2 = t.track.cues[1];
+        var c3 = t.track.cues[2];
+        assert_equals(c1.vertical, '');
+        assert_equals(c2.vertical, 'rl');
+        assert_equals(c3.vertical, 'lr');
+        this.done();
+    });
+    t.onerror = this.step_func(function() {
+      assert_unreached('got error event');
+    });
+    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 vertical:rl\ntest\n\n'+
+                                                '00:00:00.000 --> 00:00:00.001 vertical:lr\ntest');
+    t.track.mode = 'showing';
+    video.appendChild(t);
+});
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/constructor.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/constructor.html
new file mode 100644
index 0000000..53c1968
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/constructor.html

@@ -0,0 +1,18 @@
+<!doctype html>
+<title>VTTRegion()</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-vttregion">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+    assert_equals(region.width, 100);
+    assert_equals(region.lines, 3);
+    assert_equals(region.regionAnchorX, 0);
+    assert_equals(region.regionAnchorY, 100);
+    assert_equals(region.viewportAnchorX, 0);
+    assert_equals(region.viewportAnchorY, 100);
+    assert_equals(region.scroll, '');
+}, document.title + ' initial values');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/lines.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/lines.html
new file mode 100644
index 0000000..d7f2668b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/lines.html

@@ -0,0 +1,36 @@
+<!doctype html>
+<title>VTTRegion.lines</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-lines">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    for (var i = 1; i <= 100; i++) {
+        region.lines = i;
+        assert_equals(region.lines, i);
+    }
+
+    // https://heycam.github.io/webidl/#abstract-opdef-converttoint
+    [[0, 0],
+     [-0, 0],
+     [101, 101],
+     [2147483647, 2147483647],
+     [NaN, 0],
+     [Infinity, 0],
+     [-Infinity, 0]].forEach(function (pair) {
+        var input = pair[0];
+        var expected = pair[1];
+        region.lines = input;
+        assert_equals(region.lines, expected);
+    });
+
+    [-1, -100, -2147483648, 2147483648 /* wraps to -2147483648 */].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+          region.lines = invalid;
+        }, invalid);
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorX.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorX.html
new file mode 100644
index 0000000..2d4125f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorX.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTRegion.regionAnchorX</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-regionanchorx">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    for (var i = 0; i <= 100; i++) {
+        region.regionAnchorX = i;
+        assert_equals(region.regionAnchorX, i);
+    }
+
+    region.regionAnchorX = 1.5;
+    assert_equals(region.regionAnchorX, 1.5);
+
+    [-1, -100, -150, 101, 200, 250].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+            region.regionAnchorX = invalid;
+        });
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorY.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorY.html
new file mode 100644
index 0000000..7b4a9ec
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/regionAnchorY.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTRegion.regionAnchorY</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-regionanchory">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    for (var i = 0; i <= 100; i++) {
+        region.regionAnchorY = i;
+        assert_equals(region.regionAnchorY, i);
+    }
+
+    region.regionAnchorX = 1.5;
+    assert_equals(region.regionAnchorX, 1.5);
+
+    [-1, -100, -150, 101, 200, 250].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+            region.regionAnchorY = invalid;
+        });
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/scroll.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/scroll.html
new file mode 100644
index 0000000..0dd7027
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/scroll.html

@@ -0,0 +1,26 @@
+<!doctype html>
+<title>VTTRegion.scroll</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-scroll">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    region.scroll = '';
+    assert_equals(region.scroll, '');
+
+    region.scroll = 'up';
+    assert_equals(region.scroll, 'up');
+
+    region.scroll = 'down';
+    assert_equals(region.scroll, 'up');
+
+    region.scroll = '';
+    for (var invalid in ['left', 'right', 'center', 'top', 'bottom', 'down']) {
+        region.scroll = invalid;
+        assert_equals(region.scroll, '');
+    }
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorX.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorX.html
new file mode 100644
index 0000000..17daa7a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorX.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTRegion.viewportAnchorX</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-viewportanchorx">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    for (var i = 0; i <= 100; i++) {
+        region.viewportAnchorX = i;
+        assert_equals(region.viewportAnchorX, i);
+    }
+
+    region.viewportAnchorX = 1.5;
+    assert_equals(region.viewportAnchorX, 1.5);
+
+    [-1, -100, -150, 101, 200, 250].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+            region.viewportAnchorX = invalid;
+        });
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorY.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorY.html
new file mode 100644
index 0000000..ad2a06a6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/viewportAnchorY.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTRegion.viewportAnchorY</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-viewportanchory">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function() {
+    var region = new VTTRegion();
+
+    for (var i = 0; i <= 100; i++) {
+        region.viewportAnchorY = i;
+        assert_equals(region.viewportAnchorY, i);
+    }
+
+    region.viewportAnchorY = 1.5;
+    assert_equals(region.viewportAnchorY, 1.5);
+
+    [-1, -100, -150, 101, 200, 250].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+            region.viewportAnchorY = invalid;
+        });
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/width.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/width.html
new file mode 100644
index 0000000..e5179e6bd8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/wpt/webvtt/api/VTTRegion/width.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<title>VTTRegion.width</title>
+<link rel="help" href="https://w3c.github.io/webvtt/#dom-vttregion-width">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+test(function(){
+    var region = new VTTRegion();
+
+    for (var i = 0; i <= 100; i++) {
+        region.width = i;
+        assert_equals(region.width, i);
+    }
+
+    region.width = 1.5;
+    assert_equals(region.width, 1.5);
+
+    [-1, -100, -150, 101, 200, 250].forEach(function (invalid) {
+        assert_throws('IndexSizeError', function() {
+            region.width = invalid;
+        });
+    });
+}, document.title + ' script-created region');
+</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align-expected.txt
deleted file mode 100644
index 0a67f6b..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align-expected.txt
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align.html
deleted file mode 100644
index dcae64fc..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/align.html
+++ /dev/null

@@ -1,54 +0,0 @@
-<!doctype html>
-<title>VTTCue.align</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-test(function(){
-    var video = document.createElement('video');
-    document.body.appendChild(video);
-    var c1 = new VTTCue(0, 1, 'text1');
-    assert_equals(c1.align, 'center');
-    var track = document.createElement('track');
-    var t = track.track;
-    t.addCue(c1);
-    assert_equals(c1.align, 'center');
-    video.appendChild(track);
-    assert_equals(c1.align, 'center');
-    t.mode = 'showing';
-    assert_equals(c1.align, 'center');
-    c1.align = 'start';
-    assert_equals(c1.align, 'start');
-    c1.align = 'end';
-    assert_equals(c1.align, 'end');
-    c1.align = 'start\u0000';
-    assert_equals(c1.align, 'end');
-}, document.title+', script-created cue');
-
-var t_parsed = async_test(document.title+', parsed cue');
-t_parsed.step(function(){
-    var video = document.createElement('video');
-    document.body.appendChild(video);
-    var t = document.createElement('track');
-    t.onload = this.step_func(function(){
-        var c1 = t.track.cues[0];
-        var c2 = t.track.cues[1];
-        var c3 = t.track.cues[2];
-        var c4 = t.track.cues[3];
-        assert_equals(c1.align, 'center');
-        assert_equals(c2.align, 'start');
-        assert_equals(c3.align, 'center');
-        assert_equals(c4.align, 'end');
-        this.done();
-    });
-    t.onerror = this.step_func(function() {
-      assert_unreached('got error event');
-    });
-    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 align:start\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 align:center\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 align:end\ntest');
-    t.track.mode = 'showing';
-    video.appendChild(t);
-});
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html
deleted file mode 100644
index 5be09a5..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/getCueAsHTML.html
+++ /dev/null

@@ -1,92 +0,0 @@
-<!doctype html>
-<title>VTTCue.getCueAsHTML()</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-test(function(){
-    var video = document.createElement('video');
-    var t1 = video.addTextTrack('subtitles');
-    document.body.appendChild(video);
-    var c1 = new VTTCue(0, 1, '<c></c><c.a.b></c><i></i><b></b><u></u><ruby><rt></rt></ruby><v></v><v a b></v><00:00:00.500>x\0');
-    t1.addCue(c1);
-    window.frag = c1.getCueAsHTML();
-    assert_equals(frag.childNodes.length, 10, 'childNodes.length');
-    assert_true(frag instanceof DocumentFragment, 'getCueAsHTML() should return DocumentFragment');
-}, document.title+', creating the cue');
-test(function(){
-    assert_equals(frag.childNodes[0].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[0].localName, 'span', 'localName');
-    assert_equals(frag.childNodes[0].attributes.length, 0, 'attributes');
-    assert_false(frag.childNodes[0].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[0] instanceof HTMLElement, 'instanceof');
-}, document.title+', <c>');
-test(function(){
-    assert_equals(frag.childNodes[1].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[1].localName, 'span', 'localName');
-    assert_equals(frag.childNodes[1].attributes.length, 1, 'attributes');
-    assert_equals(frag.childNodes[1].getAttributeNS('', 'class'), 'a b', 'class attribute');
-    assert_false(frag.childNodes[1].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[1] instanceof HTMLElement, 'instanceof');
-}, document.title+', <c.a.b>');
-test(function(){
-    assert_equals(frag.childNodes[2].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[2].localName, 'i', 'localName');
-    assert_equals(frag.childNodes[2].attributes.length, 0, 'attributes');
-    assert_false(frag.childNodes[2].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[2] instanceof HTMLElement, 'instanceof');
-}, document.title+', <i>');
-test(function(){
-    assert_equals(frag.childNodes[3].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[3].localName, 'b', 'localName');
-    assert_equals(frag.childNodes[3].attributes.length, 0, 'attributes');
-    assert_false(frag.childNodes[3].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[3] instanceof HTMLElement, 'instanceof');
-}, document.title+', <b>');
-test(function(){
-    assert_equals(frag.childNodes[4].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[4].localName, 'u', 'localName');
-    assert_equals(frag.childNodes[4].attributes.length, 0, 'attributes');
-    assert_false(frag.childNodes[4].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[4] instanceof HTMLElement, 'instanceof');
-}, document.title+', <u>');
-test(function(){
-    assert_equals(frag.childNodes[5].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[5].localName, 'ruby', 'localName');
-    assert_equals(frag.childNodes[5].attributes.length, 0, 'attributes');
-    assert_true(frag.childNodes[5].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[5] instanceof HTMLElement, 'instanceof');
-}, document.title+', <ruby>');
-test(function(){
-    assert_equals(frag.childNodes[5].firstChild.namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[5].firstChild.localName, 'rt', 'localName');
-    assert_equals(frag.childNodes[5].firstChild.attributes.length, 0, 'attributes');
-    assert_false(frag.childNodes[5].firstChild.hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[5].firstChild instanceof HTMLElement, 'instanceof');
-}, document.title+', <rt>');
-test(function(){
-    assert_equals(frag.childNodes[6].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[6].localName, 'span', 'localName');
-    assert_equals(frag.childNodes[6].attributes.length, 1, 'attributes');
-    assert_equals(frag.childNodes[6].getAttributeNS('', 'title'), '', 'title attribute');
-    assert_false(frag.childNodes[6].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[6] instanceof HTMLElement, 'instanceof');
-}, document.title+', <v>');
-test(function(){
-    assert_equals(frag.childNodes[7].namespaceURI, 'http://www.w3.org/1999/xhtml', 'namespaceURI');
-    assert_equals(frag.childNodes[7].localName, 'span', 'localName');
-    assert_equals(frag.childNodes[7].attributes.length, 1, 'attributes');
-    assert_equals(frag.childNodes[7].getAttributeNS('', 'title'), 'a b', 'title attribute');
-    assert_false(frag.childNodes[7].hasChildNodes(), 'hasChildNodes()');
-    assert_true(frag.childNodes[7] instanceof HTMLElement, 'instanceof');
-}, document.title+', <v a b>');
-test(function(){
-    assert_equals(frag.childNodes[8].target, 'timestamp', 'target');
-    assert_equals(frag.childNodes[8].data, '00:00:00.500', 'data');
-    assert_true(frag.childNodes[8] instanceof ProcessingInstruction, 'instanceof');
-}, document.title+', <00:00:00.500>');
-test(function(){
-    assert_equals(frag.childNodes[9].data, 'x\0', 'data');
-    assert_true(frag.childNodes[9] instanceof Text, 'instanceof');
-}, document.title+', x\\0');
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/line.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/line.html
deleted file mode 100644
index 88e3602..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/line.html
+++ /dev/null

@@ -1,62 +0,0 @@
-<!doctype html>
-<title>VTTCue.line</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-test(function(){
-    var video = document.createElement('video');
-    document.body.appendChild(video);
-    var c1 = new VTTCue(0, 1, 'text1');
-    assert_equals(c1.line, "auto");
-    var track = document.createElement('track');
-    var t = track.track;
-    t.addCue(c1);
-    assert_equals(c1.line, "auto");
-    video.appendChild(track);
-    assert_equals(c1.line, "auto");
-    t.mode = 'showing';
-    assert_equals(c1.line, "auto");
-    var c2 = new VTTCue(0, 1, 'text2');
-    var track2 = document.createElement('track');
-    var t2 = track2.track;
-    t2.addCue(c2);
-    assert_equals(c2.line, "auto");
-    video.appendChild(track2);
-    t2.mode = 'showing';
-    assert_equals(c2.line, "auto");
-    assert_equals(c1.line, "auto");
-    c1.line = -5;
-    assert_equals(c1.line, -5);
-    assert_equals(c2.line, "auto");
-    c1.line = 0;
-    c1.snapToLines = false;
-    assert_equals(c1.line, 0);
-    assert_equals(c2.line, "auto");
-}, document.title+', script-created cue');
-
-var t_parsed = async_test(document.title+', parsed cue');
-t_parsed.step(function(){
-    var video = document.createElement('video');
-    document.body.appendChild(video);
-    var t = document.createElement('track');
-    t.onload = this.step_func(function(){
-        var c1 = t.track.cues[0];
-        var c2 = t.track.cues[1];
-        var c3 = t.track.cues[2];
-        assert_equals(c1.line, "auto");
-        assert_equals(c2.line, 0);
-        assert_equals(c3.line, 0);
-
-        this.done();
-    });
-    t.onerror = this.step_func(function() {
-      assert_unreached('got error event');
-    });
-    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 line:0\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 line:0%\ntest');
-    t.track.mode = 'showing';
-    video.appendChild(t);
-});
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html
deleted file mode 100644
index c28b9d0..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/snapToLines.html
+++ /dev/null

@@ -1,97 +0,0 @@
-<!doctype html>
-<title>VTTCue.snapToLines</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-setup(function(){
-    window.video = document.createElement('video');
-    window.t1 = video.addTextTrack('subtitles');
-    document.body.appendChild(video);
-});
-test(function(){
-    var c1 = new VTTCue(0, 1, 'text1');
-    assert_true(c1.snapToLines);
-    c1.line = 101;
-    c1.snapToLines = false;
-    assert_false(c1.snapToLines);
-    c1.snapToLines = true;
-    assert_true(c1.snapToLines);
-    c1.line = -1;
-    c1.snapToLines = false;
-    assert_false(c1.snapToLines);
-    c1.snapToLines = true;
-    assert_true(c1.snapToLines);
-    c1.line = 0;
-    c1.snapToLines = false;
-    assert_false(c1.snapToLines);
-}, document.title+', script-created cue');
-
-var t_parsed = async_test(document.title+', parsed cue');
-t_parsed.step(function(){
-    var t = document.createElement('track');
-    t.onload = this.step_func(function(){
-        var c1 = t.track.cues[0];
-        assert_true(c1.snapToLines);
-        c1.line = 101;
-        c1.snapToLines = false;
-        assert_false(c1.snapToLines);
-        c1.snapToLines = true;
-        assert_true(c1.snapToLines);
-        c1.line = -1;
-        c1.snapToLines = false;
-        assert_false(c1.snapToLines);
-        c1.snapToLines = true;
-        assert_true(c1.snapToLines);
-        c1.line = 0;
-        c1.snapToLines = false;
-        assert_false(c1.snapToLines);
-
-        var c2 = t.track.cues[1];
-        assert_true(c2.snapToLines);
-        c2.line = 101;
-        c2.snapToLines = false;
-        assert_false(c2.snapToLines);
-        c2.snapToLines = true;
-        assert_true(c2.snapToLines);
-        c2.line = -1;
-        c2.snapToLines = false;
-        assert_false(c2.snapToLines);
-        c2.snapToLines = true;
-        assert_true(c2.snapToLines);
-        c2.line = 0;
-        c2.snapToLines = false;
-        assert_false(c2.snapToLines);
-
-        var c3 = t.track.cues[2];
-        assert_false(c3.snapToLines);
-        c3.snapToLines = false;
-        assert_false(c3.snapToLines);
-        c3.snapToLines = true;
-        assert_true(c3.snapToLines);
-        c3.line = 101;
-        c3.snapToLines = false;
-        assert_false(c3.snapToLines);
-        c3.snapToLines = true;
-        assert_true(c3.snapToLines);
-        c3.line = -1;
-        c3.snapToLines = false;
-        assert_false(c3.snapToLines);
-        c3.snapToLines = true;
-        assert_true(c3.snapToLines);
-        c3.line = 0;
-        c3.snapToLines = false;
-        assert_false(c3.snapToLines);
-
-        this.done();
-    });
-    t.onerror = this.step_func(function() {
-      assert_unreached('got error event');
-    });
-    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 line:0\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 line:0%\ntest');
-    t.track.mode = 'showing';
-    video.appendChild(t);
-});
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/text.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/text.html
deleted file mode 100644
index ec317f8..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/text.html
+++ /dev/null

@@ -1,38 +0,0 @@
-<!doctype html>
-<title>VTTCue.text</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-setup(function(){
-    window.video = document.createElement('video');
-    window.t1 = video.addTextTrack('subtitles');
-    document.body.appendChild(video);
-});
-test(function(){
-    var c1 = new VTTCue(0, 1, 'text1\r\n\n\u0000');
-    assert_equals(c1.text, 'text1\r\n\n\u0000');
-    c1.text = c1.text;
-    assert_equals(c1.text, 'text1\r\n\n\u0000');
-    c1.text = null;
-    assert_equals(c1.text, 'null');
-}, document.title+', script-created cue');
-
-var t_parsed = async_test(document.title+', parsed cue');
-t_parsed.step(function(){
-    var t = document.createElement('track');
-    t.onload = this.step_func(function(){
-        var c = t.track.cues;
-        assert_equals(c[0].text, '');
-        assert_equals(c[1].text, 'test');
-        this.done();
-    });
-    t.onerror = this.step_func(function() {
-      assert_unreached('got error event');
-    });
-    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\n'+
-                                                      '\n\nfoobar\n00:00:00.000 --> 00:00:00.001\ntest');
-    t.track.mode = 'showing';
-    video.appendChild(t);
-});
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical-expected.txt b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical-expected.txt
deleted file mode 100644
index cbb272df..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical-expected.txt
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html b/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html
deleted file mode 100644
index 51fd169..0000000
--- a/third_party/WebKit/LayoutTests/external/wpt/webvtt/webvtt-api-for-browsers/vttcue-interface/vertical.html
+++ /dev/null

@@ -1,54 +0,0 @@
-<!doctype html>
-<title>VTTCue.vertical</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-setup(function(){
-    window.video = document.createElement('video');
-    window.t1 = video.addTextTrack('subtitles');
-    document.body.appendChild(video);
-});
-test(function(){
-    var video = document.createElement('video');
-    document.body.appendChild(video);
-    var c1 = new VTTCue(0, 1, 'text1');
-    assert_equals(c1.vertical, '');
-    var track = document.createElement('track');
-    var t = track.track;
-    t.addCue(c1);
-    assert_equals(c1.vertical, '');
-    video.appendChild(track);
-    assert_equals(c1.vertical, '');
-    t.mode = 'showing';
-    assert_equals(c1.vertical, '');
-    c1.vertical = 'rl';
-    assert_equals(c1.vertical, 'rl');
-    c1.vertical = 'lr';
-    assert_equals(c1.vertical, 'lr');
-    c1.vertical = 'rl\u0000';
-    assert_equals(c1.vertical, 'lr');
-}, document.title+', script-created cue');
-
-var t_parsed = async_test(document.title+', parsed cue');
-t_parsed.step(function(){
-    var t = document.createElement('track');
-    t.onload = this.step_func(function(){
-        var c1 = t.track.cues[0];
-        var c2 = t.track.cues[1];
-        var c3 = t.track.cues[2];
-        assert_equals(c1.vertical, '');
-        assert_equals(c2.vertical, 'rl');
-        assert_equals(c3.vertical, 'lr');
-        this.done();
-    });
-    t.onerror = this.step_func(function() {
-      assert_unreached('got error event');
-    });
-    t.src = 'data:text/vtt,'+encodeURIComponent('WEBVTT\n\n00:00:00.000 --> 00:00:00.001\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 vertical:rl\ntest\n\n'+
-                                                '00:00:00.000 --> 00:00:00.001 vertical:lr\ntest');
-    t.track.mode = 'showing';
-    video.appendChild(t);
-});
-</script>

diff --git a/third_party/WebKit/LayoutTests/external/wpt_automation/fullscreen/auto-click.js b/third_party/WebKit/LayoutTests/external/wpt_automation/fullscreen/auto-click.js
index 2c4723b..81f66f5 100644
--- a/third_party/WebKit/LayoutTests/external/wpt_automation/fullscreen/auto-click.js
+++ b/third_party/WebKit/LayoutTests/external/wpt_automation/fullscreen/auto-click.js

@@ -1,15 +1,31 @@
 (function() {
 
+// Gets the offset of an element in coordinates relative to the top-level frame.
+function offset(element) {
+  const rect = element.getBoundingClientRect();
+  const iframe = element.ownerDocument.defaultView.frameElement;
+  if (!iframe) {
+    return { left: rect.left, top: rect.top };
+  }
+  const outerOffset = offset(iframe);
+  const style = getComputedStyle(iframe);
+  const get = prop => +/[\d.]*/.exec(style[prop])[0];
+  return {
+    left: outerOffset.left + get('borderLeftWidth') + get('paddingLeft') + rect.left,
+    top: outerOffset.top + get('borderTopWidth') + get('paddingTop') + rect.top
+  };
+}
+
 function click(button) {
-  var rect = button.getBoundingClientRect();
-  eventSender.mouseMoveTo(rect.left, rect.top);
+  const pos = offset(button);
+  eventSender.mouseMoveTo(Math.ceil(pos.left), Math.ceil(pos.top));
   eventSender.mouseDown();
   eventSender.mouseUp();
 }
 
-var observer = new MutationObserver(mutations => {
-  for (var mutation of mutations) {
-    for (var node of mutation.addedNodes) {
+const observer = new MutationObserver(mutations => {
+  for (const mutation of mutations) {
+    for (const node of mutation.addedNodes) {
       if (node.localName == 'button')
         click(node);
       else if (node.localName == 'iframe')
@@ -23,11 +39,14 @@
 }
 
 // Handle what's already in the document.
-for (var button of document.getElementsByTagName('button')) {
+for (const button of document.getElementsByTagName('button')) {
   click(button);
 }
-for (var iframe of document.getElementsByTagName('iframe')) {
+for (const iframe of document.getElementsByTagName('iframe')) {
   observe(iframe.contentDocument);
+  iframe.addEventListener('load', () => {
+    observe(iframe.contentDocument);
+  });
 }
 
 // Observe future changes.

diff --git a/third_party/WebKit/LayoutTests/external/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.txt b/third_party/WebKit/LayoutTests/external/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.txt
new file mode 100644
index 0000000..421376d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/external/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.txt

@@ -0,0 +1 @@
+dummy

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/background-color-image-border-radius-bleed-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/background-color-image-border-radius-bleed-expected.png
index 888e7a83..745c3993 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/background-color-image-border-radius-bleed-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/background-color-image-border-radius-bleed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/background-leakage-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/background-leakage-expected.png
index a5838ea..ebd98151 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/background-leakage-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/background-leakage-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/background-multi-image-border-radius-bleed-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/background-multi-image-border-radius-bleed-expected.png
index 888e7a83..745c3993 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/background-multi-image-border-radius-bleed-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/background-multi-image-border-radius-bleed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/background-svg-scaling-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/background-svg-scaling-expected.png
index 5ab176c..45f80ea 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/background-svg-scaling-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/background-svg-scaling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-2-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-2-expected.png
index c9a4d32e..74945c2 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-2-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-expected.png
index a4c5b1b..3fe4ee99 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-hidpi-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-hidpi-expected.png
index 0cf31e2..665b6ca1 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/gradient-background-leakage-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
index 7f91201..d11a035 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.png
index 07d2d9b..23d2ec74 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed-expected.png
index 7c5b37c..f46d7a51 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/size/contain-and-cover-zoomed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/svg-as-mask-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/svg-as-mask-expected.png
index 2df0d65fc..1a9bf0f 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/svg-as-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/svg-as-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-background-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-background-expected.png
index d542c07..04edbe1 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-background-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-html-background-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-html-background-expected.png
index 4e697eb..3dd6257 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-html-background-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-body-html-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-html-body-background-expected.png b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-html-body-background-expected.png
index 5560e42..6307442 100644
--- a/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-html-body-background-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/backgrounds/transformed-html-body-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-image-rotate-transform-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
index f5af5ab..2a635ecf 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-large-radius-opposite-wide-edge-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-large-radius-opposite-wide-edge-expected.png
index 564962e..f5e3a5f 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-large-radius-opposite-wide-edge-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-large-radius-opposite-wide-edge-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-mixed-alpha-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-mixed-alpha-expected.png
index 0e86637..554d248e 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-mixed-alpha-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-mixed-alpha-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-background-constrained-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-background-constrained-expected.png
index 70c9be67..5dfccda 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-background-constrained-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-background-constrained-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-circle-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-circle-expected.png
index c94aeb5..25e3409 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-circle-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-circle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-double-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-double-expected.png
index dd799f4f..7a406cb 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-double-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-expected.png
index babc96ec..0fc92bd 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-complex-inner-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-double-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-double-expected.png
index 1e7e0d43..64a3c8b41 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-double-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-expected.png
index 0de01ac25..51cacfe 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-different-width-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-01-expected.png
index ac6b3306..a9ab3cea6 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-02-expected.png
index 0330a42..26f2178 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-03-expected.png
index 77fa6d6..333e6ca6 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-groove-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-inset-outset-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-inset-outset-expected.png
index d8bdbc4..5e54cbc 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-inset-outset-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-inset-outset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-valid-border-clipping-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-valid-border-clipping-expected.png
index ef05256e..78ef8a7 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-valid-border-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-valid-border-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-01-expected.png
index f81ac2f..b5ca373 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-02-expected.png
index d534c1c..16b3b4fa 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-03-expected.png
index 8f9cb2fd..bb8f6fc 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-04-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-04-expected.png
index cc55551c..7cf7ff9 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-04-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-05-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-05-expected.png
index 127b349..3f99e44 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-05-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-wide-border-05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-01-expected.png
index 4ea0998..381ba60 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-expected.png
index d93f27f..7ccc9ec3 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-box-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-empty-inner-border-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-empty-inner-border-expected.png
index a6db5d3f..191da205 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-empty-inner-border-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-radius-with-empty-inner-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/border-shadow-large-radius-expected.png b/third_party/WebKit/LayoutTests/fast/borders/border-shadow-large-radius-expected.png
index ca67cf1a..39c0581 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/border-shadow-large-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/border-shadow-large-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusArcs01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusArcs01-expected.png
index 73e8d93..53fb17c 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusArcs01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusArcs01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed01-expected.png
index 07bdbfc..7cacee31 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed02-expected.png
index 9117509..ccf71f8 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed03-expected.png
index 6cceab9..15a820c 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed04-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed04-expected.png
index cea5c067..e8b1ed8 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed04-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed05-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed05-expected.png
index 795c82f..b532901d 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed05-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed06-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed06-expected.png
index 77c205b5..16bc2e3 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed06-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDashed06-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted01-expected.png
index da3c51c..04bb653 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted02-expected.png
index 9a439ae..27a62621 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted03-expected.png
index f832d24..efb5edda 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted04-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted04-expected.png
index 6400c8e..edc0f1c 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted04-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted05-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted05-expected.png
index e6e59eb..7b2eb48 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted05-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted06-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted06-expected.png
index 8d49dabd..a40c1f4 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted06-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDotted06-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble01-expected.png
index 1a0a5fd..380f70f 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble02-expected.png
index 2c54ec6..2936fea 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble03-expected.png
index 17581283..02eef461 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble04-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble04-expected.png
index 0906561..c2159982 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble04-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble05-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble05-expected.png
index 973ea377..8c1bb66 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble05-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble06-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble06-expected.png
index 4345c6c..05ba9e7 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble06-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble06-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble07-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble07-expected.png
index a6ab6de..0abe9407 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble07-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble07-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble08-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble08-expected.png
index d5a33c13..76c9944 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble08-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble08-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble09-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble09-expected.png
index 3b34d8d..07d6e049 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble09-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusDouble09-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove01-expected.png
index 771cf6f..a174e565 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove02-expected.png
index daa6142b..da6f016 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusGroove02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusInset01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusInset01-expected.png
index a9e4e498..a448478b 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusInset01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusInset01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors01-expected.png
index 94eacc2..aa4492e 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors02-expected.png
index 8ec6620..06853759 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusMultiColors02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusOutset01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusOutset01-expected.png
index 298f6af..c6cde41 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusOutset01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusOutset01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusRidge01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusRidge01-expected.png
index f4fbde7..599df39b 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusRidge01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusRidge01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSlope-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSlope-expected.png
index 606d1234..ca83cd2 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSlope-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSlope-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid01-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid01-expected.png
index 0c984d3..f4c99b3 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid01-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid02-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid02-expected.png
index 29c19eea..c0c840a2 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid02-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid03-expected.png b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid03-expected.png
index 93c0551..b860a0a 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid03-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/borderRadiusSolid03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png b/third_party/WebKit/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
index 3dda2bb8..d655f26 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/fieldsetBorderRadius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius-expected.png b/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius-expected.png
index 0c91f31..c274553 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius2-expected.png b/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius2-expected.png
index 3162fb7..cc91853 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius2-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/mixed-border-styles-radius2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/table-borders-expected.png b/third_party/WebKit/LayoutTests/fast/borders/table-borders-expected.png
index 2239a21..c7f2bdd1 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/table-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/table-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/borders/webkit-border-radius-expected.png b/third_party/WebKit/LayoutTests/fast/borders/webkit-border-radius-expected.png
index 05e118e..9d7c7204 100644
--- a/third_party/WebKit/LayoutTests/fast/borders/webkit-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/borders/webkit-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-clipped-slices-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-clipped-slices-expected.png
index 65c8034..47177f4 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-clipped-slices-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-clipped-slices-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.png
index b77c865..60f80462 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/inset-box-shadows-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/inset-box-shadows-expected.png
index 0e6824c..5c75f25 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/inset-box-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/inset-box-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
index cb8de539b..fff2316b 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/inset-with-extraordinary-radii-and-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/shadow-tiling-artifact-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/shadow-tiling-artifact-expected.png
index a5030b5..41147a27 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/shadow-tiling-artifact-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/shadow-tiling-artifact-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/spread-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/spread-expected.png
index 6d9257e..54a2d1b 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/spread-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/spread-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png b/third_party/WebKit/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png
index 76f5229e..d941fbc 100644
--- a/third_party/WebKit/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/box-shadow/spread-multiple-normal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-convertToBlob-exceptions.html b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-convertToBlob-exceptions.html
index 03629b8..8ce169d 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-convertToBlob-exceptions.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas/OffscreenCanvas-convertToBlob-exceptions.html

@@ -33,7 +33,29 @@
         assert_true(e instanceof DOMException);
         assert_equals(e.name, "IndexSizeError");
     }));
-}, "Test that call convertToBlob on a OffscreenCanvas with size 0 throws exception");
+}, "Test that call convertToBlob on an OffscreenCanvas with size 0 throws exception");
+
+async_test(function(t) {
+    var webp_max_dimension = 16383; // Based on WEBPImageEncoder.cpp?l=52
+    var offscreenCanvas = new OffscreenCanvas(10, webp_max_dimension + 1);
+    var ctx = offscreenCanvas.getContext("2d");
+    offscreenCanvas.convertToBlob({type: "image/webp"}).then(t.step_func_done(function() {
+        assert_false("convertToBlob didn't throw, but should be");
+    }), t.step_func_done(function(e) {
+        assert_true(e instanceof DOMException);
+        assert_equals(e.name, "EncodingError");
+    }));
+}, "Test that call convertToBlob throws EncodingError exception when encoding fails");
+
+async_test(function(t) {
+    var offscreenCanvas = new OffscreenCanvas(10, 10);
+    offscreenCanvas.convertToBlob().then(t.step_func_done(function() {
+        assert_false("convertToBlob didn't throw, but should be");
+    }), t.step_func_done(function(e) {
+        assert_true(e instanceof DOMException);
+        assert_equals(e.name, "InvalidStateError");
+    }));
+}, "Test that call convertToBlob on an OffscreenCanvas without contexts throws exception");
 
 </script>
 

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-arc-circumference-fill-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-arc-circumference-fill-expected.png
index a742135..5323902 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-arc-circumference-fill-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-arc-circumference-fill-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-composite-transformclip-expected.png
index 7afd803..71396432 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-composite-transformclip-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-composite-transformclip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-antiAlias-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-antiAlias-expected.png
index f47ed67..a6b7ebd 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-antiAlias-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-antiAlias-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-circumference-fill-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-circumference-fill-expected.png
index 2f53772..5f15f2c 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-circumference-fill-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-circumference-fill-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-connecting-line-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-connecting-line-expected.png
index ab81036..ae541ab 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-connecting-line-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-connecting-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-linear-rgb.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-linear-rgb.html
index 6c97234a..548783c 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-linear-rgb.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-linear-rgb.html

@@ -10,7 +10,7 @@
   var canvas = document.createElement('canvas');
   canvas.width = 10;
   canvas.height = 10;
-  var ctx = canvas.getContext('2d', {colorSpace: 'linear-rgb'})
+  var ctx = canvas.getContext('2d', {colorSpace: 'srgb', pixelFormat: 'float16'})
   ctx.fillStyle = 'rgb(50, 100, 150)';
   ctx.fillRect(0, 0, 10, 10);
   var pixel = ctx.getImageData(5, 5, 1, 1).data;
@@ -26,7 +26,7 @@
   var canvas = document.createElement('canvas');
   canvas.width = 10;
   canvas.height = 10;
-  var ctx = canvas.getContext('2d', {colorSpace: 'linear-rgb'})
+  var ctx = canvas.getContext('2d', {colorSpace: 'srgb', pixelFormat: 'float16'})
   var initialData = ctx.createImageData(1, 1);
   initialData.data[0] = 50;
   initialData.data[1] = 100;
@@ -41,4 +41,4 @@
 }
 
 </script>
-</body>
\ No newline at end of file
+</body>

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec-2020.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec-2020.html
deleted file mode 100644
index b89fd39b..0000000
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec-2020.html
+++ /dev/null

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="../../resources/testharness.js"></script>
-<script src="../../resources/testharnessreport.js"></script>
-<script>
-test(drawThenGetImageData, 'verifies that getImageData works on rec-2020 canvases.');
-test(putThenGetImageData, 'verifies that putImageData works on rec-2020 canvases.');
-
-function drawThenGetImageData() {
-    var canvas = document.createElement('canvas');
-    canvas.width = 10;
-    canvas.height = 10;
-    var ctx = canvas.getContext('2d', {colorSpace: 'rec-2020'})
-    ctx.fillStyle = 'rgb(50, 100, 150)';
-    ctx.fillRect(0, 0, 10, 10);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
-    // Note: the color specified as as fillStyle is converted from srgb to linear
-    // when drawn and the the results of getImageData are re-converted to sRGB
-    assert_equals(pixel[0], 50, "Red component retrieved by getImageData is the color that was drawn." );
-    assert_equals(pixel[1], 100, "Green component retrieved by getImageData is the color that was drawn." );
-    assert_equals(pixel[2], 150, "Blue component retrieved by getImageData is the color that was drawn." );
-    assert_equals(pixel[3], 255, "Alpha component retrieved by getImageData is the color that was drawn." );
-}
-
-function putThenGetImageData() {
-    var canvas = document.createElement('canvas');
-    canvas.width = 10;
-    canvas.height = 10;
-    var ctx = canvas.getContext('2d', {colorSpace: 'rec-2020'})
-    var initialData = ctx.createImageData(1, 1);
-    initialData.data[0] = 50;
-    initialData.data[1] = 100;
-    initialData.data[2] = 150;
-    initialData.data[3] = 255;
-    ctx.putImageData(initialData, 5, 5);
-    var pixel = ctx.getImageData(5, 5, 1, 1).data;
-    assert_equals(pixel[0], 50, "Red component retrieved by getImageData is the color that was put." );
-    assert_equals(pixel[1], 100, "Green component retrieved by getImageData is the color that was put." );
-    assert_equals(pixel[2], 150, "Blue component retrieved by getImageData is the color that was put." );
-    assert_equals(pixel[3], 255, "Alpha component retrieved by getImageData is the color that was put." );
-}
-</script>
-</body>

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec2020.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec2020.html
new file mode 100644
index 0000000..8b6c1b6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-getImageData-rec2020.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<body>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script>
+test(drawThenGetImageData, 'verifies that getImageData works on rec2020 canvases.');
+test(putThenGetImageData, 'verifies that putImageData works on rec2020 canvases.');
+
+function drawThenGetImageData() {
+    var canvas = document.createElement('canvas');
+    canvas.width = 10;
+    canvas.height = 10;
+    var ctx = canvas.getContext('2d', {colorSpace: 'rec2020'})
+    ctx.fillStyle = 'rgb(50, 100, 150)';
+    ctx.fillRect(0, 0, 10, 10);
+    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    // Note: the color specified as as fillStyle is converted from srgb to linear
+    // when drawn and the the results of getImageData are re-converted to sRGB
+    assert_equals(pixel[0], 50, "Red component retrieved by getImageData is the color that was drawn." );
+    assert_equals(pixel[1], 100, "Green component retrieved by getImageData is the color that was drawn." );
+    assert_equals(pixel[2], 150, "Blue component retrieved by getImageData is the color that was drawn." );
+    assert_equals(pixel[3], 255, "Alpha component retrieved by getImageData is the color that was drawn." );
+}
+
+function putThenGetImageData() {
+    var canvas = document.createElement('canvas');
+    canvas.width = 10;
+    canvas.height = 10;
+    var ctx = canvas.getContext('2d', {colorSpace: 'rec2020'})
+    var initialData = ctx.createImageData(1, 1);
+    initialData.data[0] = 50;
+    initialData.data[1] = 100;
+    initialData.data[2] = 150;
+    initialData.data[3] = 255;
+    ctx.putImageData(initialData, 5, 5);
+    var pixel = ctx.getImageData(5, 5, 1, 1).data;
+    assert_equals(pixel[0], 50, "Red component retrieved by getImageData is the color that was put." );
+    assert_equals(pixel[1], 100, "Green component retrieved by getImageData is the color that was put." );
+    assert_equals(pixel[2], 150, "Blue component retrieved by getImageData is the color that was put." );
+    assert_equals(pixel[3], 255, "Alpha component retrieved by getImageData is the color that was put." );
+}
+</script>
+</body>

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
index 723bb23e..fe14df1 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index a1ae22d..ae9a4e7 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-zero-length-lineCap-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/canvas-zero-length-lineCap-expected.png
index 74973f40..31237d6d 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-zero-length-lineCap-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-zero-length-lineCap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/color-space/display_linear-rgb.html b/third_party/WebKit/LayoutTests/fast/canvas/color-space/display_linear-rgb.html
index 6a91d69..16e2cd1 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/color-space/display_linear-rgb.html
+++ b/third_party/WebKit/LayoutTests/fast/canvas/color-space/display_linear-rgb.html

@@ -4,7 +4,7 @@
 <script>
 function main()
 {
-  var ctx = document.getElementById("c").getContext("2d", {colorSpace:'linear-rgb'});
+  var ctx = document.getElementById("c").getContext('2d', {colorSpace: 'srgb', pixelFormat: 'float16'})
   ctx.fillStyle = 'red';
   ctx.fillRect(20,20,50,50);
   ctx.fillStyle = 'green';

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/downsample-quality-expected.png b/third_party/WebKit/LayoutTests/fast/canvas/downsample-quality-expected.png
index 63e7c30..2d2c5c7 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/downsample-quality-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/canvas/downsample-quality-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/css/background-clip-radius-values-expected.png b/third_party/WebKit/LayoutTests/fast/css/background-clip-radius-values-expected.png
index 0adbd58f0..27f2f3a 100644
--- a/third_party/WebKit/LayoutTests/fast/css/background-clip-radius-values-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/css/background-clip-radius-values-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/css/border-radius-non-negative-expected.png b/third_party/WebKit/LayoutTests/fast/css/border-radius-non-negative-expected.png
index 9834783..2bbf75b 100644
--- a/third_party/WebKit/LayoutTests/fast/css/border-radius-non-negative-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/css/border-radius-non-negative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/css/box-shadow-and-border-radius-expected.png b/third_party/WebKit/LayoutTests/fast/css/box-shadow-and-border-radius-expected.png
index f2e796f..9270352 100644
--- a/third_party/WebKit/LayoutTests/fast/css/box-shadow-and-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/css/box-shadow-and-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep-expected.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep-expected.html
new file mode 100644
index 0000000..178745ad
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep-expected.html

@@ -0,0 +1,58 @@
+<style>
+body {
+  margin: 0;
+}
+
+.container {
+  width: 200px;
+  height: 500px;
+  outline: 2px solid black;
+}
+
+.first {
+  position: absolute;
+  height: 500px;
+  width: 200px;
+  background-color: red;
+}
+
+.second {
+  position: absolute;
+  height: 400px;
+  width: 200px;
+  background-color: blue;
+}
+
+.third {
+  position: absolute;
+  height: 300px;
+  width: 200px;
+  background-color: pink;
+}
+
+.fourth {
+  position: absolute;
+  height: 200px;
+  width: 200px;
+  background-color: yellow;
+}
+
+.fifth {
+  position: absolute;
+  height: 100px;
+  width: 200px;
+  background-color: green;
+}
+</style>
+
+<div class="container">
+  <div class="first">
+    <div class="second">
+      <div class="third">
+        <div class="fourth">
+          <div class="fifth"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep.html
new file mode 100644
index 0000000..fc21328c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-deep.html

@@ -0,0 +1,81 @@
+<style>
+body {
+  margin: 0;
+}
+
+.scroller {
+  overflow: hidden; /* hide scrollbars */
+  width: 200px;
+  height: 500px;
+  outline: 2px solid black;
+}
+
+.container {
+  width: 200px;
+  height: 1000px;
+}
+
+.sticky {
+  position: sticky;
+  width: 200px;
+  top: 0;
+}
+
+.first {
+  height: 500px;
+  background: red;
+}
+
+.second {
+  height: 400px;
+  background: green;
+}
+
+.third {
+  height: 300px;
+  background: blue;
+  top: 100px;
+}
+
+.fourth {
+  height: 200px;
+  background: pink;
+  top: 100px;
+}
+
+.fifth {
+  height: 100px;
+  background: yellow;
+}
+</style>
+
+<script>
+if (window.testRunner)
+  testRunner.waitUntilDone();
+
+function finishTest() {
+  document.querySelector('.scroller').scrollTop = 400;
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+
+window.addEventListener('load', function() {
+  requestAnimationFrame(function() {
+    requestAnimationFrame(finishTest);
+  });
+});
+</script>
+
+<div class="scroller">
+  <div class="container">
+    <div class="first sticky">
+      <div class="second sticky">
+        <div class="third sticky">
+          <div class="fourth sticky">
+            <div class="fifth sticky"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline-expected.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline-expected.html
new file mode 100644
index 0000000..904e3a0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline-expected.html

@@ -0,0 +1,27 @@
+<style>
+body {
+  margin: 0;
+}
+
+.container {
+  width: 200px;
+  height: 350px;
+  outline: 2px solid black;
+}
+
+.outerInline {
+  display: inline;
+  position: absolute;
+  top: 0;
+}
+
+.innerInline {
+  display: inline;
+  position: absolute;
+  top: 25px;
+}
+</style>
+
+<div class="container">
+  <div class="outerInline">1<div class="innerInline">2</div></div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline.html
new file mode 100644
index 0000000..c873737
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-inline.html

@@ -0,0 +1,52 @@
+<style>
+body {
+  margin: 0;
+}
+
+.scroller {
+  overflow: hidden; /* hide scrollbars */
+  width: 200px;
+  height: 350px;
+  outline: 2px solid black;
+}
+
+.container {
+  width: 200px;
+  height: 700px;
+}
+
+.outerSticky {
+  display: inline;
+  position: sticky;
+  top: 0;
+}
+
+.innerSticky {
+  display: inline;
+  position: sticky;
+  top: 25px;
+}
+</style>
+
+<script>
+if (window.testRunner)
+  testRunner.waitUntilDone();
+
+function finishTest() {
+  document.querySelector('.scroller').scrollTop = 200;
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+
+window.addEventListener('load', function() {
+  requestAnimationFrame(function() {
+    requestAnimationFrame(finishTest);
+  });
+});
+</script>
+
+<div class="scroller">
+  <div class="container">
+    <div class="outerSticky">1<div class="innerSticky">2</div></div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left-expected.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left-expected.html
new file mode 100644
index 0000000..665106d9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left-expected.html

@@ -0,0 +1,55 @@
+<style>
+body {
+  margin: 0;
+}
+
+.group {
+  position: relative;
+  width: 350px;
+  height: 200px;
+}
+
+.container {
+  width: 350px;
+  height: 180px;
+  outline: 2px solid black;
+}
+
+.outerBox {
+  position: absolute;
+  background-color: green;
+  width: 200px;
+  height: 180px;
+}
+
+.innerBox {
+  position: absolute;
+  background-color: red;
+  width: 100px;
+  height: 180px;
+}
+</style>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="left: 50px;">
+      <div class="innerBox" style="left: 0;"></div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="left: 50px;">
+      <div class="innerBox" style="left: 50px;"></div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="left: 50px;">
+      <div class="innerBox" style="left: 100px;"></div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left.html
new file mode 100644
index 0000000..0ce2e282
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-left.html

@@ -0,0 +1,88 @@
+<style>
+body {
+  margin: 0;
+}
+
+.group {
+  position: relative;
+  width: 350px;
+  height: 200px;
+}
+
+.scroller {
+  overflow: hidden; /* hide scrollbars */
+  width: 350px;
+  height: 180px;
+  outline: 2px solid black;
+}
+
+.container {
+  width: 700px;
+  height: 180px;
+}
+
+.outerSticky {
+  display: inline-block;
+  position: sticky;
+  background-color: green;
+  width: 200px;
+  height: 180px;
+}
+
+.innerSticky {
+  display: inline-block;
+  position: sticky;
+  background-color: red;
+  width: 100px;
+  height: 180px;
+}
+</style>
+
+<script>
+if (window.testRunner)
+  testRunner.waitUntilDone();
+
+function finishTest() {
+  for (const scroller of document.querySelectorAll('.scroller')) {
+    scroller.scrollLeft = 200;
+  }
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+
+window.addEventListener('load', function() {
+  requestAnimationFrame(function() {
+    requestAnimationFrame(finishTest);
+  });
+});
+</script>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="left: 50px;">
+        <div class="innerSticky" style="left: 50px;"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="left: 50px;">
+        <div class="innerSticky" style="left: 100px;"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="left: 50px;">
+        <div class="innerSticky" style="left: 300px;"></div>
+      </div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table-expected.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table-expected.html
new file mode 100644
index 0000000..fae12b3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table-expected.html

@@ -0,0 +1,50 @@
+<style>
+body {
+  margin: 0;
+}
+
+table {
+  background: red;
+  border-collapse: collapse;
+}
+
+td, th {
+  height: 50px;
+  width: 50px;
+  padding: 0;
+}
+
+th {
+  position: absolute;
+  top: 25px;
+  background: green;
+}
+
+.container {
+  overflow: hidden;
+  width: 100px;
+  height: 200px;
+  outline: 2px solid black;
+}
+</style>
+
+<div class="container">
+  <table>
+    <thead class="sticky">
+      <tr class="sticky">
+        <th class="sticky"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+    </tbody>
+  </table>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table.html
new file mode 100644
index 0000000..6c926db6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-table.html

@@ -0,0 +1,70 @@
+<style>
+body {
+  margin: 0;
+}
+
+table {
+  background: red;
+  border-collapse: collapse;
+}
+
+td, th {
+  height: 50px;
+  width: 50px;
+  padding: 0;
+}
+
+th {
+  background: green;
+}
+
+.scroller {
+  overflow: hidden; /* hide scrollbars */
+  width: 100px;
+  height: 200px;
+  outline: 2px solid black;
+}
+
+.sticky {
+  position: sticky;
+  top: 25px;
+}
+</style>
+
+<script>
+if (window.testRunner)
+  testRunner.waitUntilDone();
+
+function finishTest() {
+  document.querySelector('.scroller').scrollTop = 200;
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+
+window.addEventListener('load', function() {
+  requestAnimationFrame(function() {
+    requestAnimationFrame(finishTest);
+  });
+});
+</script>
+
+<div class="scroller">
+  <table>
+    <thead class="sticky">
+      <tr class="sticky">
+        <th class="sticky"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+      <tr><td></td></tr>
+    </tbody>
+  </table>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top-expected.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top-expected.html
new file mode 100644
index 0000000..9095044
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top-expected.html

@@ -0,0 +1,56 @@
+<style>
+body {
+  margin: 0;
+}
+
+.group {
+  display: inline-block;
+  position: relative;
+  width: 250px;
+  height: 350px;
+}
+
+.container {
+  width: 200px;
+  height: 350px;
+  outline: 2px solid black;
+}
+
+.outerBox {
+  position: absolute;
+  background-color: green;
+  width: 200px;
+  height: 200px;
+}
+
+.innerBox {
+  position: absolute;
+  background-color: red;
+  width: 200px;
+  height: 100px;
+}
+</style>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="top: 50px;">
+      <div class="innerBox" style="top: 0;"></div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="top: 50px;">
+      <div class="innerBox" style="top: 50px;"></div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="container">
+    <div class="outerBox" style="top: 50px;">
+      <div class="innerBox" style="top: 100px;"></div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top.html b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top.html
new file mode 100644
index 0000000..324f402
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/css/sticky/nested/sticky-nested-top.html

@@ -0,0 +1,87 @@
+<style>
+body {
+  margin: 0;
+}
+
+.group {
+  display: inline-block;
+  position: relative;
+  width: 250px;
+  height: 350px;
+}
+
+.scroller {
+  overflow: hidden; /* hide scrollbars */
+  width: 200px;
+  height: 350px;
+  outline: 2px solid black;
+}
+
+.container {
+  width: 200px;
+  height: 700px;
+}
+
+.outerSticky {
+  position: sticky;
+  background-color: green;
+  width: 200px;
+  height: 200px;
+}
+
+.innerSticky {
+  position: sticky;
+  background-color: red;
+  width: 200px;
+  height: 100px;
+}
+</style>
+
+<script>
+if (window.testRunner)
+  testRunner.waitUntilDone();
+
+function finishTest() {
+  for (const scroller of document.querySelectorAll('.scroller')) {
+    scroller.scrollTop = 200;
+  }
+  if (window.testRunner)
+    testRunner.notifyDone();
+}
+
+window.addEventListener('load', function() {
+  requestAnimationFrame(function() {
+    requestAnimationFrame(finishTest);
+  });
+});
+</script>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="top: 50px;">
+        <div class="innerSticky" style="top: 50px;"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="top: 50px;">
+        <div class="innerSticky" style="top: 100px;"></div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="group">
+  <div class="scroller">
+    <div class="container">
+      <div class="outerSticky" style="top: 50px;">
+        <div class="innerSticky" style="top: 300px;"></div>
+      </div>
+    </div>
+  </div>
+</div>

diff --git a/third_party/WebKit/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png b/third_party/WebKit/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
index 9ae932e3..69585ec5 100644
--- a/third_party/WebKit/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png b/third_party/WebKit/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png
index b35fde1..12354f09 100644
--- a/third_party/WebKit/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/dynamic/first-letter-after-list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-rotate-expected.png b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-rotate-expected.png
index ec1b5d6..c9a2f89 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-rotate-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-rotate-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-skew-expected.png b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-skew-expected.png
index 54fe0fe..997a4d7 100644
--- a/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-skew-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/frames/frame-set-scaling-skew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/gradients/background-clipped-expected.png b/third_party/WebKit/LayoutTests/fast/gradients/background-clipped-expected.png
index 35e371b..d927f86d 100644
--- a/third_party/WebKit/LayoutTests/fast/gradients/background-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/gradients/background-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/lists/inline-before-content-after-list-marker-expected.png b/third_party/WebKit/LayoutTests/fast/lists/inline-before-content-after-list-marker-expected.png
index 7014a39..2b29f147 100644
--- a/third_party/WebKit/LayoutTests/fast/lists/inline-before-content-after-list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/lists/inline-before-content-after-list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/lists/list-marker-before-content-table-expected.png b/third_party/WebKit/LayoutTests/fast/lists/list-marker-before-content-table-expected.png
index 2a3bfdc..20abdb0b 100644
--- a/third_party/WebKit/LayoutTests/fast/lists/list-marker-before-content-table-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/lists/list-marker-before-content-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/replaced/border-radius-clip-content-edge-expected.png b/third_party/WebKit/LayoutTests/fast/replaced/border-radius-clip-content-edge-expected.png
index 4014ef3..357e19c 100644
--- a/third_party/WebKit/LayoutTests/fast/replaced/border-radius-clip-content-edge-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/replaced/border-radius-clip-content-edge-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/table/border-radius-with-image-expected.png b/third_party/WebKit/LayoutTests/fast/table/border-radius-with-image-expected.png
index 1604bc0..915d73c 100644
--- a/third_party/WebKit/LayoutTests/fast/table/border-radius-with-image-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/table/border-radius-with-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/table/giantRowspan-expected.png b/third_party/WebKit/LayoutTests/fast/table/giantRowspan-expected.png
index ffdec2e..7c257e4 100644
--- a/third_party/WebKit/LayoutTests/fast/table/giantRowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/table/giantRowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/fast/table/table-with-border-radius-expected.png b/third_party/WebKit/LayoutTests/fast/table/table-with-border-radius-expected.png
index 16910c9..b2b53a6 100644
--- a/third_party/WebKit/LayoutTests/fast/table/table-with-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/fast/table/table-with-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html b/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html
index 24ae30ed..6e41671 100644
--- a/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html
+++ b/third_party/WebKit/LayoutTests/http/tests/background_sync/oneshot.html

@@ -9,10 +9,10 @@
 <script>
 
 promise_test(function(t) {
-  var url = 'resources/empty_worker.js';
-  var scope = 'resources/scope/background_sync/oneshot.html';
+  const url = 'resources/empty_worker.js';
+  const iframe_scope = 'oneshot.html';
+  const scope = 'resources/scope/background_sync/' + iframe_scope;
   var sync_manager;
-  var sync_registration;
 
   // This test verifies that registration of one-shots fails from an iframe.
   return PermissionsHelper.setPermission('background-sync', 'granted')
@@ -27,7 +27,7 @@
       })
     .then(function(frame) {
         var w = frame.contentWindow;
-        return w.navigator.serviceWorker.getRegistration(scope);
+        return w.navigator.serviceWorker.getRegistration(iframe_scope);
       })
     .then(function(sw_registration_frame) {
         sync_manager = sw_registration_frame.sync;
@@ -45,10 +45,9 @@
      'from an iframe');
 
 promise_test(function(t) {
-  var url = 'resources/empty_worker.js';
-  var scope = 'resources/scope/background_sync/oneshot-uncontrolled.html';
+  const url = 'resources/empty_worker.js';
+  const scope = 'resources/scope/background_sync/oneshot-uncontrolled.html';
   var sync_manager;
-  var sync_registration;
 
   // This test verifies that one-shot syncs can be registered from uncontrolled
   // documents.

diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js
index 917c5c3..5a3bd9b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js

@@ -451,9 +451,10 @@
     }
 }
 
+InspectorTest._mockTargetId = 1;
 InspectorTest.createMockTarget = function(name, capabilities, dontAttachToMain)
 {
-    return SDK.targetManager.createTarget(name, capabilities || SDK.Target.Capability.AllForTests, params => new SDK.StubConnection(params), dontAttachToMain ? null : InspectorTest.mainTarget);
+    return SDK.targetManager.createTarget('mock-target-' + InspectorTest._mockTargetId++, name, capabilities || SDK.Target.Capability.AllForTests, params => new SDK.StubConnection(params), dontAttachToMain ? null : InspectorTest.mainTarget);
 }
 
 InspectorTest.assertGreaterOrEqual = function(a, b, message)

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt
index e8d3a95f..88ed3b3fd 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt

@@ -1,27 +1,9 @@
-CONSOLE MESSAGE: line 20: Interfaces in Service Worker - no origin trial
-interface ForeignFetchEvent
-    getter origin
-    getter request
-    method constructor
-    method respondWith
-interface InstallEvent
-    method registerForeignFetch
-global object
-    getter onforeignfetch
-    setter onforeignfetch
-CONSOLE MESSAGE: line 32: Interfaces in Service Worker - origin trial enabled.
-interface ForeignFetchEvent
-    getter origin
-    getter request
-    method constructor
-    method respondWith
-interface InstallEvent
-    method registerForeignFetch
-global object
-    getter onforeignfetch
-    setter onforeignfetch
 This is a testharness.js-based test.
 PASS ForeignFetch related interfaces in SW - no origin trial. 
 PASS ForeignFetch related interfaces in SW - origin trial enabled. 
+FAIL ForeignFetch related properties on interfaces in service worker, without trial. assert_equals: Property registerForeignFetch exists on InstallEvent expected false but got true
+FAIL ForeignFetch related interfaces in service worker, without trial. assert_equals: Interface ForeignFetchEvent exists on provided object expected false but got true
+PASS ForeignFetch related properties on interfaces in service worker, with trial enabled. 
+PASS ForeignFetch related interfaces in service worker, with trial enabled. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces.html
index 99d160f..5db6896 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces.html

@@ -10,28 +10,11 @@
 <script src="../../resources/origin-trials-helper.js"></script>
 <script src="../../serviceworker/resources/test-helpers.js"></script>
 <script>
-promise_test(t => {
-    var script =
-        './resources/foreignfetch-origin-trial-interfaces-worker.php';
-    var scope =
-        './resources/foreignfetch-origin-trial-interfaces-scope-disabled';
-    return OriginTrialsHelper.check_interfaces_in_sw(t, script, scope)
-      .then(message => {
-        console.log('Interfaces in Service Worker - no origin trial\n' + message);
-      });
-  }, "ForeignFetch related interfaces in SW - no origin trial.");
+service_worker_test(
+  'resources/foreignfetch-origin-trial-interfaces-worker-disabled.js',
+  'ForeignFetch related interfaces in SW - no origin trial.');
 
-promise_test(t => {
-    var script =
-        './resources/foreignfetch-origin-trial-interfaces-worker.php?' +
-        'origintrial=true';
-    var scope =
-        './resources/foreignfetch-origin-trial-interfaces-scope-enabled';
-    return OriginTrialsHelper.check_interfaces_in_sw(t, script, scope)
-      .then(message => {
-        console.log('Interfaces in Service Worker - origin trial enabled.\n' +
-                    message);
-      });
-  }, "ForeignFetch related interfaces in SW - origin trial enabled.");
-
+service_worker_test(
+  'resources/foreignfetch-origin-trial-interfaces-worker-enabled.php',
+  'ForeignFetch related interfaces in SW - origin trial enabled.');
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt
deleted file mode 100644
index 7becb254..0000000
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,35 +0,0 @@
-CONSOLE MESSAGE: line 17: Interfaces in document
-interface ImageCapture
-    getter videoStreamTrack
-    method constructor
-    method getPhotoCapabilities
-    method grabFrame
-    method setOptions
-    method takePhoto
-interface MediaSettingsRange
-    getter current
-    getter max
-    getter min
-    getter step
-    method constructor
-interface PhotoCapabilities
-    getter brightness
-    getter colorTemperature
-    getter contrast
-    getter exposureCompensation
-    getter exposureMode
-    getter fillLightMode
-    getter focusMode
-    getter imageHeight
-    getter imageWidth
-    getter iso
-    getter redEyeReduction
-    getter saturation
-    getter sharpness
-    getter whiteBalanceMode
-    getter zoom
-    method constructor
-This is a testharness.js-based test.
-PASS ImageCapture related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt
index b8ce664..2ae8be4 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt

@@ -1,67 +1,5 @@
-CONSOLE MESSAGE: line 17: Interfaces before adding trial token
-interface ImageCapture
-    getter videoStreamTrack
-    method constructor
-    method getPhotoCapabilities
-    method grabFrame
-    method setOptions
-    method takePhoto
-interface MediaSettingsRange
-    getter current
-    getter max
-    getter min
-    getter step
-    method constructor
-interface PhotoCapabilities
-    getter brightness
-    getter colorTemperature
-    getter contrast
-    getter exposureCompensation
-    getter exposureMode
-    getter fillLightMode
-    getter focusMode
-    getter imageHeight
-    getter imageWidth
-    getter iso
-    getter redEyeReduction
-    getter saturation
-    getter sharpness
-    getter whiteBalanceMode
-    getter zoom
-    method constructor
-CONSOLE MESSAGE: line 27: Interfaces after adding trial token
-interface ImageCapture
-    getter videoStreamTrack
-    method constructor
-    method getPhotoCapabilities
-    method grabFrame
-    method setOptions
-    method takePhoto
-interface MediaSettingsRange
-    getter current
-    getter max
-    getter min
-    getter step
-    method constructor
-interface PhotoCapabilities
-    getter brightness
-    getter colorTemperature
-    getter contrast
-    getter exposureCompensation
-    getter exposureMode
-    getter fillLightMode
-    getter focusMode
-    getter imageHeight
-    getter imageWidth
-    getter iso
-    getter redEyeReduction
-    getter saturation
-    getter sharpness
-    getter whiteBalanceMode
-    getter zoom
-    method constructor
 This is a testharness.js-based test.
-PASS ImageCapture related interfaces before adding trial token via script. 
+FAIL ImageCapture related interfaces before adding trial token via script. assert_equals: Interface ImageCapture exists on provided object expected false but got true
 PASS ImageCapture related interfaces after adding trial token via script. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added.html
index ff7144d1..9c47344 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added.html

@@ -9,21 +9,15 @@
 // generate_token.py  http://127.0.0.1:8000 ImageCapture --expire-timestamp=2000000000
 var token = "AgnhzY0dhvMKsSPYNWHltCxTsLpVFzM/H0rZdpY4DeVo7ry4xm8VLRJU5aVLy+wSgnUa34pTTR017JFu4qnUAQwAAABUeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiSW1hZ2VDYXB0dXJlIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9";
 
+let interfaces_to_check = ['ImageCapture','MediaSettingsRange','PhotoCapabilities'];
+
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['ImageCapture',
-                                                    'MediaSettingsRange',
-                                                    'PhotoCapabilities']);
-  console.log('Interfaces before adding trial token\n' + interfaces);
+  OriginTrialsHelper.check_interfaces_missing(this, interfaces_to_check);
 }, "ImageCapture related interfaces before adding trial token via script.");
 
 OriginTrialsHelper.add_token(token);
 
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['ImageCapture',
-                                                    'MediaSettingsRange',
-                                                    'PhotoCapabilities']);
-  console.log('Interfaces after adding trial token\n' + interfaces);
+  OriginTrialsHelper.check_interfaces(this, interfaces_to_check);
 }, "ImageCapture related interfaces after adding trial token via script.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces.html
index 4f8206f..dad2b4d 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces.html

@@ -10,10 +10,9 @@
 <script src="../../resources/origin-trials-helper.js"></script>
 <script>
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['ImageCapture',
-                                                    'MediaSettingsRange',
-                                                    'PhotoCapabilities']);
-  console.log('Interfaces in document\n' + interfaces);
+  OriginTrialsHelper.check_interfaces(this,
+    ['ImageCapture',
+     'MediaSettingsRange',
+     'PhotoCapabilities']);
 }, "ImageCapture related interfaces in Origin-Trial enabled document.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-disabled.js b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-disabled.js
new file mode 100644
index 0000000..fac292b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-disabled.js

@@ -0,0 +1,13 @@
+importScripts('../../../resources/testharness.js');
+importScripts('../../../resources/origin-trials-helper.js');
+
+test(t => {
+  OriginTrialsHelper.check_properties_missing(this,
+    {'InstallEvent':['registerForeignFetch'],
+     'global':['onforeignfetch']});
+}, 'ForeignFetch related properties on interfaces in service worker, without trial.');
+
+test(t => {
+  OriginTrialsHelper.check_interfaces_missing(this,
+    ['ForeignFetchEvent']);
+}, 'ForeignFetch related interfaces in service worker, without trial.');

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-enabled.php b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-enabled.php
new file mode 100644
index 0000000..8b1a3fe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/resources/foreignfetch-origin-trial-interfaces-worker-enabled.php

@@ -0,0 +1,19 @@
+<?php
+// Generate token with the command:
+// generate_token.py  http://127.0.0.1:8000 ForeignFetch -expire-timestamp=2000000000
+header("Origin-Trial: AinuK1QNcHGJANXfN0Pzkvpxm8rocd4kcqQqhp7rBN8PEX/1JicCoDXX3fIhk7iwBOCCOQYR0cvZ8XHTLJJfVw0AAABUeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiRm9yZWlnbkZldGNoIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9");
+header('Content-Type: application/javascript');
+?>
+importScripts('../../../resources/testharness.js');
+importScripts('../../../resources/origin-trials-helper.js');
+
+test(t => {
+  OriginTrialsHelper.check_properties(this,
+    {'InstallEvent':['registerForeignFetch'],
+     'global':['onforeignfetch']});
+}, 'ForeignFetch related properties on interfaces in service worker, with trial enabled.');
+
+test(t => {
+  OriginTrialsHelper.check_interfaces(this,
+    ['ForeignFetchEvent']);
+}, 'ForeignFetch related interfaces in service worker, with trial enabled.');

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt
deleted file mode 100644
index f3af481..0000000
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,8 +0,0 @@
-CONSOLE MESSAGE: line 16: Interfaces in document
-interface Document
-    getter rootScroller
-    setter rootScroller
-This is a testharness.js-based test.
-PASS RootScroller related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt
index 769bc9b..10ea9fd9 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt

@@ -1,13 +1,5 @@
-CONSOLE MESSAGE: line 16: Interfaces before adding trial token
-interface Document
-    getter rootScroller
-    setter rootScroller
-CONSOLE MESSAGE: line 25: Interfaces after adding trial token
-interface Document
-    getter rootScroller
-    setter rootScroller
 This is a testharness.js-based test.
-PASS RootScroller related interfaces before adding trial token via script. 
-PASS RootScroller related interfaces after adding trial token via script. 
+FAIL RootScroller related properties on interfaces before adding trial token via script. assert_equals: Property rootScroller exists on Document expected false but got true
+PASS RootScroller related properties on interfaces after adding trial token via script. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added.html
index 138fc11..07128af 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added.html

@@ -9,19 +9,15 @@
 // generate_token.py  http://127.0.0.1:8000 RootScroller --expire-timestamp=2000000000
 var token = "AuKypT9HyT7fv0cU54WMd1bUmdBYTFED3hKRFWfvxauV8saEM1CoOFLXDd3ApWwJCvimlrGVcqj+0Z9rJL8uFgIAAABUeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiUm9vdFNjcm9sbGVyIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9";
 
+let properties_to_check = {'Document': ['rootScroller']};
+
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['Document'],
-                                             {'Document':'rootScroller'});
-  console.log('Interfaces before adding trial token\n' + interfaces);
-}, "RootScroller related interfaces before adding trial token via script.");
+  OriginTrialsHelper.check_properties_missing(this, properties_to_check);
+}, "RootScroller related properties on interfaces before adding trial token via script.");
 
 OriginTrialsHelper.add_token(token);
 
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['Document'],
-                                             {'Document':'rootScroller'});
-  console.log('Interfaces after adding trial token\n' + interfaces);
-}, "RootScroller related interfaces after adding trial token via script.");
+  OriginTrialsHelper.check_properties(this, properties_to_check);
+}, "RootScroller related properties on interfaces after adding trial token via script.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces.html
index 9bd78df9..d03df0b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces.html

@@ -10,9 +10,6 @@
 <script src="../../resources/origin-trials-helper.js"></script>
 <script>
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this, ['Document'],
-                                             {'Document':'rootScroller'});
-  console.log('Interfaces in document\n' + interfaces);
-}, "RootScroller related interfaces in Origin-Trial enabled document.");
+  OriginTrialsHelper.check_properties(this, {'Document': ['rootScroller']});
+}, "RootScroller related properties on interfaces in Origin-Trial enabled document.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt
deleted file mode 100644
index 61830f9..0000000
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,91 +0,0 @@
-CONSOLE MESSAGE: line 33: Interfaces in document
-interface Navigator
-    getter usb
-interface USBAlternateInterface
-    getter alternateSetting
-    getter endpoints
-    getter interfaceClass
-    getter interfaceName
-    getter interfaceProtocol
-    getter interfaceSubclass
-    method constructor
-interface USBConfiguration
-    getter configurationName
-    getter configurationValue
-    getter interfaces
-    method constructor
-interface USBConnectionEvent
-    getter device
-    method constructor
-interface USBDevice
-    getter configuration
-    getter configurations
-    getter deviceClass
-    getter deviceProtocol
-    getter deviceSubclass
-    getter deviceVersionMajor
-    getter deviceVersionMinor
-    getter deviceVersionSubminor
-    getter manufacturerName
-    getter opened
-    getter productId
-    getter productName
-    getter serialNumber
-    getter usbVersionMajor
-    getter usbVersionMinor
-    getter usbVersionSubminor
-    getter vendorId
-    method claimInterface
-    method clearHalt
-    method close
-    method constructor
-    method controlTransferIn
-    method controlTransferOut
-    method isochronousTransferIn
-    method isochronousTransferOut
-    method open
-    method releaseInterface
-    method reset
-    method selectAlternateInterface
-    method selectConfiguration
-    method transferIn
-    method transferOut
-interface USBEndpoint
-    getter direction
-    getter endpointNumber
-    getter packetSize
-    getter type
-    method constructor
-interface USBInTransferResult
-    getter data
-    getter status
-    method constructor
-interface USBInterface
-    getter alternate
-    getter alternates
-    getter claimed
-    getter interfaceNumber
-    method constructor
-interface USBIsochronousInTransferPacket
-    getter data
-    getter status
-    method constructor
-interface USBIsochronousInTransferResult
-    getter data
-    getter packets
-    method constructor
-interface USBIsochronousOutTransferPacket
-    getter bytesWritten
-    getter status
-    method constructor
-interface USBIsochronousOutTransferResult
-    getter packets
-    method constructor
-interface USBOutTransferResult
-    getter bytesWritten
-    getter status
-    method constructor
-This is a testharness.js-based test.
-PASS WebUSB related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt
index 6525f18..b44b78e 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt

@@ -1,179 +1,7 @@
-CONSOLE MESSAGE: line 31: Interfaces before adding trial token
-interface Navigator
-    getter usb
-interface USBAlternateInterface
-    getter alternateSetting
-    getter endpoints
-    getter interfaceClass
-    getter interfaceName
-    getter interfaceProtocol
-    getter interfaceSubclass
-    method constructor
-interface USBConfiguration
-    getter configurationName
-    getter configurationValue
-    getter interfaces
-    method constructor
-interface USBConnectionEvent
-    getter device
-    method constructor
-interface USBDevice
-    getter configuration
-    getter configurations
-    getter deviceClass
-    getter deviceProtocol
-    getter deviceSubclass
-    getter deviceVersionMajor
-    getter deviceVersionMinor
-    getter deviceVersionSubminor
-    getter manufacturerName
-    getter opened
-    getter productId
-    getter productName
-    getter serialNumber
-    getter usbVersionMajor
-    getter usbVersionMinor
-    getter usbVersionSubminor
-    getter vendorId
-    method claimInterface
-    method clearHalt
-    method close
-    method constructor
-    method controlTransferIn
-    method controlTransferOut
-    method isochronousTransferIn
-    method isochronousTransferOut
-    method open
-    method releaseInterface
-    method reset
-    method selectAlternateInterface
-    method selectConfiguration
-    method transferIn
-    method transferOut
-interface USBEndpoint
-    getter direction
-    getter endpointNumber
-    getter packetSize
-    getter type
-    method constructor
-interface USBInTransferResult
-    getter data
-    getter status
-    method constructor
-interface USBInterface
-    getter alternate
-    getter alternates
-    getter claimed
-    getter interfaceNumber
-    method constructor
-interface USBIsochronousInTransferPacket
-    getter data
-    getter status
-    method constructor
-interface USBIsochronousInTransferResult
-    getter data
-    getter packets
-    method constructor
-interface USBIsochronousOutTransferPacket
-    getter bytesWritten
-    getter status
-    method constructor
-interface USBIsochronousOutTransferResult
-    getter packets
-    method constructor
-interface USBOutTransferResult
-    getter bytesWritten
-    getter status
-    method constructor
-CONSOLE MESSAGE: line 53: Interfaces after adding trial token
-interface Navigator
-    getter usb
-interface USBAlternateInterface
-    getter alternateSetting
-    getter endpoints
-    getter interfaceClass
-    getter interfaceName
-    getter interfaceProtocol
-    getter interfaceSubclass
-    method constructor
-interface USBConfiguration
-    getter configurationName
-    getter configurationValue
-    getter interfaces
-    method constructor
-interface USBConnectionEvent
-    getter device
-    method constructor
-interface USBDevice
-    getter configuration
-    getter configurations
-    getter deviceClass
-    getter deviceProtocol
-    getter deviceSubclass
-    getter deviceVersionMajor
-    getter deviceVersionMinor
-    getter deviceVersionSubminor
-    getter manufacturerName
-    getter opened
-    getter productId
-    getter productName
-    getter serialNumber
-    getter usbVersionMajor
-    getter usbVersionMinor
-    getter usbVersionSubminor
-    getter vendorId
-    method claimInterface
-    method clearHalt
-    method close
-    method constructor
-    method controlTransferIn
-    method controlTransferOut
-    method isochronousTransferIn
-    method isochronousTransferOut
-    method open
-    method releaseInterface
-    method reset
-    method selectAlternateInterface
-    method selectConfiguration
-    method transferIn
-    method transferOut
-interface USBEndpoint
-    getter direction
-    getter endpointNumber
-    getter packetSize
-    getter type
-    method constructor
-interface USBInTransferResult
-    getter data
-    getter status
-    method constructor
-interface USBInterface
-    getter alternate
-    getter alternates
-    getter claimed
-    getter interfaceNumber
-    method constructor
-interface USBIsochronousInTransferPacket
-    getter data
-    getter status
-    method constructor
-interface USBIsochronousInTransferResult
-    getter data
-    getter packets
-    method constructor
-interface USBIsochronousOutTransferPacket
-    getter bytesWritten
-    getter status
-    method constructor
-interface USBIsochronousOutTransferResult
-    getter packets
-    method constructor
-interface USBOutTransferResult
-    getter bytesWritten
-    getter status
-    method constructor
 This is a testharness.js-based test.
-PASS WebUSB related interfaces before adding trial token via script. 
+FAIL WebUSB related properties on interfaces before adding trial token via script. assert_equals: Property usb exists on Navigator expected false but got true
+FAIL WebUSB related interfaces before adding trial token via script. assert_equals: Interface USBAlternateInterface exists on provided object expected false but got true
+PASS WebUSB related properties on interfaces after adding trial token via script. 
 PASS WebUSB related interfaces after adding trial token via script. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added.html
index eae80f42..d069555 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added.html

@@ -6,50 +6,38 @@
 <script src="../../resources/origin-trials-helper.js"></script>
 <script>
 // Generate token with the command:
-// generate_token.py  http://127.0.0.1:8000 WebUSB --expire-timestamp=2000000000
-var old_trial_token = "Ak+Acw9/y+acA5hzmO0vOifI2G0n6g1+CiHBlyMOjjspFsPlTfvvI0nQBLCUlDkXkMQzSXzB97JmRaNNjpSyVQ0AAABOeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViVVNCIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9";
 // generate_token.py  http://127.0.0.1:8000 WebUSB2 --expire-timestamp=2000000000
-var token = "AmgWWAL+v07ElzPwp9oXvY1ldvKTbMlEUFopboMutESil7WUfQNVdYFUzfai6GRq5MndTa+ln+w1gLlRw8VshwAAAABPeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViVVNCMiIsICJleHBpcnkiOiAyMDAwMDAwMDAwfQ==";
+let token = "AmgWWAL+v07ElzPwp9oXvY1ldvKTbMlEUFopboMutESil7WUfQNVdYFUzfai6GRq5MndTa+ln+w1gLlRw8VshwAAAABPeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViVVNCMiIsICJleHBpcnkiOiAyMDAwMDAwMDAwfQ==";
+
+let properties_to_check = {'Navigator': ['usb']};
+let interfaces_to_check = ['USBAlternateInterface',
+    'USBConfiguration',
+    'USBConnectionEvent',
+    'USBDevice',
+    'USBEndpoint',
+    'USBInTransferResult',
+    'USBInterface',
+    'USBIsochronousInTransferPacket',
+    'USBIsochronousInTransferResult',
+    'USBIsochronousOutTransferPacket',
+    'USBIsochronousOutTransferResult',
+    'USBOutTransferResult'];
 
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this,
-        ['Navigator',
-         'USBAlternateInterface',
-         'USBConfiguration',
-         'USBConnectionEvent',
-         'USBDevice',
-         'USBEndpoint',
-         'USBInTransferResult',
-         'USBInterface',
-         'USBIsochronousInTransferPacket',
-         'USBIsochronousInTransferResult',
-         'USBIsochronousOutTransferPacket',
-         'USBIsochronousOutTransferResult',
-         'USBOutTransferResult'],
-        {'Navigator': ['usb']});
-  console.log('Interfaces before adding trial token\n' + interfaces);
+  OriginTrialsHelper.check_properties_missing(this, properties_to_check);
+}, "WebUSB related properties on interfaces before adding trial token via script.");
+
+test(t => {
+  OriginTrialsHelper.check_interfaces_missing(this, interfaces_to_check);
 }, "WebUSB related interfaces before adding trial token via script.");
 
 OriginTrialsHelper.add_token(token);
 
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this,
-        ['Navigator',
-         'USBAlternateInterface',
-         'USBConfiguration',
-         'USBConnectionEvent',
-         'USBDevice',
-         'USBEndpoint',
-         'USBInTransferResult',
-         'USBInterface',
-         'USBIsochronousInTransferPacket',
-         'USBIsochronousInTransferResult',
-         'USBIsochronousOutTransferPacket',
-         'USBIsochronousOutTransferResult',
-         'USBOutTransferResult'],
-        {'Navigator': ['usb']});
-  console.log('Interfaces after adding trial token\n' + interfaces);
+  OriginTrialsHelper.check_properties(this, properties_to_check);
+}, "WebUSB related properties on interfaces after adding trial token via script.");
+
+test(t => {
+  OriginTrialsHelper.check_interfaces(this, interfaces_to_check);
 }, "WebUSB related interfaces after adding trial token via script.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces.html b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces.html
index ba7bd5e..68a9358b 100644
--- a/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces.html
+++ b/third_party/WebKit/LayoutTests/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces.html

@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
 <!-- Generate token with the command:
-generate_token.py  http://127.0.0.1:8000 WebUSB --expire-timestamp=2000000000
--->
-<meta http-equiv="origin-trial" content="Ak+Acw9/y+acA5hzmO0vOifI2G0n6g1+CiHBlyMOjjspFsPlTfvvI0nQBLCUlDkXkMQzSXzB97JmRaNNjpSyVQ0AAABOeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViVVNCIiwgImV4cGlyeSI6IDIwMDAwMDAwMDB9" />
-<!-- Generate token with the command:
 generate_token.py  http://127.0.0.1:8000 WebUSB2 --expire-timestamp=2000000000
 -->
 <meta http-equiv="origin-trial" content="AmgWWAL+v07ElzPwp9oXvY1ldvKTbMlEUFopboMutESil7WUfQNVdYFUzfai6GRq5MndTa+ln+w1gLlRw8VshwAAAABPeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiV2ViVVNCMiIsICJleHBpcnkiOiAyMDAwMDAwMDAwfQ==" />
@@ -14,22 +10,22 @@
 <script src="../../resources/origin-trials-helper.js"></script>
 <script>
 test(t => {
-  var interfaces =
-      OriginTrialsHelper.get_interface_names(this,
-        ['Navigator',
-         'USBAlternateInterface',
-         'USBConfiguration',
-         'USBConnectionEvent',
-         'USBDevice',
-         'USBEndpoint',
-         'USBInTransferResult',
-         'USBInterface',
-         'USBIsochronousInTransferPacket',
-         'USBIsochronousInTransferResult',
-         'USBIsochronousOutTransferPacket',
-         'USBIsochronousOutTransferResult',
-         'USBOutTransferResult'],
-        {'Navigator': ['usb']});
-  console.log('Interfaces in document\n' + interfaces);
+  OriginTrialsHelper.check_properties(this, {'Navigator': ['usb']});
+}, "WebUSB related properties on interfaces in Origin-Trial enabled document.");
+
+test(t => {
+  OriginTrialsHelper.check_interfaces(this,
+    ['USBAlternateInterface',
+     'USBConfiguration',
+     'USBConnectionEvent',
+     'USBDevice',
+     'USBEndpoint',
+     'USBInTransferResult',
+     'USBInterface',
+     'USBIsochronousInTransferPacket',
+     'USBIsochronousInTransferResult',
+     'USBIsochronousOutTransferPacket',
+     'USBIsochronousOutTransferResult',
+     'USBOutTransferResult']);
 }, "WebUSB related interfaces in Origin-Trial enabled document.");
 </script>

diff --git a/third_party/WebKit/LayoutTests/http/tests/resources/origin-trials-helper.js b/third_party/WebKit/LayoutTests/http/tests/resources/origin-trials-helper.js
index af07d129..d5e438e 100644
--- a/third_party/WebKit/LayoutTests/http/tests/resources/origin-trials-helper.js
+++ b/third_party/WebKit/LayoutTests/http/tests/resources/origin-trials-helper.js

@@ -2,30 +2,37 @@
 // LayoutTests that are checking members exposed to script by origin trials.
 //
 // The current available methods are:
-// get_interface_names:
-//   Report on the existence of the given interface names on the global object,
-//   listing all the properties found for each interface. The properties can be
-//   filtered by providing a list of desired property names. As well, it can
-//   report on properties of the global object itself, by giving 'global' as one
-//   of the interface names.
+// check_properties:
+//   Tests for the existence of the given property names, on the given interface
+//   names, on the global object. As well, it can test for properties of the
+//   global object itself, by giving 'global' as the interface name.
 // Example:
-//   OriginTrialsHelper.get_interface_names(
+//   OriginTrialsHelper.check_properties(
 //     this,
-//     ['ForeignFetchEvent', 'InstallEvent', 'global'],
-//     {'InstallEvent':['registerForeignFetch'], 'global':['onforeignfetch']}));
+//     {'InstallEvent':['registerForeignFetch'], 'global':['onforeignfetch']});
 //
-// check_interfaces_in_sw:
-//   Collects the results of calling get_interface_names() in a service worker.
-//   Use in a promise test to output the results.
+// check_properties_missing:
+//   Tests that the given property names do not exist on the global object. That
+//   is, tests for the opposite of check_properties().
 // Example:
-//   promise_test(t => {
-//     var script = 'path/to/script/calling/get_interface_names()'
-//     var scope = 'matching scope'
-//     return OriginTrialsHelper.check_interfaces_in_sw(t, script, scope)
-//        .then(message => {
-//          console.log('Interfaces in Service Worker - origin trial enabled.\n'
-//                      + message);
-//        });
+//   OriginTrialsHelper.check_properties_missing(
+//     this,
+//     {'InstallEvent':['registerForeignFetch'], 'global':['onforeignfetch']});
+//
+// check_interfaces:
+//   Tests for the existence of the given interface names, on the global object.
+// Example:
+//   OriginTrialsHelper.check_interfaces(
+//     this,
+//     ['USBAlternateInterface', 'USBConfiguration']);
+//
+// check_interfaces_missing:
+//   Tests that the given interface names do not exist on the global object.
+//   That is, tests for the opposite of check_interfaces().
+// Example:
+//   OriginTrialsHelper.check_interfaces_missing(
+//     this,
+//     ['USBAlternateInterface', 'USBConfiguration']);
 //
 // add_token:
 //   Adds a trial token to the document, to enable a trial via script
@@ -35,100 +42,56 @@
 
 var OriginTrialsHelper = (function() {
   return {
-    get_interface_names:
-        (global_object, interface_names,
-         opt_property_filters) => {
-          var property_filters = opt_property_filters || {};
-          var result = [];
-          function collect_property_info(object, property_name, output) {
-            var descriptor =
-                Object.getOwnPropertyDescriptor(object, property_name);
-            if ('value' in descriptor) {
-              if (typeof descriptor.value === 'function') {
-                output.push('    method ' + property_name);
-              } else {
-                output.push('    attribute ' + property_name);
-              }
-            } else {
-              if (descriptor.get) {
-                output.push('    getter ' + property_name);
-              }
-              if (descriptor.set) {
-                output.push('    setter ' + property_name);
-              }
-            }
+    check_properties_impl: (global_object, property_filters, should_exist) => {
+      let interface_names = Object.getOwnPropertyNames(property_filters).sort();
+      interface_names.forEach(function(interface_name) {
+        let interface_prototype;
+        if (interface_name === 'global') {
+          interface_prototype = global_object;
+        } else {
+          let interface_object = global_object[interface_name];
+          if (interface_object) {
+            interface_prototype = interface_object.prototype;
           }
-          interface_names.sort();
-          interface_names.forEach(function(interface_name) {
-            var use_global = false;
-            var interface_object;
-            if (interface_name === 'global') {
-              use_global = true;
-              interface_object = global_object;
-            } else {
-              interface_object = global_object[interface_name];
-            }
-            if (interface_object === undefined) {
-              return;
-            }
-            var interface_prototype;
-            var display_name;
-            if (use_global) {
-              interface_prototype = interface_object;
-              display_name = 'global object';
-            } else {
-              interface_prototype = interface_object.prototype;
-              display_name = 'interface ' + interface_name;
-            }
-            result.push(display_name);
-            var property_names =
-                Object.getOwnPropertyNames(interface_prototype);
-            var match_property_names = property_filters[interface_name];
-            if (match_property_names) {
-              property_names = property_names.filter(
-                  name => { return match_property_names.indexOf(name) >= 0; });
-            }
-            var property_strings = [];
-            property_names.forEach(function(property_name) {
-              collect_property_info(
-                  interface_prototype, property_name, property_strings);
-            });
-            result.push.apply(result, property_strings.sort());
-          });
-          return result.join('\n');
-        },
+        }
+        assert_true(interface_prototype !== undefined, 'Interface ' + interface_name + ' not found');
+        property_filters[interface_name].forEach(function(property_name) {
+          assert_equals(interface_prototype.hasOwnProperty(property_name),
+              should_exist,
+              'Property ' + property_name + ' exists on ' + interface_name);
+        });
+      });
+    },
 
-         check_interfaces_in_sw:
-             (t, script, scope) => {
-               var worker;
-               var message;
-               var registration;
-               return service_worker_unregister_and_register(t, script, scope)
-                   .then(reg => {
-                     registration = reg;
-                     worker = registration.installing;
-                     return wait_for_state(t, worker, 'activated');
-                   })
-                   .then(_ => {
-                     var saw_message = new Promise(resolve => {
-                       navigator.serviceWorker.onmessage =
-                           e => { resolve(e.data); };
-                     });
-                     worker.postMessage('');
-                     return saw_message;
-                   })
-                   .then(msg => {
-                     message = msg;
-                     return registration.unregister();
-                   })
-                   .then(_ => { return message; });
-             },
+    check_properties: (global_object, property_filters) => {
+      OriginTrialsHelper.check_properties_impl(global_object, property_filters, true);
+    },
 
-         add_token: (token_string) => {
-           var tokenElement = document.createElement('meta');
-           tokenElement.httpEquiv = 'origin-trial';
-           tokenElement.content = token_string;
-           document.head.appendChild(tokenElement);
-         }
+    check_properties_missing: (global_object, property_filters) => {
+      OriginTrialsHelper.check_properties_impl(global_object, property_filters, false);
+    },
+
+    check_interfaces_impl: (global_object, interface_names, should_exist) => {
+      interface_names.sort();
+      interface_names.forEach(function(interface_name) {
+        assert_equals(global_object.hasOwnProperty(interface_name), should_exist,
+          'Interface ' + interface_name + ' exists on provided object');
+      });
+    },
+
+    check_interfaces: (global_object, interface_names) => {
+      OriginTrialsHelper.check_interfaces_impl(global_object, interface_names, true);
+    },
+
+    check_interfaces_missing: (global_object, interface_names) => {
+      OriginTrialsHelper.check_interfaces_impl(global_object, interface_names, false);
+    },
+
+    add_token: (token_string) => {
+      var tokenElement = document.createElement('meta');
+      tokenElement.httpEquiv = 'origin-trial';
+      tokenElement.content = token_string;
+      document.head.appendChild(tokenElement);
+    }
   }
 })();

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/base-uri-self.html b/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/base-uri-self.html
deleted file mode 100644
index e2bbfd3..0000000
--- a/third_party/WebKit/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/base-uri-self.html
+++ /dev/null

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="Content-Security-Policy" content="base-uri 'self'">
-  <script src="/resources/testharness.js"></script>
-  <script src="/resources/testharnessreport.js"></script>
-  <script src="/security/contentSecurityPolicy/resources/testharness-helper.js"></script>
-</head>
-<body>
-  <script>
-    async_test(t => {
-      assert_equals(document.baseURI, window.location.href);
-
-      var b = document.createElement("base");
-      b.href = "http://127.0.0.1:8000/";
-      document.head.appendChild(b);
-
-      document.addEventListener("securitypolicyviolation", e => t.unreached_func());
-
-      // Wait until the next frame to give the report time to fire
-      requestAnimationFrame(t.step_func_done(_ => {
-        assert_equals(document.baseURI, "http://127.0.0.1:8000/");
-      }));
-    }, "'self' works at top-level.");
-
-    async_test(t => {
-      var i = document.createElement("iframe");
-      i.sandbox = "allow-scripts";
-      i.srcdoc = `
-        <script>
-          document.addEventListener("securitypolicyviolation", e => top.postMessage("FAIL", "*"));
-        </scr` + `ipt>
-        <base href="http://127.0.0.1:8000/">
-        <script>
-          requestAnimationFrame(_ => { 
-            top.postMessage(document.baseURI, "*");
-          });
-        </scr` + `ipt>`;
-  
-      waitUntilEvent(window, "message")
-        .then(t.step_func_done(e => {
-          assert_equals(e.data, "http://127.0.0.1:8000/");
-        }));
-
-      document.body.appendChild(i);
-    }, "'self' works in a sandbox.");
-  </script>
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-cors-bad-integrity.html b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-cors-bad-integrity.html
index 98f79398..ade24ee2 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-cors-bad-integrity.html
+++ b/third_party/WebKit/LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-script-cors-bad-integrity.html

@@ -7,15 +7,38 @@
     <script src="/resources/testharnessreport.js"></script>
     <script>
         var result = '';
-        var scriptLoaded = function() {
-            assert_unreached('Script loaded.');
-            done();
+        // Tests script tag variations corresponding to conditions in
+        // https://html.spec.whatwg.org/#prepare-a-script, because they
+        // are implemented by different code paths.
+        // These tests differ in async/defer attributes
+        // and whether they are dynamically inserted.
+        var test1 = async_test('1st Clause, Step 23 of prepare a script');
+        var test2 = async_test('2nd Clause, Step 23 of prepare a script');
+        var test3 = async_test('3rd Clause, Step 23 of prepare a script');
+        var test4 = async_test('4th Clause, Step 23 of prepare a script');
+        var scriptLoaded = function(t) {
+            t.step(function() {
+                assert_unreached('Script loaded.');
+                t.done();
+            });
         };
-        var scriptError = function() {
-            assert_equals(result, '', 'Script did not run.');
-            done();
+        var scriptError = function(t) {
+            t.step(function() {
+                assert_equals(result, '', 'Script did not run.');
+                t.done();
+            });
         };
+        var script3 = document.createElement('script');
+        script3.setAttribute('integrity', 'sha256-deadbeef');
+        script3.setAttribute('crossorigin', '');
+        script3.onload = scriptLoaded.bind(undefined, test3);
+        script3.onerror = scriptError.bind(undefined, test3);
+        script3.src = 'http://localhost:8000/security/resources/cors-script.php?value=ran&test=3';
+        script3.async = false;
+        document.head.appendChild(script3);
     </script>
-    <script crossorigin integrity="sha256-deadbeef" src="http://localhost:8000/security/resources/cors-script.php?value=ran" onload="scriptLoaded();" onerror="scriptError();"></script>
+    <script crossorigin integrity="sha256-deadbeef" src="http://localhost:8000/security/resources/cors-script.php?value=ran&test=1" onload="scriptLoaded(test1);" onerror="scriptError(test1);" defer></script>
+    <script crossorigin integrity="sha256-deadbeef" src="http://localhost:8000/security/resources/cors-script.php?value=ran&test=2" onload="scriptLoaded(test2);" onerror="scriptError(test2);"></script>
+    <script crossorigin integrity="sha256-deadbeef" src="http://localhost:8000/security/resources/cors-script.php?value=ran&test=4" onload="scriptLoaded(test4);" onerror="scriptError(test4);" async></script>
 </body>
 </html>

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-expected.txt
index ff9ea84..65828542 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-expected.txt

@@ -7,7 +7,7 @@
 Frame: 'frame'
 --------
 CSP report received:
-CONTENT_TYPE: application/json
+CONTENT_TYPE: application/xss-auditor-report
 HTTP_REFERER: http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E
 REQUEST_METHOD: POST
 === POST DATA ===

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-full-block-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-full-block-expected.txt
index 7885c29..10a1349e 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-full-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-full-block-expected.txt

@@ -1,6 +1,6 @@
 CONSOLE ERROR: line 4: The XSS Auditor blocked access to 'http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag-full-block.html&enable-full-block-report=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E' because the source code of a script was found within the request. The server sent an 'X-XSS-Protection' header requesting this behavior.
 CSP report received:
-CONTENT_TYPE: application/json
+CONTENT_TYPE: application/xss-auditor-report
 HTTP_REFERER: http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag-full-block.html&enable-full-block-report=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E
 REQUEST_METHOD: POST
 === POST DATA ===

diff --git a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt
index e1c7589..9989d25 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt
+++ b/third_party/WebKit/LayoutTests/http/tests/security/xssAuditor/report-script-tag-replace-state-expected.txt

@@ -7,7 +7,7 @@
 Frame: 'frame'
 --------
 CSP report received:
-CONTENT_TYPE: application/json
+CONTENT_TYPE: application/xss-auditor-report
 HTTP_REFERER: http://127.0.0.1:8000/security/xssAuditor/resources/echo-intertag.pl?test=report-script-tag.html&echo-report=1&enable-report=1&replaceState=1&q=%3Cscript%3Ealert(String.fromCharCode(0x58,0x53,0x53))%3C/script%3E%3Cp%3EIf%20you%20see%20this%20message,%20no%20JavaScript%20alert(),%20and%20a%20dump%20of%20the%20report%20below,%20then%20the%20test%20PASSED.%3C/p%3E
 REQUEST_METHOD: POST
 === POST DATA ===

diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/controller-on-reload.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/controller-on-reload.html
index 3af4f3a..079476f 100644
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/controller-on-reload.html
+++ b/third_party/WebKit/LayoutTests/http/tests/serviceworker/controller-on-reload.html

@@ -15,7 +15,7 @@
       .then(function(f) {
           frame = f;
           return frame.contentWindow.navigator.serviceWorker.register(
-              'resources/empty-worker.js', {scope: scope});
+              'empty-worker.js', {scope: 'blank.html'});
         })
       .then(function(registration) {
           return wait_for_state(t, registration.installing, 'activated');

diff --git a/third_party/WebKit/LayoutTests/http/tests/serviceworker/registration-iframe.html b/third_party/WebKit/LayoutTests/http/tests/serviceworker/registration-iframe.html
deleted file mode 100644
index beba595..0000000
--- a/third_party/WebKit/LayoutTests/http/tests/serviceworker/registration-iframe.html
+++ /dev/null

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Service Worker: Registration for iframe</title>
-<script src="../resources/testharness.js"></script>
-<script src="../resources/testharnessreport.js"></script>
-<script src="resources/test-helpers.js"></script>
-<script>
-// Set script url and scope url relative to the calling frame's document's url.
-// Assert the implementation parses the urls against the calling frame's
-// document's url.
-async_test(function(t) {
-  var url = 'resources/blank.html';
-  var scope = 'resources/registration-for-iframe-from-calling-frame';
-  var parsed_scope = normalizeURL(scope);
-  var script = 'resources/empty-worker.js';
-  var parsed_script = normalizeURL(script);
-  var frame;
-  var registration;
-
-  service_worker_unregister(t, scope)
-    .then(function() { return with_iframe(url); })
-    .then(function(f) {
-        frame = f;
-        return frame.contentWindow.navigator.serviceWorker.register(
-            script,
-            { scope: scope });
-      })
-    .then(function(r) {
-        registration = r;
-        return wait_for_state(t, r.installing, 'activated');
-      })
-    .then(function() {
-        assert_equals(
-          registration.scope, parsed_scope,
-          'registration\'s scope must be the scope parsed against calling ' +
-          'document\'s url');
-        assert_equals(
-          registration.active.scriptURL, parsed_script,
-          'worker\'s script must be the url parsed against calling ' +
-          'document\'s url');
-        frame.remove();
-        return service_worker_unregister_and_done(t, scope);
-      })
-    .catch(unreached_rejection(t));
-  }, 'Subframe\'s container\'s register method should use calling frame\'s ' +
-     'document\'s url as a base url for parsing its script url and scope url ' +
-     '- normal case');
-
-// Set script url and scope url relative to the iframe's document's url.
-// Assert the implementation throws a TypeError exception.
-async_test(function(t) {
-  var url = 'resources/blank.html';
-  var scope = 'registration-for-iframe-from-calling-frame';
-  var script = 'empty-worker.js';
-  var frame;
-  var registration;
-
-  service_worker_unregister(t, scope)
-    .then(function() { return with_iframe(url); })
-    .then(function(f) {
-        frame = f;
-        return frame.contentWindow.navigator.serviceWorker.register(
-            script,
-            { scope: scope });
-      })
-    .then(
-      function() {
-        assert_unreached('register() should reject');
-      },
-      function(e) {
-        assert_equals(e.name, 'TypeError');
-        frame.remove();
-        return service_worker_unregister_and_done(t, scope);
-      })
-    .catch(unreached_rejection(t));
-  }, 'Subframe\'s container\'s register method should use calling frame\'s ' +
-     'document\'s url as a base url for parsing its script url and scope url ' +
-     '- error case');
-
-// Set the scope url to a non-subdirectory of the script url.
-// Assert the implementation throws a SecurityError exception.
-async_test(function(t) {
-  var url = 'resources/blank.html';
-  var scope = 'registration-for-iframe-from-calling-frame';
-  var script = 'resources/empty-worker.js';
-  var frame;
-  var registration;
-
-  service_worker_unregister(t, scope)
-    .then(function() { return with_iframe(url); })
-    .then(function(f) {
-        frame = f;
-        return frame.contentWindow.navigator.serviceWorker.register(
-            script,
-            { scope: scope });
-      })
-    .then(
-      function() {
-        assert_unreached('register() should reject');
-      },
-      function(e) {
-        assert_equals(e.name, 'SecurityError');
-        frame.remove();
-        return service_worker_unregister_and_done(t, scope);
-      })
-    .catch(unreached_rejection(t));
-  }, 'A scope url should start with the given script url');
-</script>

diff --git a/third_party/WebKit/LayoutTests/images/drag-svg-image-expected.png b/third_party/WebKit/LayoutTests/images/drag-svg-image-expected.png
index bed9ad46..931a6ff 100644
--- a/third_party/WebKit/LayoutTests/images/drag-svg-image-expected.png
+++ b/third_party/WebKit/LayoutTests/images/drag-svg-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/inspector/components/flame-chart.html b/third_party/WebKit/LayoutTests/inspector/components/flame-chart.html
index df5f867..02c0efaf 100644
--- a/third_party/WebKit/LayoutTests/inspector/components/flame-chart.html
+++ b/third_party/WebKit/LayoutTests/inspector/components/flame-chart.html

@@ -63,6 +63,9 @@
 
     decorateEntry(entryIndex, context, text, barX, barY, barWidth, barHeight, unclippedBarX, timeToPixels) {
     }
+
+    highlightEntry(entryIndex) {
+    }
 }
 
 }

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/coverage-test.js b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-test.js
new file mode 100644
index 0000000..38e24885
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-test.js

@@ -0,0 +1,13 @@
+function initialize_CoverageTests() {
+
+InspectorTest.preloadModule("coverage");
+
+InspectorTest.sourceDecorated = async function(source) {
+
+    await UI.inspectorView.showPanel("sources");
+    var decoratePromise = InspectorTest.addSnifferPromise(Coverage.CoverageView.LineDecorator.prototype, "decorate");
+    await new Promise(fulfill => InspectorTest.showScriptSource(source, fulfill));
+    await decoratePromise;
+}
+
+}

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view-expected.txt b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view-expected.txt
index ca8a2c88..96696db 100644
--- a/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view-expected.txt

@@ -1,4 +1,5 @@
 Tests the coverage list view after finishing recording in the Coverage view.
 
+.../inspector/coverage/resources/coverage.js used: 245 unused: 157 total: 402
 .../inspector/coverage/resources/highlight-in-source.css used: 65 unused: 128 total: 209
 

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view.html b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view.html
index 6451d2c..22f232b 100644
--- a/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view.html
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/coverage-view.html

@@ -2,6 +2,7 @@
 <head>
 <script src="../../http/tests/inspector/inspector-test.js"></script>
 <script src="../../http/tests/inspector/elements-test.js"></script>
+<script src="resources/coverage.js"></script>
 
 <link rel="stylesheet" type="text/css" href="resources/highlight-in-source.css">
 
@@ -11,13 +12,14 @@
     InspectorTest.preloadModule("coverage");
 }
 
-function test()
+async function test()
 {
     var coverageView = self.runtime.sharedInstance(Coverage.CoverageView);
     InspectorTest.addSniffer(coverageView._listView, "update", displayResults);
 
-    coverageView._toggleRecording(true);
     UI.viewManager.showView("coverage");
+    coverageView._toggleRecording(true);
+    await InspectorTest.evaluateInPagePromise("performActions()");
     coverageView._toggleRecording(false);
 
     function displayResults()
@@ -26,6 +28,8 @@
         for (var child of dataGrid.rootNode().children) {
             var data = child._coverageInfo;
             var url = InspectorTest.formatters.formatAsURL(data.url);
+            if (url.endsWith("-test.js") || url.endsWith(".html"))
+                continue;
             InspectorTest.addResult(`${url} used: ${data.usedSize} unused: ${data.unusedSize} total: ${data.size}`);
         }
         InspectorTest.completeTest();

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css-expected.txt b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css-expected.txt
new file mode 100644
index 0000000..54c4ad6d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css-expected.txt

@@ -0,0 +1,6 @@
+PASS
+
+Tests the coverage highlight in sources after the recording finishes.
+
+5,6,7,9,10,11,12,18,19,20,22,23,24
+

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css.html b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css.html
new file mode 100644
index 0000000..5e47ec8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-css.html

@@ -0,0 +1,36 @@
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script src="../../http/tests/inspector/debugger-test.js"></script>
+<script src="../../http/tests/inspector/sources-test.js"></script>
+<script src="coverage-test.js"></script>
+
+<link rel="stylesheet" type="text/css" href="resources/highlight-in-source.css">
+<script>
+
+var initialize_Coverage = function() {
+    InspectorTest.preloadModule("coverage");
+}
+
+async function test()
+{
+    var coverageView = self.runtime.sharedInstance(Coverage.CoverageView);
+
+    coverageView._toggleRecording(true);
+    UI.viewManager.showView("coverage");
+    coverageView._toggleRecording(false);
+    await InspectorTest.addSnifferPromise(Coverage.CoverageView.prototype, "_updateGutter");
+    await InspectorTest.sourceDecorated("highlight-in-source.css");
+
+    var lines = Array.prototype.map.call(document.querySelectorAll(".text-editor-coverage-unused-marker"),
+                                         e => e.parentElement.previousSibling.textContent);
+    InspectorTest.addResult(lines);
+    InspectorTest.completeTest();
+}
+</script>
+</head>
+<p id="id">PASS</p>
+<body onload="runTest()">
+<p>Tests the coverage highlight in sources after the recording finishes.</p>
+</body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js-expected.txt b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js-expected.txt
new file mode 100644
index 0000000..cc48a07
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js-expected.txt

@@ -0,0 +1,6 @@
+PASS
+
+Tests the coverage highlight in sources after the recording finishes.
+
+3,4,5,11,18,19,20
+

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js.html b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js.html
new file mode 100644
index 0000000..c72a3524
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/gutter-js.html

@@ -0,0 +1,33 @@
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script src="../../http/tests/inspector/debugger-test.js"></script>
+<script src="../../http/tests/inspector/sources-test.js"></script>
+<script src="coverage-test.js"></script>
+<script src="resources/coverage.js"></script>
+
+<script>
+
+async function test()
+{
+    var coverageView = self.runtime.sharedInstance(Coverage.CoverageView);
+
+    UI.viewManager.showView("coverage");
+    coverageView._toggleRecording(true);
+    await InspectorTest.evaluateInPagePromise("performActions()");
+    coverageView._toggleRecording(false);
+    await InspectorTest.addSnifferPromise(Coverage.CoverageView.prototype, "_updateGutter");
+    await InspectorTest.sourceDecorated("coverage.js");
+
+    var lines = Array.prototype.map.call(document.querySelectorAll(".text-editor-coverage-unused-marker"),
+                                         e => e.parentElement.previousSibling.textContent);
+    InspectorTest.addResult(lines);
+    InspectorTest.completeTest();
+}
+</script>
+</head>
+<p id="id">PASS</p>
+<body onload="runTest()">
+<p>Tests the coverage highlight in sources after the recording finishes.</p>
+</body>
+</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source-expected.txt b/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source-expected.txt
deleted file mode 100644
index e4cc307..0000000
--- a/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source-expected.txt
+++ /dev/null

@@ -1,8 +0,0 @@
-PASS
-
-Tests the coverage highlight in sources after the recording finishes.
-
-
-Running: testMarking
-5,6,7,9,10,11,12,18,19,20,22,23,24
-

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source.html b/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source.html
deleted file mode 100644
index fefd780..0000000
--- a/third_party/WebKit/LayoutTests/inspector/coverage/highlight-in-source.html
+++ /dev/null

@@ -1,58 +0,0 @@
-<html>
-<head>
-<script src="../../http/tests/inspector/inspector-test.js"></script>
-<script src="../../http/tests/inspector/debugger-test.js"></script>
-<script src="../../http/tests/inspector/sources-test.js"></script>
-
-<link rel="stylesheet" type="text/css" href="resources/highlight-in-source.css">
-<script>
-
-var initialize_Coverage = function() {
-    InspectorTest.preloadModule("coverage");
-}
-
-function test()
-{
-    InspectorTest.runTestSuite([
-        function testMarking(next)
-        {
-            var coverageView = self.runtime.sharedInstance(Coverage.CoverageView);
-            InspectorTest.addSniffer(Coverage.CoverageView.prototype, "_updateGutter", printResults);
-
-            coverageView._toggleRecording(true);
-            UI.viewManager.showView("coverage");
-            coverageView._toggleRecording(false);
-
-            function printResults()
-            {
-                UI.inspectorView.showPanel("sources").then(showSource);
-            }
-
-            function showSource()
-            {
-                InspectorTest.showScriptSource("highlight-in-source.css", waitForDecorations);
-            }
-
-            function waitForDecorations()
-            {
-                InspectorTest.addSniffer(Coverage.CoverageView.LineDecorator.prototype, "decorate", didShowDecorations);
-            }
-
-            function didShowDecorations(sourceFrame)
-            {
-                var lines = Array.prototype.map.call(document.querySelectorAll(".text-editor-coverage-unused-marker"),
-                                                        e => e.parentElement.previousSibling.textContent);
-
-                InspectorTest.addResult(lines);
-                next();
-            }
-        }
-    ]);
-}
-</script>
-</head>
-<p id="id">PASS</p>
-<body onload="runTest()">
-<p>Tests the coverage highlight in sources after the recording finishes.</p>
-</body>
-</html>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/inspector/coverage/resources/coverage.js b/third_party/WebKit/LayoutTests/inspector/coverage/resources/coverage.js
new file mode 100644
index 0000000..9d1c6f57
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/coverage/resources/coverage.js

@@ -0,0 +1,20 @@
+function outer(index) {
+
+  function inner1(a) {
+    return a + 1;
+  }
+
+  function inner2(a) {
+    return a + 2;
+  }
+
+  function inner3(a) { return a + 3; } function inner4(a) { return a + 4; } function inner5(a) { return a + 5; }
+
+  return [inner1, inner2, inner3, inner4, inner5][index];
+}
+
+function performActions() {
+  return outer(1)(0) + outer(3)(0);
+} function outer2() {
+  return outer(0)(0);
+}

diff --git a/third_party/WebKit/LayoutTests/inspector/help/release-note-expected.txt b/third_party/WebKit/LayoutTests/inspector/help/release-note-expected.txt
new file mode 100644
index 0000000..dd936b8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/help/release-note-expected.txt

@@ -0,0 +1,16 @@
+Test release note
+
+Browser version: 99
+
+Dumping release note text:
+New in DevTools 99
+Test bullet #1
+Test bullet #2
+And more...Dismiss
+
+Last version of release note seen should be updated:
+99
+
+Click on hide button
+Hiding view: release-note
+

diff --git a/third_party/WebKit/LayoutTests/inspector/help/release-note-unit-expected.txt b/third_party/WebKit/LayoutTests/inspector/help/release-note-unit-expected.txt
new file mode 100644
index 0000000..28381abf
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/help/release-note-unit-expected.txt

@@ -0,0 +1,45 @@
+Unit test for release note
+
+
+Running: getValidReleaseNote
+Last seen version: 2
+Browser version: 3
+Showed release note in drawer - version: 3
+
+Running: getAnotherValidReleaseNote
+Last seen version: 3
+Browser version: 4
+Showed release note in drawer - version: 4
+
+Running: getReleaseNoteTwoVersionsAhead
+Last seen version: 3
+Browser version: 5
+Showed release note in drawer - version: 5
+
+Running: alreadySeenReleaseNote
+Last seen version: 3
+Browser version: 3
+Did not show release note drawer
+
+Running: browserVersionAheadOfReleaseNote
+Last seen version: 5
+Browser version: 6
+Did not show release note drawer
+
+Running: getLatestReleaseNote
+Getting release note for browser version: 5
+Received release note: 5
+
+Running: getReleaseNoteMatchingVersion
+Getting release note for browser version: 4
+Received release note: 4
+
+Running: getMostRecentReleaseNote
+Getting release note for browser version: 7
+Received release note: 5
+
+Running: getReleaseNoteFallback
+Getting release note for browser version: 2
+error: Unable to find release note for version 2 - using last release note as fallback
+Received release note: 5
+

diff --git a/third_party/WebKit/LayoutTests/inspector/help/release-note-unit.html b/third_party/WebKit/LayoutTests/inspector/help/release-note-unit.html
new file mode 100644
index 0000000..e5cf3b40
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/help/release-note-unit.html

@@ -0,0 +1,93 @@
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function test()
+{
+    Help.releaseNoteText = [
+        {version: 3},
+        {version: 4},
+        {version: 5},
+    ];
+
+    function testMaybeShowInDrawer(lastSeenVersion, browserVersion) {
+        Help._latestReleaseNote = Help._getReleaseNoteByVersion(browserVersion);
+        InspectorTest.addResult(`Last seen version: ${lastSeenVersion}`);
+        InspectorTest.addResult(`Browser version: ${browserVersion}`);
+        InspectorTest.addSniffer(UI.inspectorView, "showPanel", onPanelShown);
+        var showedReleaseNote = false;
+
+        Help._showReleaseNoteIfNeeded(lastSeenVersion, browserVersion);
+
+        function onPanelShown() {
+            showedReleaseNote = true;
+        }
+        if (showedReleaseNote)
+            InspectorTest.addResult(`Showed release note in drawer - version: ${Help.latestReleaseNote().version}`);
+        else
+            InspectorTest.addResult('Did not show release note drawer');
+    }
+
+    function testGetReleaseNoteByVersion(version) {
+        InspectorTest.addResult(`Getting release note for browser version: ${version}`);
+        var releaseNote = Help._getReleaseNoteByVersion(version);
+        InspectorTest.addResult(`Received release note: ${releaseNote.version}`);
+    }
+
+    InspectorTest.runTestSuite([
+        function getValidReleaseNote(next) {
+            var browserVersion = 3;
+            var lastSeenVersion = 2;
+            testMaybeShowInDrawer(lastSeenVersion, browserVersion);
+            next();
+        },
+        function getAnotherValidReleaseNote(next) {
+            var browserVersion = 4;
+            var lastSeenVersion = 3;
+            testMaybeShowInDrawer(lastSeenVersion, browserVersion);
+            next();
+        },
+        function getReleaseNoteTwoVersionsAhead(next) {
+            var browserVersion = 5;
+            var lastSeenVersion = 3;
+            testMaybeShowInDrawer(lastSeenVersion, browserVersion);
+            next();
+        },
+        function alreadySeenReleaseNote(next) {
+            var browserVersion = 3;
+            var lastSeenVersion = 3;
+            testMaybeShowInDrawer(lastSeenVersion, browserVersion);
+            next();
+        },
+        function browserVersionAheadOfReleaseNote(next) {
+            var browserVersion = 6;
+            var lastSeenVersion = 5;
+            testMaybeShowInDrawer(lastSeenVersion, browserVersion);
+            next();
+        },
+        function getLatestReleaseNote(next) {
+            testGetReleaseNoteByVersion(5);
+            next();
+        },
+        function getReleaseNoteMatchingVersion(next) {
+            testGetReleaseNoteByVersion(4);
+            next();
+        },
+        function getMostRecentReleaseNote(next) {
+            testGetReleaseNoteByVersion(7);
+            next();
+        },
+        function getReleaseNoteFallback(next) {
+            testGetReleaseNoteByVersion(2);
+            next();
+        },
+    ]);
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>
+    Unit test for release note
+</p>
+</body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/inspector/help/release-note.html b/third_party/WebKit/LayoutTests/inspector/help/release-note.html
new file mode 100644
index 0000000..8054a2af
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/help/release-note.html

@@ -0,0 +1,63 @@
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function test() {
+     Help.releaseNoteText = [
+        {
+            version: 99,
+            highlights: [
+                {
+                    text: "Test bullet #1",
+                    link: "https://google.com/",
+                    featured: true,
+                },
+                {
+                    text: "Test bullet #2",
+                    link: "https://google.com/",
+                },
+            ],
+            link: "https://google.com/",
+            image: {
+                src: "./resources/test.png",
+                caption: "Test image",
+            },
+        }
+    ];
+
+    InspectorTest.addSniffer(UI.inspectorView, "showPanel", onPanelShown);
+
+    InspectorTest.addResult(`Browser version: ${Help.browserVersion()}\n`);
+    Help.showReleaseNoteIfNeeded();
+
+    function onPanelShown(viewId, panelPromise) {
+        panelPromise.then(() => {
+            var releaseNoteView = UI.viewManager.view("release-note");
+            var releaseNoteElement = releaseNoteView[UI.View._widgetSymbol].contentElement;
+            InspectorTest.addResult("Dumping release note text:");
+            InspectorTest.addResult(releaseNoteElement.innerText);
+            InspectorTest.addResult("Last version of release note seen should be updated:");
+            InspectorTest.addResult(Help.releaseNoteVersionSetting().get() + "\n");
+
+            InspectorTest.addSniffer(UI.InspectorView.prototype, "closeDrawerTab", onClose);
+            InspectorTest.addResult("Click on hide button");
+            var closeButton = releaseNoteElement.querySelector(".close-release-note");
+            closeButton.click();
+        });
+    }
+
+    function onClose(view) {
+        InspectorTest.addResult(`Hiding view: ${view}`);
+        InspectorTest.completeTest();
+    }
+}
+
+</script>
+</head>
+<body onload="runTest()">
+<p>
+Test release note
+</p>
+
+</body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/inspector/help/resources/test.png b/third_party/WebKit/LayoutTests/inspector/help/resources/test.png
new file mode 100644
index 0000000..6cfadc3c7a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/help/resources/test.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/inspector/initial-modules-load-expected.txt b/third_party/WebKit/LayoutTests/inspector/initial-modules-load-expected.txt
index a57de8ec..f87ed71 100644
--- a/third_party/WebKit/LayoutTests/inspector/initial-modules-load-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/initial-modules-load-expected.txt

@@ -9,6 +9,7 @@
     dom_extension
     emulation
     extensions
+    help
     host
     main
     network_conditions
@@ -32,6 +33,7 @@
     emulation
     event_listeners
     extensions
+    help
     host
     inline_editor
     main
@@ -61,6 +63,7 @@
     emulation
     event_listeners
     extensions
+    help
     host
     inline_editor
     main
@@ -94,6 +97,7 @@
     emulation
     event_listeners
     extensions
+    help
     host
     inline_editor
     main
@@ -130,6 +134,7 @@
     emulation
     event_listeners
     extensions
+    help
     host
     inline_editor
     main

diff --git a/third_party/WebKit/LayoutTests/inspector/open-with-rendering-option-enabled-expected.txt b/third_party/WebKit/LayoutTests/inspector/open-with-rendering-option-enabled-expected.txt
index e91ee0a1..94c946b 100644
--- a/third_party/WebKit/LayoutTests/inspector/open-with-rendering-option-enabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/open-with-rendering-option-enabled-expected.txt

@@ -7,6 +7,7 @@
     dom_extension
     emulation
     extensions
+    help
     host
     main
     network_conditions

diff --git a/third_party/WebKit/LayoutTests/inspector/sources/debugger-breakpoints/breakpoint-manager.js b/third_party/WebKit/LayoutTests/inspector/sources/debugger-breakpoints/breakpoint-manager.js
index 7045105..359aec2 100644
--- a/third_party/WebKit/LayoutTests/inspector/sources/debugger-breakpoints/breakpoint-manager.js
+++ b/third_party/WebKit/LayoutTests/inspector/sources/debugger-breakpoints/breakpoint-manager.js

@@ -39,7 +39,7 @@
 InspectorTest.createMockTarget = function(id, debuggerModelConstructor, capabilities)
 {
     capabilities = capabilities || InspectorTest._pageCapabilities;
-    var target = InspectorTest.testTargetManager.createTarget("mock-target-" + id, capabilities & (~SDK.Target.Capability.JS), (params) => new SDK.StubConnection(params), null);
+    var target = InspectorTest.testTargetManager.createTarget("mock-target-" + id, "mock-target-" + id, capabilities & (~SDK.Target.Capability.JS), (params) => new SDK.StubConnection(params), null);
     target._capabilitiesMask = capabilities;
     target._inspectedURL = InspectorTest.mainTarget.inspectedURL();
     target.resourceTreeModel = target.model(SDK.ResourceTreeModel);

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-node-reference.html b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-node-reference.html
index 94f8399..a6229306 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-node-reference.html
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-node-reference.html

@@ -25,20 +25,16 @@
          InspectorTest.evaluateWithTimeline("performActions()", onTimelineRecorded);
     });
 
-    function clickValueLink(event, row)
+    async function clickValueLink(event, row)
     {
         var model = UI.panels.timeline._performanceModel.timelineModel();
-        Timeline.TimelineUIUtils.buildTraceEventDetails(event, model, new Components.Linkifier(), true, onDetailsContentReady);
-
-        function onDetailsContentReady(element)
-        {
-            var rows = element.querySelectorAll(".timeline-details-view-row");
-            for (var i = 0; i < rows.length; ++i) {
-                if (rows[i].firstChild.textContent.indexOf(row) !== -1) {
-                    rows[i].lastChild.firstChild.shadowRoot.lastChild.click();
-                    return;
-                }
-            }
+        var element = await Timeline.TimelineUIUtils.buildTraceEventDetails(event, model, new Components.Linkifier(), true);
+        var rows = element.querySelectorAll(".timeline-details-view-row");
+        for (var i = 0; i < rows.length; ++i) {
+            if (rows[i].firstChild.textContent.indexOf(row) !== -1) {
+	        rows[i].lastChild.firstChild.shadowRoot.lastChild.click();
+	        return;
+	    }
         }
     }
 

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-details-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-details-expected.txt
index 30ad017..1841b23 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-details-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-details-expected.txt

@@ -6,13 +6,15 @@
 Request Method: GET
 Priority: Low
 Mime Type: string
-Encoded Length: 0 B 
+Encoded Data: 0 B
+Decoded Body: 223 B
 Initiator: timeline-network-resource-details.html:15
 URL: anImage.png
 Duration: string
 Request Method: GET
 Priority: Low
 Mime Type: string
-Encoded Length: 0 B 
+Encoded Data: 0 B
+Decoded Body: 12.9 KB
 Preview: 
 

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-expected.txt
index 46b7b48..0f117dc 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-network/timeline-network-resource-expected.txt

@@ -41,6 +41,7 @@
 ResourceFinish Properties:
 {
     data : {
+        decodedBodyLength : 223
         didFail : false
         encodedDataLength : <number>
         finishTime : <number>

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations-expected.txt
index d75299c..e275fbc 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations-expected.txt

@@ -16,28 +16,6 @@
         selectorPart : undefined
         type : "StyleRecalcInvalidationTracking"
     }
-    {
-        cause : {reason: Inline CSS style declaration was mutated, stackTrace: .../inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations.html:10}
-        changedAttribute : undefined
-        changedClass : undefined
-        changedId : undefined
-        changedPseudo : undefined
-        extraData : ""
-        nodeName : "DIV id='testElement'"
-        selectorPart : undefined
-        type : "StyleRecalcInvalidationTracking"
-    }
-    {
-        cause : {reason: Style changed, stackTrace: .../inspector/tracing/timeline-paint/timeline-paint-with-layout-invalidations.html:11}
-        changedAttribute : undefined
-        changedClass : undefined
-        changedId : undefined
-        changedPseudo : undefined
-        extraData : undefined
-        nodeName : "DIV id='testElement'"
-        selectorPart : undefined
-        type : "LayoutInvalidationTracking"
-    }
 ]
 
 Running: testSubframe

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-style-recalc-invalidations-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-style-recalc-invalidations-expected.txt
index d316259a0..849e84d 100644
--- a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-style-recalc-invalidations-expected.txt
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-paint/timeline-paint-with-style-recalc-invalidations-expected.txt

@@ -16,17 +16,6 @@
         selectorPart : undefined
         type : "StyleRecalcInvalidationTracking"
     }
-    {
-        cause : {reason: Inline CSS style declaration was mutated, stackTrace: .../inspector/tracing/timeline-paint/timeline-paint-with-style-recalc-invalidations.html:10}
-        changedAttribute : undefined
-        changedClass : undefined
-        changedId : undefined
-        changedPseudo : undefined
-        extraData : ""
-        nodeName : "DIV id='testElement'"
-        selectorPart : undefined
-        type : "StyleRecalcInvalidationTracking"
-    }
 ]
 
 Running: testSubframe

diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-during-setmediakeys.html b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-during-setmediakeys.html
new file mode 100644
index 0000000..eb7a65d0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-during-setmediakeys.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Reset src during setMediaKeys()</title>
+        <script src="encrypted-media-utils.js"></script>
+        <script src="../../resources/testharness.js"></script>
+        <script src="../../resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <video></video>
+        <script>
+            async_test(function(test)
+            {
+                var mediaKeys;
+                var video = document.querySelector('video');
+                assert_not_equals(video, null);
+                var encryptedEventIndex = 0;
+
+                // Content to be played. These files must be the same format.
+                var content = '../content/test-encrypted.webm';
+                var alternateContent = '../content/test-encrypted-different-av-keys.webm';
+
+                function setMediaKeys() {
+                  // Create a MediaKeys object and assign it to video.
+                  video.setMediaKeys(mediaKeys)
+                      .then(function(result) {
+                          // setMediaKeys() should succeed even if src is reset before setMediaKeys() promise is resolved.
+                          assert_not_equals(video.mediaKeys, null, 'set successfully');
+                          assert_true(video.mediaKeys === mediaKeys);
+                      })
+                      .catch(function(error) {
+                          forceTestFailureFromPromise(test, error);
+                      });
+                }
+
+                var onEncrypted = function(event)
+                {
+                    encryptedEventIndex++;
+
+                    // This event is fired once for the audio stream and once
+                    // for the video stream each time .src is set.
+                    if (encryptedEventIndex == 2) {
+                        assert_equals(video.mediaKeys, null);
+                        setMediaKeys();
+
+                        // Reset src without waiting for setMediaKeys() to finish.
+                        video.src = alternateContent;
+                    } else if (encryptedEventIndex == 4) {
+                        // Finished second video.
+                        test.done();
+                    }
+                };
+
+                navigator.requestMediaKeySystemAccess('org.w3.clearkey', getConfigurationForFile(content))
+                    .then(function(access) {
+                        assert_equals(access.keySystem, 'org.w3.clearkey');
+                        return access.createMediaKeys();
+                    })
+                    .then(function(result) {
+                        mediaKeys = result;
+                        assert_not_equals(mediaKeys, null);
+
+                        // Set src without setMediaKeys().
+                        video.src = content;
+                        waitForEventAndRunStep('encrypted', video, onEncrypted, test);
+                    })
+                    .catch(function(error) {
+                        forceTestFailureFromPromise(test, error);
+                    })
+            }, 'Reset src during setMediaKeys().');
+        </script>
+    </body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/absolute-position-change-containing-block-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/absolute-position-change-containing-block-expected.txt
index b7e4583..135fc3d7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/absolute-position-change-containing-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/absolute-position-change-containing-block-expected.txt

@@ -25,11 +25,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
           "rect": [8, 5000, 100, 100],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='container' class='fixed blue'",
-          "rect": [8, 8, 100, 100],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/add-table-overpaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/add-table-overpaint-expected.txt
index cf7d883..8d4ba02 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/add-table-overpaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/add-table-overpaint-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow DIV",
           "rect": [0, 312, 800, 156],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTable TABLE",
-          "rect": [0, 312, 156, 156],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableSection TBODY",
-          "rect": [0, 312, 156, 156],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 314, 156, 152],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 314, 152, 152],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
new file mode 100644
index 0000000..2bfd99a6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt

@@ -0,0 +1,57 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (floating) SPAN",
+          "rect": [305, 35, 296, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) SPAN",
+          "rect": [153, 35, 296, 18],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) SPAN",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) SPAN",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-replaced-expected.txt
index 6c873755..a180927 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-replaced-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/block-layout-inline-children-replaced-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target' class='target'",
           "rect": [0, 116, 402, 152],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [151, 117, 100, 100],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/block-no-inflow-children-expected.txt
new file mode 100644
index 0000000..d2c9adc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/block-no-inflow-children-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [0, 0, 64, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'La la la la'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/border-radius-repaint-2-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/border-radius-repaint-2-expected.png
index 876058a..280affa 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/border-radius-repaint-2-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/border-radius-repaint-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-3509-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-3509-expected.txt
new file mode 100644
index 0000000..d66884c5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-3509-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='im'",
+          "rect": [11, 125, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='im'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6278-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6278-expected.txt
new file mode 100644
index 0000000..825acc6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6278-expected.txt

@@ -0,0 +1,114 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 132, 292, 144],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 281, 292, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 132, 242, 180],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 317, 242, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableCell TD id='col1'",
+          "rect": [10, 331, 242, 36],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutTableCell TD id='target'",
+          "rect": [254, 132, 52, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableCell TD id='col1'",
+          "rect": [252, 132, 50, 199],
+          "reason": "incremental"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD id='col1'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Curabitur pretium, quam quis semper'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'malesuada, est libero feugiat libero,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'vel fringilla orci nibh sed neque.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Quisque eu nulla non nisi molestie'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'accumsan. Etiam tellus urna, laoreet'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'ac, laoreet non, suscipit sed, sapien.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Phasellus vehicula, sem at posuere'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'vehicula, augue nibh molestie nisl,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'nec ullamcorper lacus ante vulputate'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pede.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutTableCell TD id='target'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6473-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6473-expected.txt
new file mode 100644
index 0000000..9f08bfe7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-6473-expected.txt

@@ -0,0 +1,40 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='allcontent'",
+          "rect": [8, 130, 784, 50],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='allcontent'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-7235-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-7235-expected.txt
new file mode 100644
index 0000000..821abe68
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/bugzilla-7235-expected.txt

@@ -0,0 +1,53 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 148, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='t'",
+          "rect": [8, 166, 100, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN id='p'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='t'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/change-text-content-and-background-color-expected.txt
new file mode 100644
index 0000000..098e976
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/change-text-content-and-background-color-expected.txt

@@ -0,0 +1,40 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTextControl (positioned) INPUT id='input'",
+          "rect": [8, 8, 244, 67],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTextControl (positioned) INPUT id='input'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'NEW'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/clip-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/clip-with-layout-delta-expected.txt
new file mode 100644
index 0000000..e932567d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/clip-with-layout-delta-expected.txt

@@ -0,0 +1,75 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV",
+          "rect": [108, 8, 100, 100],
+          "reason": "background obscuration change"
+        },
+        {
+          "object": "LayoutBlockFlow SPAN id='t2' class='blue'",
+          "rect": [108, 8, 100, 100],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 100, 100],
+          "reason": "background obscuration change"
+        },
+        {
+          "object": "LayoutBlockFlow SPAN id='t1'",
+          "rect": [8, 8, 100, 100],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "background obscuration change"
+    },
+    {
+      "object": "LayoutBlockFlow SPAN id='t1'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV",
+      "reason": "background obscuration change"
+    },
+    {
+      "object": "LayoutBlockFlow SPAN id='t2' class='blue'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/clipped-relative-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/clipped-relative-expected.txt
index 975c18ea..13bf42e 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/clipped-relative-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/clipped-relative-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='inner'",
           "rect": [8, 70, 204, 232],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 70, 204, 232],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
index ce5ebd7a..ae64ed7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt

@@ -21,11 +21,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV class='child'",
-          "rect": [-30, -30, 50, 50],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='composited-box'",
           "rect": [0, 0, 10, 60],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
index 991af30..31494657 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-columns-repaint-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutGrid DIV class='grid min-content'",
           "rect": [8, 48, 250, 50],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='sizedToGridArea'",
-          "rect": [58, 48, 50, 50],
-          "reason": "incremental"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
index 8730123..7f93e67b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/css-grid-layout/grid-element-change-rows-repaint-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutGrid DIV class='grid fit-content'",
           "rect": [8, 48, 100, 150],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='sizedToGridArea'",
-          "rect": [8, 98, 100, 50],
-          "reason": "incremental"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-cell-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-cell-expected.txt
index dcb65bb6..677aa16 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-cell-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-cell-expected.txt

@@ -12,11 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [0, 0, 350, 350],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTableCell (anonymous)",
           "rect": [200, 200, 100, 100],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-expected.txt
index 4c7d66b..4247163 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-expected.txt

@@ -12,16 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
-          "rect": [100, 100, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutTableCell (anonymous)",
           "rect": [100, 100, 100, 100],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-zindex-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-zindex-expected.txt
index 937b655a..10b1239 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-zindex-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-table-overflow-zindex-expected.txt

@@ -12,11 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
           "rect": [100, 100, 100, 100],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt
index 3d89906..104631e 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt

@@ -22,11 +22,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='fixed blue'",
-          "rect": [8, 208, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
           "rect": [8, 200, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/repaint-expected.txt
new file mode 100644
index 0000000..87ec0cf2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/repaint-expected.txt

@@ -0,0 +1,139 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='content'",
+          "rect": [138, 116, 654, 90],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='content'",
+          "rect": [148, 116, 644, 108],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='content'",
+          "rect": [148, 116, 644, 108],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='content'",
+          "rect": [400, 116, 392, 162],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='left'",
+          "rect": [8, 224, 392, 54],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='left'",
+          "rect": [148, 116, 252, 162],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='left'",
+          "rect": [8, 206, 140, 18],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='left'",
+          "rect": [138, 116, 10, 108],
+          "reason": "incremental"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='left'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='content'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'id, faucibus id quam.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='left'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='content'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
index 4b95868..5b22583 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/flexbox/scrollbars-changed-expected.txt

@@ -19,11 +19,6 @@
         {
           "object": "LayoutText #text",
           "rect": [0, 5, 15, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [0, 5, 15, 15],
           "reason": "layoutObject removal"
         }
       ]

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/gradients-em-stops-repaint-expected.txt
new file mode 100644
index 0000000..690f766
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/gradients-em-stops-repaint-expected.txt

@@ -0,0 +1,48 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV class='em-units'",
+          "rect": [8, 8, 784, 146],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV class='em-units'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='box3' class='box'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='box4' class='box'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='indicator'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/inline-outline-repaint-2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/inline-outline-repaint-2-expected.txt
index d613eeadd..13de1b3b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/inline-outline-repaint-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/inline-outline-repaint-2-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN",
           "rect": [210, -5, 50, 20],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [215, 0, 40, 10],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/inline-reflow-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/inline-reflow-expected.txt
index c509ebe..927f9a7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/inline-reflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/inline-reflow-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [0, 0, 300, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='div2' class='container'",
           "rect": [0, 300, 300, 20],
           "reason": "forced by layout"
@@ -25,16 +20,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='div1' class='container'",
           "rect": [0, 0, 200, 300],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [0, 0, 200, 300],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [0, 300, 180, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/inline-relative-positioned-expected.txt
index d704f4b..a4893dd7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/inline-relative-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/inline-relative-positioned-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [8, 88, 100, 100],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 88, 100, 100],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt
index a60dfc36..850f5b69 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/insert-frame-expected.txt

@@ -12,24 +12,9 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutIFrame IFRAME",
-          "rect": [0, 0, 104, 104],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [2, 2, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [2, 2, 100, 100],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow BODY",
-          "rect": [10, 10, 84, 84],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-relative-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-relative-expected.txt
new file mode 100644
index 0000000..e6cedc4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-relative-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='target'",
+          "rect": [8, 150, 784, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset-expected.txt
new file mode 100644
index 0000000..3c15a7a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [100, 118, 50, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset2-expected.txt
new file mode 100644
index 0000000..f7c5e26
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset2-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [102, 120, 50, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset3-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset3-expected.txt
new file mode 100644
index 0000000..20329ab
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/layout-state-scrolloffset3-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [100, 118, 34, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/line-in-scrolled-clipped-block-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
new file mode 100644
index 0000000..0f458d1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/line-in-scrolled-clipped-block-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [8, 8, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox '                         PASS     .'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/lines-with-layout-delta-expected.txt
new file mode 100644
index 0000000..abd9a24
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/lines-with-layout-delta-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (floating) DIV id='target'",
+          "rect": [8, 58, 200, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-expected.txt
index f0b7d56..61b805c 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='target'",
           "rect": [0, 580, 80, 20],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [0, 580, 80, 20],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt
index b35e2e8..e79f7b34 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='target'",
           "rect": [508, 28, 80, 20],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [508, 28, 80, 20],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-block-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-block-expected.txt
index 0be81a2..d569c2b7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/multicol-with-block-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [488, 8, 150, 20],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [488, 8, 80, 20],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/outline-clip-change-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/outline-clip-change-expected.txt
new file mode 100644
index 0000000..493a20a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/outline-clip-change-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
+          "rect": [48, 102, 92, 23],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'Lorem Ipsum'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt
index 1d7d279b..bc3c3f1 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -12,16 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 8, 300, 300],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 8, 300, 300],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='innerDiv'",
           "rect": [762, 8, 15, 300],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-delete-line-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-delete-line-expected.txt
new file mode 100644
index 0000000..a20252c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-delete-line-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='dv'",
+          "rect": [8, 70, 80, 36],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='dv'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'Lorem ipsu'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
index af7f859..e21dab6 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutBlockFlow DIV class='innerWrapper'",
           "rect": [8, 18, 100, 190],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='red'",
-          "rect": [8, 18, 100, 190],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='ucp' class='green'",
-          "rect": [8, 18, 100, 190],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt
index 35c9ba28..d8719f5 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt

@@ -32,11 +32,6 @@
           "object": "LayoutBlockFlow DIV",
           "rect": [1, 601, 100, 100],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [1, 201, 100, 100],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
index 47d9d336..a7cb8b0 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt

@@ -35,11 +35,6 @@
         },
         {
           "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [1, 201, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
           "rect": [1, 689, 88, 12],
           "reason": "scroll"
         },

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
index 1d7d279b..bc3c3f1 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -12,16 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 8, 300, 300],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 8, 300, 300],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='innerDiv'",
           "rect": [762, 8, 15, 300],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-content-size-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-content-size-expected.txt
index c4d681d..7dcbeb8c 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-content-size-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-content-size-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
           "rect": [0, 0, 140, 140],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='inner'",
-          "rect": [20, 220, 100, 100],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='inner'",
-          "rect": [0, 200, 100, 100],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-visual-size-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-visual-size-expected.txt
index 72637310..c14e3e2b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-visual-size-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/padding-keeping-visual-size-expected.txt

@@ -12,11 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow DIV class='inner'",
-          "rect": [0, 200, 100, 100],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
           "rect": [0, 0, 100, 100],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/positioned-list-offset-change-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
index 1a867151..71ffbcba 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/positioned-list-offset-change-repaint-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutListItem (positioned) LI",
           "rect": [8, 60, 214, 236],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 60, 214, 232],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/reflection-repaint-test-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/reflection-repaint-test-expected.txt
index 93ee8bef..c5041d26 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/reflection-repaint-test-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/reflection-repaint-test-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [22, 50, 226, 167],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 51, 71, 109],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt
index 3b2516b..611b20ce 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt

@@ -12,19 +12,9 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'",
-          "rect": [0, 200, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='inline-block-1' class='item'",
           "rect": [0, 100, 100, 100],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'",
-          "rect": [0, 100, 100, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/resize-scrollable-iframe-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/resize-scrollable-iframe-expected.txt
index aa5b644..e2c0dac 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/resize-scrollable-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/resize-scrollable-iframe-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutIFrame IFRAME id='iframe'",
-          "rect": [8, 108, 300, 300],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [8, 193, 285, 200],
           "reason": "incremental"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/ruby-flipped-blocks-expected.txt
index 0d5573a..07d92ba 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/ruby-flipped-blocks-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/ruby-flipped-blocks-expected.txt

@@ -12,27 +12,12 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutRubyBase (anonymous)",
-          "rect": [8, 28, 20, 20],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutRubyRun (anonymous)",
           "rect": [8, 28, 20, 20],
           "reason": "forced by layout"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 28, 20, 20],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 8, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [28, 33, 10, 10],
           "reason": "style change"
         }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt
index 03eb4e6f..81f07f4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [250, 230, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
           "rect": [250, 230, 100, 100],
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='relative reflected'",
-          "rect": [250, 230, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow DIV class='green'",
           "rect": [250, 230, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
index a9df748..d8ca61c4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
-          "rect": [677, 250, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
           "rect": [677, 250, 100, 100],
           "reason": "subtree"
@@ -32,11 +27,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
-          "rect": [677, 50, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
           "rect": [677, 50, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt
index 28ae4a6e..8ded1c13 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [100, 1150, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
           "rect": [100, 1150, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt
index 20a9c14c..a5121f9 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt

@@ -7,16 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'",
-          "rect": [250, 280, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [250, 280, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
           "rect": [250, 280, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.png
index 7a78d2d..29745472 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
index 7f67f9f0..50f53e75 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt

@@ -7,16 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [93, 234, 142, 143],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [93, 234, 142, 143],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
           "rect": [93, 234, 142, 143],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-clipped-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-clipped-layer-expected.txt
index 38ad5852..880cb1c 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-clipped-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-clipped-layer-expected.txt

@@ -7,19 +7,9 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [100, 150, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
           "rect": [100, 150, 100, 100],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='relative green'",
-          "rect": [100, 150, 100, 100],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-fixed-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-fixed-layer-expected.txt
index 2319fc1..82f5b72 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-fixed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-fixed-layer-expected.txt

@@ -7,16 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [100, 1150, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [100, 1150, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
           "rect": [100, 1150, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.png
index 7bf57fee..5782ec4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.txt
index f28d763f..b4ef93b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-in-transformed-layer-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [79, 129, 142, 142],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped rotated'",
           "rect": [79, 129, 142, 142],
           "reason": "subtree"
@@ -20,11 +15,6 @@
           "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
           "rect": [114, 129, 107, 36],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [100, 150, 100, 100],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-inside-table-cell-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-inside-table-cell-expected.txt
index 80456fce..79b29b00 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-inside-table-cell-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-inside-table-cell-expected.txt

@@ -12,16 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [314, 114, 435, 450],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
-          "rect": [314, 114, 435, 450],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
           "rect": [314, 564, 435, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt
index d4421e6f..e81ebc4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt

@@ -12,16 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [1114, 1314, 435, 450],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
-          "rect": [1114, 1314, 435, 450],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
           "rect": [1114, 1764, 435, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
index d11313f..eda56fd 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

@@ -19,19 +19,9 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV id='recentlink'",
-          "rect": [10, 1824, 150, 150],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
           "rect": [10, 1424, 150, 150],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='recentlink'",
-          "rect": [10, 1424, 150, 150],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.png
index 7bf57fee..5782ec4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.txt
index 4c97c25..93fd1c3 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/scroll-with-transformed-parent-layer-expected.txt

@@ -7,16 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
-          "rect": [79, 129, 142, 142],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
-          "rect": [79, 129, 142, 142],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
           "rect": [79, 129, 142, 142],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt
index 16c08a5..8649a60 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt

@@ -27,21 +27,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [10, 88, 728, 90],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [10, 88, 728, 90],
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow BODY",
-          "rect": [18, 96, 712, 74],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutImage IMG",
           "rect": [58, 230, 489, 537],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
index 18e3373..9119a14 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTableCell TH id='target'",
           "rect": [8, 68, 840, 190],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 68, 836, 190],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
index b71f204b..5c6d587a 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [42, 117, 334, 268],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [42, 117, 334, 268],
           "reason": "SVG resource change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [42, 117, 334, 268],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGEllipse circle",
           "rect": [242, 251, 167, 200],
           "reason": "bounds change"
@@ -47,21 +37,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [17, 217, 84, 68],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [17, 217, 84, 68],
           "reason": "SVG resource change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [17, 217, 84, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGEllipse circle",
           "rect": [67, 251, 42, 67],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
index b40526b..dfd82ff1 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/absolute-sized-document-no-scrollbars-expected.txt

@@ -7,19 +7,9 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 0, 576, 432],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGRoot svg",
           "rect": [0, 0, 576, 432],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 0, 480, 360],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/animate-path-morphing-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/animate-path-morphing-expected.png
index 0b9a058..121dbed0 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/animate-path-morphing-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/animate-path-morphing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/container-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/container-repaint-expected.txt
index 89d73c7a3..ec37d19 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/container-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/container-repaint-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 100, 100, 50],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='mover'",
           "rect": [0, 100, 100, 50],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 50, 100, 50],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='mover'",
           "rect": [0, 50, 100, 50],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
index e484f81..5ed6a567 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 600],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [0, 0, 402, 202],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
index 94c0b7e..b9c5656 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutSVGContainer use id='use'",
           "rect": [0, 0, 100, 100],
           "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect id='rect'",
-          "rect": [0, 0, 100, 100],
-          "reason": "location change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/fill-opacity-update-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/fill-opacity-update-expected.png
index 3684843d..7b9e386 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/fill-opacity-update-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/fill-opacity-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-child-repaint-expected.txt
index 69f28641..74d764c7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-child-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-child-repaint-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutSVGContainer g",
           "rect": [0, 0, 106, 106],
           "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGRect rect id='poke'",
-          "rect": [32, 32, 64, 64],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-refresh-expected.txt
index 2385e606..4b77133 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-refresh-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/filter-refresh-expected.txt

@@ -33,21 +33,6 @@
         },
         {
           "object": "LayoutSVGContainer g",
-          "rect": [90, 170, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [90, 130, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [90, 90, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
           "rect": [90, 90, 36, 36],
           "reason": "SVG resource change"
         },
@@ -58,36 +43,11 @@
         },
         {
           "object": "LayoutSVGContainer g",
-          "rect": [90, 50, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [50, 170, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [50, 130, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
           "rect": [50, 90, 36, 36],
           "reason": "SVG resource change"
         },
         {
           "object": "LayoutSVGContainer g",
-          "rect": [50, 90, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [50, 50, 36, 36],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGContainer g",
           "rect": [50, 50, 36, 36],
           "reason": "SVG resource change"
         },
@@ -102,11 +62,6 @@
           "reason": "SVG resource change"
         },
         {
-          "object": "LayoutSVGRect rect id='separate1'",
-          "rect": [140, 60, 30, 30],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGRect rect id='rect'",
           "rect": [90, 170, 30, 30],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/foreign-object-repaint-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/foreign-object-repaint-expected.png
index 63a4df5b..12bbdd3 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/foreign-object-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/foreign-object-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/image-with-clip-path-expected.txt
index a0fe8056..952f7ba0 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/image-with-clip-path-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/image-with-clip-path-expected.txt

@@ -27,26 +27,11 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGImage image",
-          "rect": [20, 20, 60, 60],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGImage image",
-          "rect": [20, 20, 60, 60],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGContainer g id='g'",
           "rect": [175, 25, 50, 50],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGImage image",
-          "rect": [175, 25, 50, 50],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGRect rect id='r'",
           "rect": [175, 25, 50, 50],
           "reason": "subtree"
@@ -55,11 +40,6 @@
           "object": "LayoutSVGContainer g id='g'",
           "rect": [0, 0, 10, 10],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGImage image",
-          "rect": [0, 0, 10, 10],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
index 9a52d15..2d0baa0 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 0, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner'",
           "rect": [0, 0, 200, 200],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
index 0830470..8d5a18da 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 0, 100, 100],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='s'",
           "rect": [0, 0, 100, 100],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
new file mode 100644
index 0000000..c74c1800
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

@@ -0,0 +1,56 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner'",
+          "rect": [0, 0, 200, 200],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'right-aligned text'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath polygon id='triangle'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.png
index 84200ef..a355b9c 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
index 11db7d5..58eb6ab4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/invalidate-on-child-layout-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutSVGContainer g",
           "rect": [0, 0, 110, 110],
           "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGEllipse circle id='circle'",
-          "rect": [50, 50, 100, 100],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGEllipse circle id='circle'",
-          "rect": [0, 0, 100, 100],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.png
index 5bd392a..d845efc 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-and-object-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-creation-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-creation-expected.png
index 5bd392a..d845efc 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-late-marker-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-container-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-container-expected.txt
index 193f53f..2a684b4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-container-expected.txt

@@ -13,11 +13,6 @@
         },
         {
           "object": "LayoutSVGRect rect",
-          "rect": [0, 0, 76, 76],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGRect rect",
           "rect": [-1, -1, 41, 41],
           "reason": "subtree"
         }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-changes-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-changes-expected.png
index 97a6a03..526a9b18 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-removal-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-removal-expected.png
index 7a432c6e..6097ca8 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-removal-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-polygon-removal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-addition-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-addition-expected.png
index dd652de..8587398 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-addition-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-addition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-changes-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-changes-expected.png
index dd652de..8587398 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/js-update-transform-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-css-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-css-expected.png
index 4bbdefaf..e8de613 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-css-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-expected.png
index 4bbdefaf..e8de613 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-child-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-strokeWidth-changes-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-strokeWidth-changes-expected.png
index 4bbdefaf..e8de613 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-strokeWidth-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-strokeWidth-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-viewBox-changes-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-viewBox-changes-expected.png
index 4bbdefaf..e8de613 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-viewBox-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/marker-viewBox-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/mask-clip-target-transform-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/mask-clip-target-transform-expected.png
index 2aa2106..d011a1b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/mask-clip-target-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/mask-clip-target-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
index fd7d6e4..618878d2 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

@@ -12,31 +12,16 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [0, 0, 402, 202],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow BODY",
           "rect": [1, 1, 400, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [1, 1, 400, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 285, 135],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [0, 0, 285, 135],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [0, 135, 285, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
index fd7d6e4..618878d2 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

@@ -12,31 +12,16 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [0, 0, 402, 202],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow BODY",
           "rect": [1, 1, 400, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [1, 1, 400, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 285, 135],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject OBJECT",
-          "rect": [0, 0, 285, 135],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [0, 135, 285, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
index fcfdf499..6ea381fa 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt

@@ -12,29 +12,9 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutEmbeddedObject object",
-          "rect": [9, 9, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [9, 9, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGRoot svg",
           "rect": [9, 9, 400, 400],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGEllipse circle",
-          "rect": [169, 169, 80, 80],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGEllipse circle",
-          "rect": [89, 189, 40, 40],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.png
index 1e5e925b..fcbd87a6 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.txt
index 0762d8c..7d259ef 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/paintorder-filtered-expected.txt

@@ -37,11 +37,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutSVGPath polygon id='t3'",
-          "rect": [319, 165, 135, 134],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGPath polygon",
           "rect": [46, 165, 135, 134],
           "reason": "style change"
@@ -52,16 +47,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutSVGViewportContainer svg id='poly'",
-          "rect": [47, 166, 133, 132],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='poly'",
-          "rect": [184, 166, 132, 132],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGEllipse circle id='t4'",
           "rect": [46, 28, 7, 7],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-expected.txt
index 39e6dc21..83a6f49 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 68, 402, 402],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRect rect id='targetRect'",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
index 81243c31..19a33c4 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt

@@ -13,23 +13,8 @@
         },
         {
           "object": "LayoutSVGEllipse circle",
-          "rect": [48, 108, 322, 322],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [48, 108, 322, 322],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGEllipse circle",
           "rect": [8, 151, 102, 236],
           "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 151, 100, 236],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
index 554d1f4..772e869e 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

@@ -17,21 +17,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [209, 269, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [209, 269, 200, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [209, 269, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [109, 169, 200, 200],
           "reason": "bounds change"
@@ -52,21 +42,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [59, 269, 50, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [59, 269, 50, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [59, 269, 50, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [34, 169, 50, 200],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-image-expected.txt
index b877f187..f22ab8aa 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-image-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-image-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 68, 402, 402],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGImage image",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
index cb5af87..f0d816e 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

@@ -17,29 +17,9 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [27, 67, 364, 364],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [27, 67, 364, 364],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [13, 205, 92, 91],
           "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [13, 205, 92, 91],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [13, 205, 92, 91],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
index 6cb9baaf..17c9701 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

@@ -12,16 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [209, 269, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [209, 269, 200, 200],
           "reason": "forced by layout"
@@ -37,11 +27,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [9, 69, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [9, 69, 200, 200],
           "reason": "bounds change"
@@ -62,11 +47,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [59, 269, 50, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [59, 269, 50, 200],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
index 266a46ac..87b130f7 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

@@ -12,16 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [9, 69, 400, 400],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 69, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
           "rect": [9, 69, 400, 400],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
index 38d1145..4617d80f 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [45, 85, 328, 328],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [45, 85, 328, 328],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [45, 85, 328, 328],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [45, 85, 328, 328],
           "reason": "bounds change"
@@ -37,21 +27,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [18, 209, 82, 83],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [18, 209, 82, 83],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [18, 209, 82, 83],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [18, 209, 82, 83],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
index 99cb27d..675271d 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [27, 67, 364, 364],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [27, 67, 364, 364],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [27, 67, 364, 364],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [27, 67, 364, 364],
           "reason": "bounds change"
@@ -37,21 +27,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [13, 205, 92, 91],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [13, 205, 92, 91],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [13, 205, 92, 91],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [13, 205, 92, 91],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.png
index 98e45a6..0093e74 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.txt
index 5c219274..d8ba754 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/repaint-paintorder-expected.txt

@@ -37,21 +37,11 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutSVGViewportContainer svg id='poly'",
-          "rect": [47, 166, 133, 132],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGContainer use id='t2'",
           "rect": [184, 166, 132, 132],
           "reason": "style change"
         },
         {
-          "object": "LayoutSVGViewportContainer svg id='poly'",
-          "rect": [184, 166, 132, 132],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGEllipse circle id='t4'",
           "rect": [46, 28, 7, 7],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-client-removal-expected.txt
index 554193b..42cce16 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-client-removal-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-client-removal-expected.txt

@@ -9,31 +9,6 @@
         {
           "object": "LayoutSVGContainer g",
           "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [0, 0, 100, 100],
           "reason": "layoutObject removal"
         },
         {
@@ -134,31 +109,6 @@
         {
           "object": "LayoutSVGPath path id='hp'",
           "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='hp'",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='hp'",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='hp'",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='hp'",
-          "rect": [0, 0, 100, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='hp'",
-          "rect": [0, 0, 100, 100],
           "reason": "layoutObject removal"
         },
         {

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.png
index 1f00cbbc..731c48b8 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/resource-invalidate-on-target-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/stroke-opacity-update-expected.png b/third_party/WebKit/LayoutTests/paint/invalidation/svg/stroke-opacity-update-expected.png
index 1b184c3..1749b82 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/stroke-opacity-update-expected.png
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/stroke-opacity-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/svg-image-change-content-size-expected.txt
index 328806e..e66d5d8 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/svg-image-change-content-size-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/svg-image-change-content-size-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 50, 602, 422],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage img",
-          "rect": [9, 51, 420, 420],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-foreign-object-expected.txt
index d051621..3c54f9d 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-foreign-object-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-foreign-object-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [108, 8, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGForeignObject foreignObject",
           "rect": [108, 8, 100, 100],
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 8, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGForeignObject foreignObject",
           "rect": [8, 8, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-text-element-expected.txt
index 9b8351f2..8368667 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-text-element-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/transform-text-element-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [8, 58, 400, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [8, 58, 400, 100],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [8, 8, 400, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [8, 8, 400, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
index fd49df3d..2e34e650 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-disappears-after-style-update-expected.txt

@@ -14,11 +14,6 @@
         {
           "object": "LayoutSVGRect rect id='rect'",
           "rect": [50, 10, 30, 30],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='rect'",
-          "rect": [50, 10, 30, 30],
           "reason": "layoutObject removal"
         },
         {

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-inherit-style-expected.txt
index 4b166e4b4..c41e21c1b 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-inherit-style-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-inherit-style-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutSVGContainer g id='g'",
           "rect": [0, 0, 100, 60],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [0, 0, 100, 60],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutSVGRect rect id='rect'",
-          "rect": [0, 0, 100, 60],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-setAttribute-crash-expected.txt
index bc87857..0c86606 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-setAttribute-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/use-setAttribute-crash-expected.txt

@@ -17,21 +17,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer svg:use id='use'",
-          "rect": [33, 33, 50, 50],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRoot svg:svg id='svg'",
-          "rect": [33, 33, 50, 50],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='symbol'",
-          "rect": [33, 33, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGEllipse svg:circle id='circle'",
           "rect": [7, 7, 27, 27],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/svg/window-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/svg/window-expected.txt
new file mode 100644
index 0000000..bad1567d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/svg/window-expected.txt

@@ -0,0 +1,1359 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='Windows'",
+          "rect": [38, 81, 760, 454],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g id='Windows'",
+          "rect": [38, 92, 760, 443],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [38, 142, 549, 394],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='titleBarbigWindow'",
+          "rect": [38, 142, 549, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [38, 523, 549, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [77, 181, 315, 238],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
+          "rect": [77, 181, 315, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [77, 406, 315, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='navWindow'",
+          "rect": [613, 81, 185, 169],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
+          "rect": [613, 81, 185, 159],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
+          "rect": [613, 81, 185, 159],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [624, 92, 174, 159],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [77, 195, 174, 143],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
+          "rect": [77, 195, 174, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [624, 238, 174, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [77, 325, 174, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [311, 377, 159, 143],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
+          "rect": [311, 377, 159, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [311, 507, 159, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [249, 343, 143, 65],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
+          "rect": [249, 343, 143, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [38, 475, 120, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [615, 99, 12, 11],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [571, 145, 12, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [571, 145, 12, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [235, 197, 12, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [235, 197, 12, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [616, 83, 11, 12],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [616, 83, 11, 12],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [376, 345, 11, 12],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [782, 94, 11, 11],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [782, 94, 11, 11],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [782, 94, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [782, 94, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
+          "rect": [769, 94, 11, 11],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [769, 94, 11, 11],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [769, 94, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [558, 145, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [454, 379, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [454, 379, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [441, 379, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [376, 184, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [376, 184, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [363, 184, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [222, 197, 11, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [545, 153, 11, 3],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [363, 354, 11, 3],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [756, 103, 11, 2],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [756, 103, 11, 2],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [209, 206, 11, 2],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
+          "rect": [783, 95, 10, 10],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
+          "rect": [616, 100, 10, 10],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
+          "rect": [616, 84, 10, 10],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
+          "rect": [616, 116, 10, 9],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [616, 123, 10, 3],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [350, 192, 10, 3],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [428, 388, 10, 2],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
+          "rect": [757, 95, 9, 10],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [-1, 21, 7, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [-1, 21, 7, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [-1, 21, 7, 11],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath line",
+          "rect": [-1, 29, 6, 3],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 22, 5, 9],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 22, 5, 9],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGHiddenContainer symbol id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGHiddenContainer symbol id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGHiddenContainer symbol id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='Windows'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='navWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='textNavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This window should'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'contain navigation tools'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Click on button'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ''Resize Navigation Window' for a'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'random resize of this Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Note that this window also'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'features a window decoration'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Statusbar'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='bigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This is a big movable window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='nestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This window contains other windows'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='colourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Changing a colour changes background'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupcolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Colour Picker'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='statusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupstatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='textStatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This is a none-moveable'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'none-closeable status'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Status Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Nested middlesize Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtonnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='smallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='textSmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This window has a callback'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'function indicating mouse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'movements in the statusbar'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'and alerting window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'events'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Callback function is active'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Small Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtonsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='minimalWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowMainGroupminimalWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='textMinimalWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'This is a minimal window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'without title and status bar.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'it is also not moveable'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupminimalWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='titleBarbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Big Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtonbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='Windows'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='navWindow'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Navigation Window'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='closeButton'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath line",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table-outer-border-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table-outer-border-expected.txt
index b06d1cb..1180387 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table-outer-border-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table-outer-border-expected.txt

@@ -39,31 +39,16 @@
         {
           "object": "LayoutTableSection TBODY",
           "rect": [15, 15, 117, 134],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableSection TBODY",
-          "rect": [15, 15, 117, 134],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutTableRow TR",
           "rect": [15, 82, 117, 67],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [15, 82, 117, 67],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutTableRow TR",
           "rect": [15, 15, 117, 67],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [15, 15, 117, 67],
           "reason": "layoutObject removal"
         }
       ]

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
index bf51a4b9..1b48f30 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutTable TABLE",
-          "rect": [8, 8, 306, 300],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTableRow TR",
           "rect": [8, 8, 306, 300],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
index bf51a4b9..1b48f30 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutTable TABLE",
-          "rect": [8, 8, 306, 300],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTableRow TR",
           "rect": [8, 8, 306, 300],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table-row-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table-row-expected.txt
index a401d9f..431c6fb71 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table-row-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table-row-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTableRow TR id='target' class='green'",
           "rect": [8, 10, 106, 100],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [10, 10, 102, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
index ba69534..ad713c61 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-collapse-to-separate-expected.txt

@@ -12,26 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [8, 8, 220, 112],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [8, 10, 220, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [9, 9, 209, 105],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [118, 10, 108, 108],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutTableCell TD",
           "rect": [112, 8, 108, 108],
           "reason": "style change"
@@ -40,11 +20,6 @@
           "object": "LayoutTableCell TD",
           "rect": [8, 8, 107, 108],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [10, 10, 106, 108],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
index 18cc801..8efc456 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.txt

@@ -12,26 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [8, 8, 220, 112],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [8, 10, 220, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [9, 9, 209, 105],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [118, 10, 108, 108],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutTableCell TD",
           "rect": [112, 8, 108, 108],
           "reason": "style change"
@@ -40,11 +20,6 @@
           "object": "LayoutTableCell TD",
           "rect": [8, 8, 107, 108],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [10, 10, 106, 108],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
new file mode 100644
index 0000000..0506432
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt

@@ -0,0 +1,85 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [0, 292, 106, 236],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [0, 100, 106, 190],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [0, 102, 106, 46],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 52, 102, 238],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 292, 102, 236],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 102, 102, 46],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'ROW1'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'ROW2'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
new file mode 100644
index 0000000..67824c9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 52, 102, 476],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'MIDDLE'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-row-repaint-expected.txt
new file mode 100644
index 0000000..e383d20
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/table/resize-table-row-repaint-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 102, 102, 200],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'MIDDLE'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/textarea-set-disabled-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/textarea-set-disabled-expected.txt
index 1fe9d5a..380908f 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/textarea-set-disabled-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/textarea-set-disabled-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTextControl TEXTAREA",
           "rect": [8, 8, 106, 106],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 100, 10],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/transform-layout-repaint-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/transform-layout-repaint-expected.txt
new file mode 100644
index 0000000..ba37313
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/transform-layout-repaint-expected.txt

@@ -0,0 +1,36 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [40, 50, 208, 118],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length1-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length1-expected.txt
index d5165bed..e44c3aad 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length1-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length1-expected.txt

@@ -10,31 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 154],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [20, 0, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 130, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 100, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 130, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 100, 20, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length2-expected.txt
index d0a82cf7..d0834ee 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length2-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align-length2-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 204],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [300, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 80, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 50, 100, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align1-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align1-expected.txt
index 767c886..2562c51 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align1-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align1-expected.txt

@@ -10,31 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 104],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [20, 0, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 80, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 34, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 80, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 34, 20, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align2-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align2-expected.txt
index 67a4ee39..52fd8a78 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align2-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/vertical-align2-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 246],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [300, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 146, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 100, 100, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt b/third_party/WebKit/LayoutTests/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt
index 73762ea..ecd65fc 100644
--- a/third_party/WebKit/LayoutTests/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt

@@ -15,21 +15,6 @@
           "object": "LayoutView #document",
           "rect": [0, 250, 600, 250],
           "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='parent'",
-          "rect": [0, 0, 6, 500],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 250, 6, 30],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 125, 6, 30],
-          "reason": "forced by layout"
         }
       ]
     }
@@ -74,16 +59,6 @@
           "object": "LayoutView #document",
           "rect": [400, 0, 200, 250],
           "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='parent'",
-          "rect": [0, 0, 6, 250],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 125, 6, 30],
-          "reason": "forced by layout"
         }
       ]
     }
@@ -128,21 +103,6 @@
           "object": "LayoutView #document",
           "rect": [0, 250, 400, 350],
           "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='parent'",
-          "rect": [0, 0, 6, 600],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 300, 6, 30],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 125, 6, 30],
-          "reason": "forced by layout"
         }
       ]
     }
@@ -187,16 +147,6 @@
           "object": "LayoutView #document",
           "rect": [400, 0, 400, 600],
           "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='parent'",
-          "rect": [0, 0, 6, 600],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
-          "rect": [0, 300, 6, 30],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
index 73bff4e..a7d53706 100644
--- a/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
index a3b305b..6e022ff0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
index 0486cac..309d0f1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
index 40a1fd92..1c8907876 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
index d4ab144..b817ee0f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
index 4f621ad..7d0d8b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-added-filters-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-added-filters-expected.png
index 48fb91e..4c8e7b03 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-added-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-removed-filters-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-removed-filters-expected.png
index cad9ba8..36c81f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-removed-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/masks/mask-with-removed-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index 8034a4d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-filter-expected.png
index f8537de8..e8b2ead8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-small-content-rect-expected.png
index efe0d5d..f7344ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/nested-border-radius-clipping-expected.png
index 7f8558c..9bd0264 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scaled-mask-expected.png
index c12706a..8ab4ac04 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/tiled-mask-expected.png
index 496f182..233ef91e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed-expected.png
index 93466ba..f40a79e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed2-expected.png
index 5f380ca..de8ed74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/nested-reflection-transformed2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/reflection-in-composited-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/reflection-in-composited-expected.png
index 4b35ca9..25a3603 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/reflection-in-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/compositing/reflections/reflection-in-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/comments-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/comments-expected.png
index 5b35bda..f21bfbfe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/comments-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/comments-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/containment-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/containment-expected.png
index bf37bb3..c92c865a6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/containment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/containment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/contextual_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/contextual_selectors-expected.png
index 05f989c4..22ea61c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/contextual_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/contextual_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/grouping-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/grouping-expected.png
index 6718a9f..1f9cdde 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/grouping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/grouping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/id_as_selector-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/id_as_selector-expected.png
index b9bb472..a9598ca7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/id_as_selector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/id_as_selector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/inheritance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/inheritance-expected.png
index 6c188ba..8b2c4337 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/basic/inheritance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/basic/inheritance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border-expected.png
index e7c13311..137b6d3d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom-expected.png
index afe6873..edc83b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_inline-expected.png
index 86aae170..3e50be7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width-expected.png
index 20ff9099..d6cf4f0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width_inline-expected.png
index 63c397c..db83786 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_bottom_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color-expected.png
index 3bc98be6..1ef5f01 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color_inline-expected.png
index 343f51f..f9c1ef64 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_color_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_inline-expected.png
index c09955d..0447e5d4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left-expected.png
index b9e95ff7..3fe6ca6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_inline-expected.png
index 34b2e13..84f93e5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width-expected.png
index ab42d8a..115d1803 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width_inline-expected.png
index d79f600e..c9066e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_left_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right-expected.png
index 32c78bf..44b0277 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_inline-expected.png
index 83ffdece..1a0820a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width-expected.png
index 5628e51..905bb80 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width_inline-expected.png
index 4e0c1c77aa..6b91ffc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_right_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style-expected.png
index e750a4f..9491a3b1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style_inline-expected.png
index 9664fc74..a086237 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_style_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top-expected.png
index d337775..1274b4b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_inline-expected.png
index c497a88..fd6fbe2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width-expected.png
index 404d822..4992af1e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width_inline-expected.png
index da73f1ea3..6338adc6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_top_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width-expected.png
index 6b41c9a..9ebc1b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width_inline-expected.png
index a17ddd9..7fe84e2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/border_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear-expected.png
index d4a64ee5..bb2b0e6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear_float-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear_float-expected.png
index 4b54a14..df00975 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear_float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/clear_float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float-expected.png
index e92bd14..fea3b6b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_elements_in_series-expected.png
index c914c16e..fe93a1a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_margin-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_margin-expected.png
index 9e6515c3..b20f8d7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_on_text_elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_on_text_elements-expected.png
index 23a0cc7d..6e08f64 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_on_text_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/float_on_text_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/height-expected.png
index 449b8884e..db4ded13 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin-expected.png
index 9202a6f1..c111742 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom-expected.png
index f3beb89..f7e2ba46 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom_inline-expected.png
index e7c0614..ddb0dbe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_inline-expected.png
index 2eb99a9..753778f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left-expected.png
index c948f3fe..f9abc35 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left_inline-expected.png
index a9426e2f..cc6e80e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right-expected.png
index e333aa8..72bbc95 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right_inline-expected.png
index 78bfb1ad..0f93033 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top-expected.png
index b592ba1..e7aa9ed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top_inline-expected.png
index 3c946fe0..6474160f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/margin_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding-expected.png
index c659652..1fa5f2f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom-expected.png
index 5fd4773..705f7f31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom_inline-expected.png
index 01eb8661..f2806eb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_inline-expected.png
index 59675e4..02bad50 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left-expected.png
index bf076d4..cbf6cea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left_inline-expected.png
index 4f3deca..6aad77c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right-expected.png
index 224f145..9ab843a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right_inline-expected.png
index 330b226..be8d27b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top-expected.png
index 5d632e7..02226b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top_inline-expected.png
index 8f44aae..8ed803b7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/padding_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/width-expected.png
index 047c023e..e4d164a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/box_properties/width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/cascade_order-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/cascade_order-expected.png
index 1f97c18..cb6e88b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/cascade_order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/cascade_order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/important-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/important-expected.png
index e1f9df6..d6ac117 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/important-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/cascade/important-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/display-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/display-expected.png
index 90ebb61f..5ae148bc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/display-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style-expected.png
index f5ca79e..24dd3f8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_image-expected.png
index e0e0076..a60ef8f12 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_position-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_position-expected.png
index b010156..3bcf811 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_type-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_type-expected.png
index 48cc3bb..3362b436 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/list_style_type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/white_space-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/white_space-expected.png
index 8f35f16..4dbe79c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/classification/white_space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/classification/white_space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background-expected.png
index 51f6c8ed..f1e5e6dc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_attachment-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_attachment-expected.png
index 1720209..e40bd5cb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_color-expected.png
index d5bde1a..59bac01 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_image-expected.png
index 561113b7972..1c57a43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_position-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_position-expected.png
index 740fd9cd..58a14119 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_repeat-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_repeat-expected.png
index e07ab2d..fc474c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/background_repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/color-expected.png
index 185d354..e916aba9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/color_and_background/color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.png
index f6f1137..e02a675 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_family-expected.png
index a88c827..74c57f72 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_size-expected.png
index 6f0f8b2..b7fc281 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_style-expected.png
index 853d2c5..f2c3b42 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_variant-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_variant-expected.png
index ea72a370..b7f614a5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_variant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_variant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_weight-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_weight-expected.png
index 2ca5128..394f164b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_weight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/font_properties/font_weight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/canvas-expected.png
index 606022f..c0d0bd1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/floating_elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/floating_elements-expected.png
index 29efc5c..348a7e46 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/floating_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/floating_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/height_of_lines-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/height_of_lines-expected.png
index 23fd4b5..a261d8f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/height_of_lines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/height_of_lines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/inline_elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/inline_elements-expected.png
index 7659df9..d7b7002 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/inline_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/inline_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/replaced_elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/replaced_elements-expected.png
index 1355d0ce..885597b4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/replaced_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/replaced_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.png
index 1a91917..0fdde1f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/anchor-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/anchor-expected.png
index 4065885..e5d8820 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/anchor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/anchor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstletter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstletter-expected.png
index baf19270..578485b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstletter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstletter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstline-expected.png
index 8c8591d4..7c8e9a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/multiple_pseudo_elements-expected.png
index cbf3087..0b970fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/pseudo_elements_in_selectors-expected.png
index 8c5c988ed..29e8946 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/pseudo_elements_in_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/letter_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/letter_spacing-expected.png
index 562b9b1..775e69f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/letter_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/letter_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/line_height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/line_height-expected.png
index 035e9db..6422e1e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/line_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/line_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_align-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_align-expected.png
index c9800f8..354cb61 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_decoration-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_decoration-expected.png
index 92b52db..0d09503 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_decoration-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_decoration-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_indent-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_indent-expected.png
index 5376b84..6fa7d7f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_indent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_indent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_transform-expected.png
index 7f4fa52..0f76e1c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/vertical_align-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/vertical_align-expected.png
index faa74766..b9260ec5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/vertical_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/vertical_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/word_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/word_spacing-expected.png
index 8195a7a..1087a23 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/word_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/text_properties/word_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/units/color_units-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/units/color_units-expected.png
index 0b17eb48..1c83337b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/units/color_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/units/color_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/units/length_units-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/units/length_units-expected.png
index cc8c9d34..baf489b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/units/length_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/units/length_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/units/percentage_units-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/units/percentage_units-expected.png
index 58d35071..ac55846 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/units/percentage_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/units/percentage_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/units/urls-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css1/units/urls-expected.png
index a1bc56d..f026705 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css1/units/urls-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css1/units/urls-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/margin-applies-to-010-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/margin-applies-to-010-expected.png
index c6e039e..064dab42 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/margin-applies-to-010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/margin-applies-to-010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-elements-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-elements-001-expected.png
index ac095305..39699458 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-elements-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-elements-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
index 2d66add3..c9eea77 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
index 6c42bc92..356b8198 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0505-c16-descendant-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0505-c16-descendant-01-e-expected.png
index 07fff5b..7327fdc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0505-c16-descendant-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0505-c16-descendant-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t050803-c14-classes-00-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t050803-c14-classes-00-e-expected.png
index af3e9ee..543653bf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t050803-c14-classes-00-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t050803-c14-classes-00-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0509-c15-ids-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0509-c15-ids-01-e-expected.png
index 5b7fe567..4ad15ca2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0509-c15-ids-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0509-c15-ids-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5518-brdr-t-01-e-expected.png
index d7327c13..a8f6b9e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5518-brdr-t-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5518-brdr-t-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5519-brdr-r-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5519-brdr-r-02-e-expected.png
index c87d729c..90fb4952 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5519-brdr-r-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5519-brdr-r-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5520-brdr-b-01-e-expected.png
index 926d002..6b71729 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5520-brdr-b-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5520-brdr-b-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5521-brdr-l-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5521-brdr-l-02-e-expected.png
index 9a3535c..35544b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5521-brdr-l-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t0805-c5521-brdr-l-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c563-list-type-00-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c563-list-type-00-b-expected.png
index 1cfed83e2..b7bfb91 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c563-list-type-00-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c563-list-type-00-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c564-list-img-00-b-g-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c564-list-img-00-b-g-expected.png
index 6c519bc..3deb19e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c564-list-img-00-b-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t1205-c564-list-img-00-b-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-04-d-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-04-d-expected.png
index 0e4cf29..3396b7c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-04-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-04-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-94-d-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-94-d-expected.png
index a5fb60c..238ae29 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-94-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css2.1/t170602-bdr-conflct-w-94-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/css3-modsel-33-expected.png
index b1e45f3..0bb0161c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-crash-expected.png
index d624c56..4aff4f1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-expected.png
index d624c56..4aff4f1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/flexbox/button-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/flexbox/button-expected.png
index 72049ff3..0371e82 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/flexbox/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/flexbox/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/clip-path-inset-corners-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/clip-path-inset-corners-expected.png
index ba0fd5d..2b56a4e1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/clip-path-inset-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/clip-path-inset-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-luminance-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-luminance-svg-expected.png
index 4bbfcbb..8540526d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-luminance-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-luminance-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-content-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-content-expected.png
index 0a2068d8..de6fac53 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-1-expected.png
index 8f050879..d02ccdc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-13-expected.png
index 1f8053a6..12e2c488 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-15-expected.png
index 2bc5707..6f879ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-22-expected.png
index 43e5dc2..d15c122 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-23-expected.png
index 45bc2e1..c961092 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-24-expected.png
index 13ad8af94..1979f5a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28-expected.png
index 8942621..d5bb3ad 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28b-expected.png
index 081a70f..d495946 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29-expected.png
index 6dd78580..c94fa99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29b-expected.png
index 05043bb5..6e09cfa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-32-expected.png
index 158f66c..45fa80f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-33-expected.png
index b1e45f3..0bb0161c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-3a-expected.png
index 615fbf96..b14307c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-68-expected.png
index 13ad8af94..1979f5a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-69-expected.png
index 45bc2e1..c961092 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73-expected.png
index c4fb8ac..3f540d73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73b-expected.png
index c4fb8ac..3f540d73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74-expected.png
index 4c8fcafc..7f99d74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74b-expected.png
index 4c8fcafc..7f99d74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/html/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-1-expected.png
index 8f050879..d02ccdc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-13-expected.png
index 1f8053a6..12e2c488 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-15-expected.png
index 2bc5707..6f879ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-22-expected.png
index 43e5dc2..d15c122 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-23-expected.png
index 45bc2e1..c961092 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-24-expected.png
index 13ad8af94..1979f5a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28-expected.png
index 8942621..d5bb3ad 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28b-expected.png
index 081a70f..d495946 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29-expected.png
index 6dd78580..c94fa99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29b-expected.png
index 05043bb5..6e09cfa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3-expected.png
index 2adcba1..a1abfa1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-32-expected.png
index 158f66c..45fa80f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-33-expected.png
index b1e45f3..0bb0161c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3a-expected.png
index 615fbf96..b14307c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-68-expected.png
index 13ad8af94..1979f5a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-69-expected.png
index 45bc2e1..c961092 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73-expected.png
index c4fb8ac..3f540d73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73b-expected.png
index c4fb8ac..3f540d73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74-expected.png
index 4c8fcafc..7f99d74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74b-expected.png
index 4c8fcafc..7f99d74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xhtml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-1-expected.png
index 911cbdf..f8d7219 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-13-expected.png
index 3489d278..3ea4d5d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-15-expected.png
index 8b817de8..f8043b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-22-expected.png
index f24547a..9d48346e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-23-expected.png
index 2d0d4e0d..a1443bcb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-24-expected.png
index 3bf4288b..12845a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28-expected.png
index 6616c0c..f427e47a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28b-expected.png
index d9729bc3..aae1b74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29-expected.png
index 1665956..fef2468 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29b-expected.png
index 6fcbf825..8e90db5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3-expected.png
index b6aecfb9..6e57dc3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-32-expected.png
index c96b20ac..427c6e5b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-33-expected.png
index 46f341d..10a7712 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3a-expected.png
index 6fbbdfa..326b0b00 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-68-expected.png
index 3bf4288b..12845a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-69-expected.png
index 2d0d4e0d..a1443bcb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73-expected.png
index f8a5178..f6f27974 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73b-expected.png
index f8a5178..f6f27974 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74-expected.png
index 0f1dc2d9..41e5711 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74b-expected.png
index 0f1dc2d9..41e5711 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/css3/selectors3/xml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5099303-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5099303-expected.png
index a37df99..aab1c72 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5099303-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5099303-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5126166-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5126166-expected.png
index 59fe0eb7..a10bdbc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5126166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5126166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5206311-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5206311-1-expected.png
index deddc52e..071af1d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5206311-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5206311-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5483370-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5483370-expected.png
index 959dfed8..704d9c62 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5483370-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/5483370-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/table-cells-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/table-cells-expected.png
index a246c58..1780a3f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/table-cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/deleting/table-cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/4747450-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/4747450-expected.png
index fc85385..f94c4113 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/4747450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/4747450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5136770-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5136770-expected.png
index 1f9ca45a..efbc491 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5136770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5136770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5481523-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5481523-expected.png
index 96072c8e..34ea586c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5481523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5481523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5569741-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5569741-expected.png
index c21b643..41c3072 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5569741-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/execCommand/5569741-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4278698-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4278698-expected.png
index c5cfd07..6dfe896 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4278698-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4278698-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4875189-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4875189-1-expected.png
index 5c20e506..bcbd9970 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4875189-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4875189-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4959067-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4959067-expected.png
index 7853931..3845514 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4959067-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/inserting/4959067-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/5156401-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/5156401-1-expected.png
index 5311627c..aa71745 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/5156401-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/5156401-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
index 41a5886..5dbb3fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drop-text-without-selection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drop-text-without-selection-expected.png
index 8f507a9..91edc0b3f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drop-text-without-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/drop-text-without-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/innerText-inline-table-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/innerText-inline-table-expected.png
index f8cbee6..d551f850 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/innerText-inline-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/innerText-inline-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/input-field-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/input-field-1-expected.png
index 216e0a4..75276db 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/input-field-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/input-field-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-list-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-list-expected.png
index 1885b12..9a9edcd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-list-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/pasteboard/merge-start-list-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/4402375-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/4402375-expected.png
index 006832d..3d8faa7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/4402375-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/4402375-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/6476-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/6476-expected.png
index 76b9a7b..df67d3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/6476-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/6476-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/click-start-of-line-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/click-start-of-line-expected.png
index 22fccec..9587039 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/click-start-of-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/click-start-of-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/drag-to-contenteditable-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/drag-to-contenteditable-iframe-expected.png
index d20299d..1581d94 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/drag-to-contenteditable-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/drag-to-contenteditable-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-backward-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-backward-expected.png
index e756bc3f..bca7b3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-backward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-backward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-forward-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-forward-expected.png
index 92ea6c4..6338857 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-forward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/extend-inside-transforms-forward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-4-expected.png
index f714149..b1bdb39 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-5-expected.png
index fe736717..95c2c95 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-8-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-8-expected.png
index 1cb44bb..203b71f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-9-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-9-expected.png
index 5b19be1..c2a2e287 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/mixed-editability-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNode-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNode-expected.png
index 0f0e1e97..1b215add 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNodeContents-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNodeContents-expected.png
index 41896e55..a2c8d5e8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNodeContents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/selectNodeContents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/transformed-selection-rects-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/transformed-selection-rects-expected.png
index 33b6eba..c0f23429 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/selection/transformed-selection-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/selection/transformed-selection-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-delete-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-delete-001-expected.png
index daa41f3..4cf2933e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-delete-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-delete-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-after-expected.png
index a9da7c4..5ef138a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-before-expected.png
index 3952156c..76a50b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/list-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-after-expected.png
index e4232b8..b60705e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-before-expected.png
index acd07299..9b5cd6d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/unsupported-content/table-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub-expected.txt
new file mode 100644
index 0000000..71ce1c7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/external/wpt/html/browsers/history/the-location-interface/location-protocol-setter-with-colon.sub-expected.txt

@@ -0,0 +1,9 @@
+This is a testharness.js-based test.
+PASS General setup 
+PASS Set location.protocol = location.protocol 
+PASS Set location.protocol to http:gunk 
+PASS Message listener 
+FAIL Message listener Cannot read property 'test' of undefined
+PASS Message listener 
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt
new file mode 100644
index 0000000..baf644b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt

@@ -0,0 +1,41 @@
+This is a testharness.js-based test.
+PASS A step-start function on a keyframe affects the resulting style 
+PASS A steps(1, start) function on a keyframe affects the resulting style 
+PASS A steps(2, start) function on a keyframe affects the resulting style 
+PASS A step-end function on a keyframe affects the resulting style 
+PASS A steps(1) function on a keyframe affects the resulting style 
+PASS A steps(1, end) function on a keyframe affects the resulting style 
+PASS A steps(2, end) function on a keyframe affects the resulting style 
+PASS A linear function on a keyframe affects the resulting style 
+FAIL A ease function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 109.47963055884654 at 1100ms expected 109.47963055884654 +/- 0.01 but got 109.312
+PASS A ease-in function on a keyframe affects the resulting style 
+FAIL A ease-in-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 101.97224534417684 at 1100ms expected 101.97224534417684 +/- 0.01 but got 101.953
+FAIL A ease-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 116.05721544376388 at 1100ms expected 116.05721544376388 +/- 0.01 but got 116.078
+FAIL A easing function which produces values greater than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 171.60874310990272 at 1100ms expected 171.60874310990272 +/- 0.01 but got 172.219
+FAIL A easing function which produces values less than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 77.13128857063907 at 1100ms expected 77.13128857063907 +/- 0.01 but got 76.9531
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-start function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, start) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, start) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 0ms expected "50.3438px" but got "50px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-end function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1) function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, end) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, end) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 500ms expected "50.3438px" but got "50px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a linear function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "25.0938px" but got "25px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "41.875px" but got "41.8594px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "8.95312px" but got "9.32812px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "12.9375px" but got "12.875px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "38.0469px" but got "37.9688px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values greater than 1 does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "100px" but got "102.406px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values less than 1 does not alter the result 
+FAIL step-start easing with input progress greater than 1 assert_equals: expected "200px" but got "100px"
+PASS step-end easing with input progress greater than 1 
+FAIL step-end easing with input progress greater than 2 assert_equals: expected "200px" but got "100px"
+PASS step-start easing with input progress less than 0 
+FAIL step-start easing with input progress less than -1 assert_equals: expected "-100px" but got "0px"
+FAIL step-end easing with input progress less than 0 assert_equals: expected "-100px" but got "0px"
+FAIL cubic-bezier easing with input progress greater than 1 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress greater than 1 and where the tangent on the upper boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 and where the tangent on the lower boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-inherit-color-bug-expected.png
index 1be28245..2861457 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-inherit-color-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-inherit-color-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-expected.png
index 2af817ac..d067517 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-transforms-expected.png
index d598b404..341ae092 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-leakage-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-svg-scaling-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-svg-scaling-expected.png
index dce838a..7a8e3595 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-svg-scaling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/background-svg-scaling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-expected.png
index 6344ae1..5ab48b4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-image-expected.png
index 491e21ba..7d7af93 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/border-radius-split-background-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index afa7292..d2fa4b5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
index 7434933f..07ecb74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/selection-background-color-of-list-style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/selection-background-color-of-list-style-expected.png
index f80b7cbd..e9f300d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/selection-background-color-of-list-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/backgrounds/selection-background-color-of-list-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/018-expected.png
index 1b9f95c..67f8f31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/text-indent-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/text-indent-rtl-expected.png
index a9728992..8c921bf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/text-indent-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/basic/text-indent-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/014-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/014-expected.png
index 727afe0..27fe89a6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/016-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/016-expected.png
index cc5ace5..4fc1d63 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/025-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/025-expected.png
index c9afac5..9abc498a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/025-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/025-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/026-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/026-expected.png
index f0731b63..9b5f519 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/026-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/026-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/027-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/027-expected.png
index c9afac5..9abc498a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/027-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/027-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/028-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/028-expected.png
index f0731b63..9b5f519 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/028-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/028-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/float-avoidance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/float-avoidance-expected.png
index 2cf4c54c..823b402 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/float-avoidance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/float-avoidance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction-expected.png
index c9dcbed..d6040ee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction2-expected.png
index 7019a17..f4746b6c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/nopaint-after-layer-destruction2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/shrink-to-avoid-float-complexity-expected.png
index 6a7e900..c8c0716 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/shrink-to-avoid-float-complexity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/table-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/table-relayout-expected.png
index 5bce5f5..7097cbd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/table-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/table-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/width-update-after-clear-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/width-update-after-clear-expected.png
index d2dd141f..b54512f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/width-update-after-clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/width-update-after-clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/margin-collapse/empty-clear-blocks-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/margin-collapse/empty-clear-blocks-expected.png
index 85870bd..9554f81 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/margin-collapse/empty-clear-blocks-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/margin-collapse/empty-clear-blocks-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
index 4fe43a1..71e859bd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
index ad585f3..fdf662eb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-expected.png
index 527aa3e..3f130b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
index 724d55e..91862a6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
index 9fe3486..baa81c3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-expected.png
index abf957f..76c1e75 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
index 8d3e905fd..e55ee43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
index e58decf9..7eae4ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/height-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/height-change-expected.png
index fbcab13..545dd50 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/relayout-on-position-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/relayout-on-position-change-expected.png
index 162d1c99..b74e63b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/relayout-on-position-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/relayout-on-position-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/window-height-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/window-height-change-expected.png
index ccfa281..19bc7ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/window-height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/window-height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-image-rotate-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-image-rotate-transform-expected.png
index 4132a084..dde0f6b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-image-rotate-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-image-rotate-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png
index 7fe37de..e0ab259 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-inner-bleed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-large-radius-opposite-wide-edge-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-large-radius-opposite-wide-edge-expected.png
index 58cd8f6..b6bef6a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-large-radius-opposite-wide-edge-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-large-radius-opposite-wide-edge-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-mixed-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-mixed-alpha-expected.png
index 60f8a349..31bc9f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-mixed-alpha-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-mixed-alpha-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-double-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-double-expected.png
index 560f5fe..9ea299f0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-double-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-expected.png
index 4a8439e..f60b80e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-complex-inner-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-double-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-double-expected.png
index 22eb095..9c5cf582 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-double-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-expected.png
index a0babd7..8cad64e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-constraints-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inline-flow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inline-flow-expected.png
index 15ab688..665f33fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inline-flow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inline-flow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inset-outset-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inset-outset-expected.png
index e447d5c0..04807b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inset-outset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-inset-outset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-all-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-all-expected.png
index 45a639a..3d897445 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-all-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-all-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-border-expected.png
index 90af867..9002ab27 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-expected.png
index 21cab0f..f5f0c96 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-padding-expected.png
index 7722900a..349e4432 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-mask-expected.png
index 6b2164d..7e7f367 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
index 4992bd7..5fbbcd6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png
index 48d83e2..bca7049 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png
index d253b5f..401f255 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-ratio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png
index fe8a15c..57355455 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-mask-video-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-percent-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-percent-expected.png
index 67f8b7c..9e39c46a3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-percent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-percent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-split-inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-split-inline-expected.png
index 1238bf54..72249fe3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-split-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-split-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-with-composited-child-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-with-composited-child-expected.png
index 615d698f..3123e4d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-with-composited-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-radius-with-composited-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-styles-split-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-styles-split-expected.png
index b18a277..ddaa1a07 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-styles-split-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/border-styles-split-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/borderRadiusAllStylesAllCorners-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/borderRadiusAllStylesAllCorners-expected.png
index de4ffce..35f074dc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/borderRadiusAllStylesAllCorners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/borderRadiusAllStylesAllCorners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/different-color-borders-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/different-color-borders-expected.png
index 4def027..a565b37 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/different-color-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/different-color-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius-expected.png
index b93add9..93c6ce5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius2-expected.png
index 9ff4241..49973b0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/mixed-border-styles-radius2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/outline-alpha-block-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/outline-alpha-block-expected.png
index 9c8ff8b0..143a3b3f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/outline-alpha-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/outline-alpha-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-01-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-01-expected.png
index f18f75a..4db3323 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-01-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-02-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-02-expected.png
index b15d8c2..c0f938e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-02-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-03-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-03-expected.png
index 5c27694a..42171e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-03-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-04-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-04-expected.png
index 13cbb2a..4be855d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-04-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-05-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-05-expected.png
index 05ba736..a08b4af 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-05-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/rtl-border-05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/table-borders-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/table-borders-expected.png
index 18284f4..a6673fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/borders/table-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/borders/table-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/basic-shadows-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/basic-shadows-expected.png
index ac8dd09..6a077a3d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/basic-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/basic-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/border-radius-big-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/border-radius-big-expected.png
index 28958422..e9897d1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/border-radius-big-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/border-radius-big-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/box-shadow-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/box-shadow-transformed-expected.png
index ed79ca3..b97619d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/box-shadow-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/box-shadow-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-box-shadows-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-box-shadows-expected.png
index 6cd1b4c4..c435f234 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-box-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-box-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-expected.png
index 75641a7a..61f47e5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-subpixel-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-subpixel-expected.png
index 051aba41..a2a3f8e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-subpixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/inset-subpixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/spread-multiple-inset-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/spread-multiple-inset-expected.png
index 075569c1..cb9b23d5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/spread-multiple-inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/spread-multiple-inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/transform-fringing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/transform-fringing-expected.png
index 5169000..7c57cecb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/transform-fringing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/box-shadow/transform-fringing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-composite-expected.png
index 7102a2e..ce5ba66d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
index c5d54d8..836814b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-incremental-repaint-expected.png
index 7c3b581..2d70457 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/image-object-in-canvas-expected.png
index 7d39e19..f6a1756e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 4b1055e..1215e43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-clip-expected.png
index ff3d3b5..236e936 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-combinations-expected.png
index 7c5d3f2..4741d61 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-combinations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-expected.png
index b936637..0244762 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-parent-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-parent-expected.png
index f7f82a9..c467ee62 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-parent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-composited-parent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-fixed-position-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-fixed-position-expected.png
index dfc9f3de..dce16ed6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-fixed-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-fixed-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-transformed-expected.png
index ec6b0994..ba33eaa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/clip/overflow-border-radius-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/009-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/009-expected.png
index 4eaf4a8..f3368488 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/014-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/014-expected.png
index f7e607a7..443f9c7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/016-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/016-expected.png
index ff38b3a..35d20da 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/hover-style-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/hover-style-change-expected.png
index 1efbdb7..050cec7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/hover-style-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/hover-style-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-to-inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-to-inline-expected.png
index 08cc6e9..f9e8b23 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-to-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-to-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-with-before-expected.png
index 40c9ee7ec..be721539f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-group-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-with-before-expected.png
index 40c9ee7ec..be721539f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-row-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-with-before-expected.png
index 40c9ee7ec..be721539f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css-generated-content/table-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/001-expected.png
index b91b1de7..aad3546 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/acid2-pixel-expected.png
index f2e0627..3fd3a84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-clip-radius-values-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-clip-radius-values-expected.png
index 8050d1d..8fdf95f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-clip-radius-values-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-clip-radius-values-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-shorthand-invalid-url-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-shorthand-invalid-url-expected.png
index fc164a1..56f93dc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-shorthand-invalid-url-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/background-shorthand-invalid-url-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/css3-modsel-22-expected.png
index 43e5dc2..d15c122 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/find-next-layer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/find-next-layer-expected.png
index e5e6dc3..38e2ccc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/find-next-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/find-next-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/first-letter-detach-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/first-letter-detach-expected.png
index a85a543f..fb55dac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/first-letter-detach-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/first-letter-detach-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/h1-in-section-elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/h1-in-section-elements-expected.png
index 8408b7a..2741fcc4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/h1-in-section-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/h1-in-section-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/hover-subselector-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/hover-subselector-expected.png
index baaea89..3928a7e64 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/hover-subselector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/hover-subselector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-default-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-default-expected.png
index b744587..8a4ee3ca 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-default-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-default-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
index 78811f4..ce06d19 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
index 78811f4..ce06d19 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-expected.png
index f9bff8e..876e90e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/image-orientation/image-orientation-from-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-expected.png
index 57830c9..de6493e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-expected.png
index 4cc459c..70fa62f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-iframe-expected.png
index 0a9e783..468dd6b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/resize-corner-tracking-transformed-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/rtl-ordering-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/rtl-ordering-expected.png
index 98e80c6a..a61f9a6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/rtl-ordering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/rtl-ordering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/shadow-multiple-expected.png
index 95ba5556..fa8255e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/transformed-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/transformed-mask-expected.png
index 72cc3cf9..4933d96 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/transformed-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/transformed-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css/universal-hover-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css/universal-hover-quirk-expected.png
index 6a3338e..bac3908d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css/universal-hover-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css/universal-hover-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
index 2b68df5..2e0e3bc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-skip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
index b2923ae..ac8c090 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
index e09d133..73c2e0a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-non-draggable-link-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-non-draggable-link-expected.png
index d407b57..1d6bff7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-non-draggable-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dnd/link-dragging-non-draggable-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/001-expected.png
index 8f8ad22..bbe550a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/002-expected.png
index 6cb2ed98..5b89f84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/003-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/003-expected.png
index 8ed72e1a..80d451d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/004-expected.png
index 8f8ad22..bbe550a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/doctypes/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/34176-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/34176-expected.png
index ef8838fa..625534b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLElement/bdo-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLElement/bdo-expected.png
index bc74aae..2e4f48b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLElement/bdo-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLElement/bdo-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
index 1f72762..7160d662 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
index 9245c7a..9442a4f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-optimums-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-optimums-expected.png
index ceb58b7e6..f415dea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-optimums-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLMeterElement/meter-optimums-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
index 7d8edbd..a6a5edc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
index d6320d66..142dcb7f8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/colSpan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/colSpan-expected.png
index 12f9556..7092ab5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/colSpan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/colSpan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/createCaption-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/createCaption-expected.png
index 3c35c74..e3c8432f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/createCaption-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/HTMLTableElement/createCaption-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/row-inner-text-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/row-inner-text-expected.png
index c5757c2..aa78d30f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dom/row-inner-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dom/row-inner-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/012-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/012-expected.png
index 7ad0eff..b2db6186 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/012-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/012-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/015-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/015-expected.png
index a730bef..1013ccc8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/selection-highlight-adjust-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/selection-highlight-adjust-expected.png
index 1d883fd4..59a9b69d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/selection-highlight-adjust-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/dynamic/selection-highlight-adjust-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/invalid-UTF-8-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/invalid-UTF-8-expected.png
index dfa608d5e5..8a609da2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/invalid-UTF-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/invalid-UTF-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-big-endian-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-big-endian-expected.png
index a5bec83..d6d8fcc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-big-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-big-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-little-endian-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-little-endian-expected.png
index a5bec83..d6d8fcc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-little-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/encoding/utf-16-little-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/001-expected.png
index 43e5931..48f34d4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-default-title-expected.png
index 5a6a7da..97469c5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-default-title-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-default-title-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-style-color-expected.png
index ff48618..4abf970 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button/button-inner-block-reuse-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button/button-inner-block-reuse-expected.png
index ba6dc76..5327896d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button/button-inner-block-reuse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/button/button-inner-block-reuse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index c6b9d0a..d7ea74d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index 41808bf..d1b9beb4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index ec59c31..605b265 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index aa06890..a0157a8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index 096c7cf..3079ae5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index 510903fe..3c0cb2d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index babf5d0..ac3146d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
index 9a0e582..c4de84d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
index b071110b..c387d41 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-expected.png
index 9507c06..fc3d9692 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index 8467fb0..36b7c1d5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-expected.png
index c4356100..60b08d3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index 5adbea2..57d9aa2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/checkbox/checkbox-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/checkbox/checkbox-appearance-basic-expected.png
index d8156218..fb2f437 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/checkbox/checkbox-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/checkbox/checkbox-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index 18eb23cd..ac684a491 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datalist/input-appearance-range-with-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datalist/input-appearance-range-with-transform-expected.png
index b13fa8b..2b20b9c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datalist/input-appearance-range-with-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datalist/input-appearance-range-with-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-basic-expected.png
index 4fc8532..01986b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-pseudo-elements-expected.png
index f1cbbcc..61940e2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/date/date-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
index e18c9351..8138c67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/fieldset/fieldset-align-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/fieldset/fieldset-align-expected.png
index e7a9a61..51dfba1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/fieldset/fieldset-align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/fieldset/fieldset-align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/floating-textfield-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/floating-textfield-relayout-expected.png
index f1897088..d5f43ad 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/floating-textfield-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/floating-textfield-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/image-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/image-border-expected.png
index 9ca5afa..a8699bd2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/image-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/image-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-first-letter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-first-letter-expected.png
index e1e96a7..b4c9a26f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-first-letter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-first-letter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-value-expected.png
index a2df4f7e..64c23e2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-basic-expected.png
index c16a9439..954e1e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-pseudo-elements-expected.png
index c255747..7367f63 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/number/number-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/number/number-appearance-datalist-expected.png
index 64dafbce..e6a769e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/number/number-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/number/number-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png
index 0b9255ac..2e8060ba 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/placeholder-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/radio/radio-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/radio/radio-appearance-basic-expected.png
index 61368e8..325f210 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/radio/radio-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/radio/radio-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-appearance-basic-expected.png
index 5bade80..cdc93307 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-vertical-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-vertical-alignment-expected.png
index 4d950ccd..68d4652 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-vertical-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/search/search-vertical-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
index a5b10fa..348338f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
index b07bbd4c..4a4cfca 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
index c6cf9b5..b88c343 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/basic-selects-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/basic-selects-expected.png
index 6f303c3..81f02ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/basic-selects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/basic-selects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-basic-expected.png
index 11eb586..999dc4c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-rtl-expected.png
index e9cdd30a..f72d16b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/menulist-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-baseline-expected.png
index 67bf96a..4cd81549 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-dirty-parent-pref-widths-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-dirty-parent-pref-widths-expected.png
index e980b1e..1fdddcf7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-dirty-parent-pref-widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-dirty-parent-pref-widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-visual-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-visual-hebrew-expected.png
index 52e8249..697abe4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-visual-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/select/select-visual-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/submit/submit-appearance-basic-expected.png
index 5cb02d6..48e55fe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/submit/submit-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/submit/submit-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index c80fde9..fab209f5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
index 2f03178..7b49d11 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
index fcb9448..e26fd18 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
index e5c123b..a644689 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index 1fb21cf..ed9dade 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index d4f0882..985728b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
index 8f9a9eab..5c0dfcf9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index 212cc8af..4f793eb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index 8ce7585..ce9ce4e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index 0453e0fe..cc4c8b6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
index 58b6208..d768149e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 6fcdeb7..82742f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
index f3a25ddc..e5b0255 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
index 9bdbb15..e9332935 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index 0c28160..358a404 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
index 8a57319..dd20af3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
index 9ce0ac9..73d859b7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text-style-color-expected.png
index f0c734b2..0264c9ed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-appearance-bkcolor-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-appearance-bkcolor-expected.png
index 517d29b..5f3ae15 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-appearance-bkcolor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-appearance-bkcolor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-disabled-color-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-disabled-color-expected.png
index 239daac34..402cb86e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-disabled-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-disabled-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-placeholder-paint-order-expected.png
index a531b0a..9df6621 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/input-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-basic-expected.png
index 0f5af326..ed2b57b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-datalist-expected.png
index e680143a..75488b7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/text/text-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/textarea/textarea-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
index 42a57a23..fb7811a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-basic-expected.png
index 35d7824e..e39e33c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-pseudo-elements-expected.png
index 2067ed1642..faa2ac00 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/time/time-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/visual-hebrew-text-field-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/visual-hebrew-text-field-expected.png
index ba408d2..4777116 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/visual-hebrew-text-field-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/visual-hebrew-text-field-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-basic-expected.png
index 5305f7a..a2c9b9ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-pseudo-elements-expected.png
index 8f2ff32..8e9a752 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/week/week-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/frames/onlyCommentInIFrame-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/frames/onlyCommentInIFrame-expected.png
index 66339db7a9..45e46ef 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/frames/onlyCommentInIFrame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/frames/onlyCommentInIFrame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/emptyInlinesWithinLists-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/emptyInlinesWithinLists-expected.png
index 698c19e..ac52816d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/emptyInlinesWithinLists-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/emptyInlinesWithinLists-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-borders-with-bidi-override-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-borders-with-bidi-override-expected.png
index f09626fc..8fad9f82 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-borders-with-bidi-override-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-borders-with-bidi-override-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-expected.png
index 7fca683..3bd775b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-long-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-long-image-expected.png
index 50dce33..c7ce067 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-long-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-long-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-x-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-x-expected.png
index f38515d..743f9dda 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-x-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-x-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-y-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-y-expected.png
index ebda8255..663e6bf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-y-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-box-background-repeat-y-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-continuation-borders-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-continuation-borders-expected.png
index 97ec415..a0ac8ba7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-continuation-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/inline/inline-continuation-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/invalid/table-inside-stray-table-content-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/invalid/table-inside-stray-table-content-expected.png
index cc8b6a7..d79deed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/invalid/table-inside-stray-table-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/invalid/table-inside-stray-table-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/opacity-outline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/opacity-outline-expected.png
index b451cb12..cdd41f37 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/layers/opacity-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/layers/opacity-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-expected.png
index f2596ceb..fad89f5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-vertical-expected.png
index 5019e63..face3a3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/001-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-expected.png
index 763742c8..c6f7c30 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-vertical-expected.png
index 32d3525..13b45f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/002-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-expected.png
index 6bb5860..69d6bc9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-vertical-expected.png
index a9c5d433d..e3f7b65 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/003-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/004-expected.png
index 5f9b05a..370d338 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-expected.png
index 9afc53ff..7bf3f21 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-vertical-expected.png
index 65db86b..3313be2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/005-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-expected.png
index 5c7e5eb..b70fd8a1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-vertical-expected.png
index 4ff8ec9..2b59645 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/007-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-expected.png
index 321eb76..38e7af33 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-vertical-expected.png
index 19f8e4a..62bd093 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/008-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/big-list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/big-list-marker-expected.png
index e1dcd9fb..320cb91 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/big-list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/big-list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/dynamic-marker-crash-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/dynamic-marker-crash-expected.png
index 2e6ca57..ab3f157 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/dynamic-marker-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/dynamic-marker-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/inlineBoxWrapperNullCheck-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/inlineBoxWrapperNullCheck-expected.png
index 103ded08..a2e256e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/inlineBoxWrapperNullCheck-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/inlineBoxWrapperNullCheck-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-before-empty-inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-before-empty-inline-expected.png
index ccf73fb..2cc7d4a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-before-empty-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-before-empty-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-image-error-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-image-error-expected.png
index 32ec9f5..d9be0c3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-image-error-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/marker-image-error-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/markers-in-selection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/markers-in-selection-expected.png
index 16ba10b..9d51b01 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/markers-in-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/markers-in-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-display-types-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-display-types-expected.png
index 1570695..5ae4760 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-display-types-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-display-types-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-start-parsing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-start-parsing-expected.png
index 60b351bf..c2bc17e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-start-parsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/ol-start-parsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/olstart-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/olstart-expected.png
index cec8f978..72a1c8b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/olstart-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/olstart-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/scrolled-marker-paint-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/scrolled-marker-paint-expected.png
index d3c0be7..d663778 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/lists/scrolled-marker-paint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/lists/scrolled-marker-paint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/masking/clip-path-inset-large-radii-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/masking/clip-path-inset-large-radii-expected.png
index d620c00..c3c9369 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/masking/clip-path-inset-large-radii-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/masking/clip-path-inset-large-radii-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/multicol/border-radius-clipped-layer-second-column-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/multicol/border-radius-clipped-layer-second-column-expected.png
index e8e6007..bebd7d0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/multicol/border-radius-clipped-layer-second-column-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/multicol/border-radius-clipped-layer-second-column-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/border-radius-clipping-expected.png
index c93bb5c..00981e3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/image-selection-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/image-selection-highlight-expected.png
index 04f8dda..7034ec8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/image-selection-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/image-selection-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-expected.png
index 6f48a0e6..5ad3a92 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-inline-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
index 944ef90..ba5f5e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-vertical-expected.png
index 0f690b4..e2fa64e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-rtl-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-text-hit-testing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-text-hit-testing-expected.png
index 1fbed4f..b0b3f4d6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-text-hit-testing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-text-hit-testing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-with-local-background-attachment-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-with-local-background-attachment-expected.png
index 0e5c697..152ed819 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-with-local-background-attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/reflections/opacity-reflection-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/reflections/opacity-reflection-transform-expected.png
index a9b170f..49eb3dc8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/reflections/opacity-reflection-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/reflections/opacity-reflection-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-content-edge-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-content-edge-expected.png
index 0c9cc76..73ff947 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-content-edge-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-content-edge-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.png
index de88f7b..77d5565 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/inline-box-wrapper-handover-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/inline-box-wrapper-handover-expected.png
index bd2ba046..6708e29 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/inline-box-wrapper-handover-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/inline-box-wrapper-handover-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/selection-rect-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/selection-rect-transform-expected.png
index 8db65a26..81502b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/selection-rect-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/replaced/selection-rect-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/032-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/032-expected.png
index 2ee57531..74c4e3c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/032-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/032-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/166-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/166-expected.png
index 019b0a10..498510b0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/selectors/166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/003-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/003-expected.png
index cc954220..b0cc914 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/007-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/007-expected.png
index 801f3ee1..7e8dca6a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/018-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/018-expected.png
index 45177e4..efa6cb54 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/020-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/020-expected.png
index ec62bd1..be0c9be3f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/020-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/020-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/029-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/029-expected.png
index 5f592ed..116a201 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/029-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/029-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/030-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/030-expected.png
index eb4efda..6a2f9ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/030-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/030-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/035-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/035-expected.png
index a8c7e5e..38ceb23 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/035-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/035-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-expected.png
index e9bdd7f..83badda 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-vertical-expected.png
index 7ac4856c..0cb89612 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/038-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/039-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/039-expected.png
index a95ddad..6c742bb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-expected.png
index 8a239f3..0949569c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-vertical-expected.png
index 585a153..25e4a77 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/040-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/041-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/041-expected.png
index 51a8f88..031305e6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/041-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/041-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/add-before-anonymous-child-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/add-before-anonymous-child-expected.png
index c5d25c2..3e2d16e0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/add-before-anonymous-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/add-before-anonymous-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-collapsed-border-expected.png
index c7eb6b4..eab6b86 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-expected.png
index c7eb6b4..eab6b86 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-collapsed-border-expected.png
index 91f4cb0..8e517c34 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-expected.png
index 7f7ef0f..ddbb0097 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
index 44e9cc6..8e8b461 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
index 4f6a218..6b66f23 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-expected.png
index b91d9eb..8007ece 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
index 2471d76..d0af5a2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/click-near-anonymous-table-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/click-near-anonymous-table-expected.png
index 7bf4d9c..41c1e163 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/click-near-anonymous-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/click-near-anonymous-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/early-table-layout-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/early-table-layout-expected.png
index 4b69e19..2995975f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/early-table-layout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/early-table-layout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/edge-offsets-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/edge-offsets-expected.png
index 78d3bc0..a0511c5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/edge-offsets-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/edge-offsets-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/row-height-recalc-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/row-height-recalc-expected.png
index b6dc0b71..a4cfe6a8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/row-height-recalc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/row-height-recalc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-expected.png
index 02acec2..e451b0a1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-vertical-expected.png
index ec7adcd..b94d72b1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rowspan-paint-order-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rtl-cell-display-none-assert-expected.png
index 1f490001..c81da607 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/rtl-cell-display-none-assert-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/rtl-cell-display-none-assert-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/spanOverlapRepaint-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/spanOverlapRepaint-expected.png
index ce68b9e..aa88f2d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/spanOverlapRepaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/spanOverlapRepaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/text-field-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/text-field-baseline-expected.png
index 06d69f8..d8c5c3a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/text-field-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/text-field-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/table/unbreakable-images-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/table/unbreakable-images-quirk-expected.png
index 1d53aa4..524b57a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/table/unbreakable-images-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/table/unbreakable-images-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text-autosizing/list-item-above-dbcat-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text-autosizing/list-item-above-dbcat-expected.png
index 9778a81..e47e0bf6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text-autosizing/list-item-above-dbcat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text-autosizing/list-item-above-dbcat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-kerning-and-ligatures-expected.png
index 6c0d5bb..50718a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-multiple-renderers-expected.png
index be51371..27c594b0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-negative-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-negative-spacing-features-expected.png
index 08792d6a..089876c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-negative-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-negative-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-pointtooffset-calls-cg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-pointtooffset-calls-cg-expected.png
index be6fa2c..f9ab49f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-pointtooffset-calls-cg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-pointtooffset-calls-cg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-rtl-override-selection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-rtl-override-selection-expected.png
index 32c0703..1da2fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-rtl-override-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-rtl-override-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-small-caps-punctuation-size-expected.png
index ad66346..3f8582d9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-spacing-features-expected.png
index 1cbba8e0..080e11d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/001-expected.png
index cc29c50..c0c14985 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/006-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/006-expected.png
index 7ef836e..08578cf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/007-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/007-expected.png
index 4c6937c7..8bb12be 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/015-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/015-expected.png
index 3e6d951..7fc5848 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/basic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/capitalize-empty-generated-string-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/capitalize-empty-generated-string-expected.png
index b7705d5..9118799 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/capitalize-empty-generated-string-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/capitalize-empty-generated-string-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/cg-vs-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/cg-vs-atsui-expected.png
index e77a367..55525203 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/cg-vs-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/cg-vs-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/color-emoji-expected.png
index f630c3f..5b82720 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/in-rendered-text-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/in-rendered-text-rtl-expected.png
index 189244d..89d33ed2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/in-rendered-text-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/in-rendered-text-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-CSS-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-CSS-expected.png
index 8c7cce4..cd9321e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-CSS-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-CSS-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-HTML-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-HTML-expected.png
index 82e1eb2..d19f887 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-HTML-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-HTML-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
index f566168..348cf617 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-european-terminators-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-european-terminators-expected.png
index 808ec37..a32964d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-european-terminators-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-european-terminators-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
index 5ac18e2..006d88fd4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-innertext-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-innertext-expected.png
index 0e4eed4a..086263cc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-innertext-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/bidi-innertext-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/hebrew-vowels-expected.png
index 9d0c443..a3708768 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-caret-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-caret-expected.png
index 183c2c0..9a8c0639 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-white-space-pre-wrap-expected.png
index 999ff37..0eaf22a1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/text-spliced-font-expected.png
index a69dae6..752c1e1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/vertical-text-glyph-test-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/vertical-text-glyph-test-expected.png
index 4b6beb81..afd91ea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/vertical-text-glyph-test-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/international/vertical-text-glyph-test-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/midword-break-hang-expected.png
index 15c6854..163ce40 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/should-use-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/should-use-atsui-expected.png
index 7e66e36..9a46407 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/should-use-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/should-use-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-overflow-selection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
index 5a3b7bb7e..2956ce2a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
index c085b34..0d4500a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
index 042d4d16..726ca60 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-lr-expected.png
index 946a643..dca7cd60 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-rl-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-rl-expected.png
index 7e4eeb93d..27214ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-rl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-styles-vertical-rl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-vertical-lr-expected.png
index d8b061b1..9105f15 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-1-expected.png
index 07adcb1..019648c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-2-expected.png
index 07adcb1..019648c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-1-expected.png
index 07adcb1..019648c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-2-expected.png
index 07adcb1..019648c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-details-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-and-click-expected.png
index 582fdc90..cdf8c0c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-expected.png
index f5a635e..b66df07 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-and-click-expected.png
index e243fce..e35b96d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-expected.png
index e43d142..438c1d63 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-10-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-and-click-expected.png
index 750054f..f4a36aa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-expected.png
index f5a635e..b66df07 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-and-click-expected.png
index 317db8ff..8a150de 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-expected.png
index ecc6cd3..ccc580db 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-and-click-expected.png
index 8174166..dad873b1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-expected.png
index 40f16e32..658baed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-and-click-expected.png
index f56dfd4..4d7df657 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-expected.png
index f5a635e..b66df07 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-and-click-expected.png
index e243fce..e35b96d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-expected.png
index 3d8bffa2..8c8f3c1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-and-click-expected.png
index e243fce..e35b96d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-expected.png
index 93a696d..520d95a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-7-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-and-click-expected.png
index 2abc9ac6..71a39e8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-expected.png
index 94f86fd5..7bcaf04 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-and-click-expected.png
index 9c91a7a..90c3a64 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-expected.png
index 42ee464..5fb92d82 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-1-expected.png
index 2185971..aaf88058 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-2-expected.png
index 2185971..aaf88058 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-add-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-marker-style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-marker-style-expected.png
index 14170bd..825a39e5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-marker-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-marker-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-1-expected.png
index fa793fc..e8463290 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-2-expected.png
index f28cd64..829cb6a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-nested-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary1-expected.png
index caab38c1..e3c8693 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary2-expected.png
index f9d729867..f11e946 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary3-expected.png
index caab38c1..e3c8693 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary4-expected.png
index ea854c7..50d4344 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-no-summary4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open-javascript-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open-javascript-expected.png
index a1f1e4e..6af62fc8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open-javascript-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open-javascript-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open1-expected.png
index 40f16e32..658baed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open2-expected.png
index a64f6d1e..21bc4423 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open3-expected.png
index 40f16e32..658baed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open4-expected.png
index a64f6d1e..21bc4423 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open5-expected.png
index 40f16e32..658baed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open6-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open6-expected.png
index 82208376..c8de90c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-open6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-position-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-position-expected.png
index 703d7bc..0000c59 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-1-expected.png
index 4cf9d67..fbce36c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-2-expected.png
index 4cf9d67..fbce36c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-and-click-expected.png
index 8f636a5f..1e66c86 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-expected.png
index caab38c1..e3c8693 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-and-click-expected.png
index 7d2c4d4..b0eda67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-expected.png
index ed18b711..cae12a30b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-and-click-expected.png
index abba3122..201606d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-expected.png
index 3e529e5e..41b5bdee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-and-click-expected.png
index 784313a..61b3c6b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-expected.png
index f9d729867..f11e946 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-and-click-expected.png
index 890c66c..bf1a02e7d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-expected.png
index a17e919..9fc1db5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-and-click-expected.png
index 7d05c73..c20fc9c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-expected.png
index 2c5ce36..3106c2a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-1-expected.png
index 083da5a..160f6c5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-2-expected.png
index 2437ae42..2bd32c5d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-remove-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-summary-child-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-summary-child-expected.png
index 6083b2e1..93e4b28 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-summary-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-summary-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-text-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-text-expected.png
index c3cd3df..a8abee2e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-replace-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-center-expected.png
index e4a4f55..57a8ab6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-left-expected.png
index 89e8313..f09077e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-right-expected.png
index d49b6ab..e37f0f89 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-align-right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-expected.png b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-expected.png
index 86cf4d0..19826fe7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/html/details_summary/details-writing-mode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/WebKit/LayoutTests/platform/linux/http/tests/media/video-buffered-range-contains-currentTime-expected.png
index 923322da..7f96e01a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/http/tests/media/video-buffered-range-contains-currentTime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/media/video-buffered-range-contains-currentTime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/acid2-pixel-expected.png
index f2e0627..3fd3a84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
index 235eee0..08ac540 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
index 10a4ba8..65361ff 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
index 3d98cb4..163f5722 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
index 4d9bd60d..41a4d1e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
index b49ec3a..316d63c0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
index 8f61aa9..b68f1a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
index 4bba7e1..3c15e6f3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
index cef965fcd..20c1a99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
index afa4d83f..551382bf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
index 4d7ff3b..9698c994 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
index 33484c4894..d886088 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
index 82cabb9..f98dbf5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
index 7c4ce61..d0f5c313 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
index a8e5ce5..0e4540c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
index 43ec354..52cd953 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
index 3e38809f..17a1ae4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
index 40298a1..be13834 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
index 50c7a461..03d20774 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
index 9f3b6b3a..41384a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
index 757382a..be757982 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
index 91a96df..c0a1496 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
index bb3a6e1..9b5fd467 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-border-radius-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-border-radius-expected.png
index 9b8edfe..a22d286f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-image-shape-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-image-shape-expected.png
index 018140a..07b1ec08 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-image-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-image-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-diff-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-diff-expected.png
index a7ba6bc2..a9a1b67e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-diff-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-diff-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-expected.png
index 899dd34..ecca79c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/cross-fade-svg-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-css-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-css-expected.png
index d2f4dab..edba36f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-expected.png
index 89b3b60..df5ca95 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-image-document-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-image-document-expected.png
index a9edea6..abaf921 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-image-document-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/exif-orientation-image-document-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/imagemap-focus-ring-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/imagemap-focus-ring-zoom-expected.png
index 0be79cd..3b0c3e48 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/images/imagemap-focus-ring-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/images/imagemap-focus-ring-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
index 03be6ef..21f1b6c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt

@@ -12,19 +12,9 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [162, 37, 278, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutBlockFlow (floating) SPAN",
           "rect": [324, 37, 277, 20],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [324, 37, 277, 19],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt
index b4cd321..f618c530 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/block-no-inflow-children-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [0, 0, 58, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [0, 0, 58, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/box-inline-resize-expected.txt
index 2327e50b..d74dda28 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/box-inline-resize-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/box-inline-resize-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [8, 88, 32, 67],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG id='foo'",
-          "rect": [8, 88, 32, 32],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-3509-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-3509-expected.txt
index 5af7b30..ec65498 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-3509-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-3509-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='im'",
           "rect": [11, 131, 100, 100],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 131, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt
index 384fa84d..ae6277c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-5699-expected.txt

@@ -13,26 +13,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 184, 32, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 156, 32, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutInline SPAN id='d'",
-          "rect": [8, 150, 4, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 150, 4, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 136, 4, 19],
           "reason": "style change"
         }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt
index 7207655..c8cdcdd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-6473-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow DIV id='allcontent'",
           "rect": [8, 136, 784, 52],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) P",
-          "rect": [8, 152, 784, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (relative positioned) P",
-          "rect": [8, 136, 784, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 152, 69, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 136, 69, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-7235-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-7235-expected.txt
index 4b76289..c3fd8df 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-7235-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/bugzilla-7235-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='t'",
           "rect": [8, 176, 100, 100],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutInline (relative positioned) SPAN id='p'",
-          "rect": [8, 156, 4, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 156, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-expected.png
index dd77597..fb764f5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
index a646824..df259fd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-contenteditable-content-after-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-contenteditable-content-after-expected.txt
index 020d385..8681305c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-contenteditable-content-after-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-contenteditable-content-after-expected.txt

@@ -27,16 +27,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 48, 22, 19],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 48, 15, 19],
-          "reason": "full"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [30, 48, 7, 19],
           "reason": "forced by layout"
@@ -62,11 +52,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 48, 7, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [8, 48, 7, 19],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-composited-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-composited-scroll-expected.txt
index d341afd0..02ac691 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-composited-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-composited-scroll-expected.txt

@@ -27,11 +27,6 @@
           "object": "LayoutTextControl INPUT id='text'",
           "rect": [-1, 999, 207, 24],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [3, 1003, 200, 16],
-          "reason": "subtree"
         }
       ]
     },

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-transformation-expected.png
index 7246a09..796face 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-transformation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/change-text-content-and-background-color-expected.txt
index 86317a81..3ab36ae 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/change-text-content-and-background-color-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/change-text-content-and-background-color-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutTextControl (positioned) INPUT id='input'",
           "rect": [8, 8, 244, 68],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [30, 30, 200, 24],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [30, 30, 45, 23],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clipped-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clipped-relative-expected.txt
index c380b977..54d2593 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clipped-relative-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clipped-relative-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (positioned) DIV id='inner'",
           "rect": [8, 74, 204, 232],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 74, 204, 232],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
index 727e8d9..139cc3b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

@@ -40,11 +40,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 508, 29, 19],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [285, 500, 15, 150],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.png
index 68eaa8f6..6fd1b34 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/compositing/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/control-clip-expected.txt
index 384094e..946d07b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/control-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/control-clip-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [16, 117, 184, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [76, 117, 64, 16],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText (anonymous)",
-          "rect": [9, 87, 63, 16],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.png
index 4ffb4f2..4f4cd43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt
index ff84e0cf..3ddf8fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/delete-into-nested-block-expected.txt

@@ -33,11 +33,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 127, 30, 20],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 147, 27, 20],
           "reason": "layoutObject removal"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/details-open-repaint-expected.txt
index 58f72e330..4e9cd64d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/details-open-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/details-open-repaint-expected.txt

@@ -12,16 +12,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutTextControl INPUT",
-          "rect": [8, 72, 154, 22],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [10, 75, 150, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutDetailsMarker DIV id='details-marker'",
           "rect": [8, 56, 11, 11],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt
index fd67b94..9cedc68 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexbox/repaint-expected.txt

@@ -12,11 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [138, 128, 654, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [137, 128, 652, 99],
           "reason": "forced by layout"
@@ -27,11 +22,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [148, 128, 644, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [147, 128, 641, 99],
           "reason": "forced by layout"
@@ -42,21 +32,11 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [400, 128, 392, 160],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='left'",
           "rect": [8, 228, 392, 60],
           "reason": "incremental"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [400, 128, 389, 159],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='left'",
           "rect": [148, 128, 252, 160],
           "reason": "incremental"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-expected.png
index 97d6cbc6..df13b1d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-horizontal-expected.png
index 97d6cbc6..df13b1d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/gradients-em-stops-repaint-expected.txt
index 243abb5..443522e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/gradients-em-stops-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/gradients-em-stops-repaint-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow DIV class='em-units'",
           "rect": [8, 8, 784, 147],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='box4' class='box'",
-          "rect": [344, 18, 302, 122],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='box3' class='box'",
-          "rect": [18, 18, 302, 122],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='indicator'",
-          "rect": [345, 19, 240, 20],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [330, 135, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-block-overflow-expected.png
index 7ce99f2..1d7926a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-block-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-color-change-expected.txt
index 8b3642e..8ba094f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-color-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-color-change-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 72, 37, 19],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 72, 37, 19],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-focus-expected.txt
index fdf43bb..3c830bdcae 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-focus-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-focus-expected.txt

@@ -17,11 +17,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [0, 36, 395, 19],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutInline A id='link'",
           "rect": [585, -1, 216, 234],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-outline-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-outline-repaint-expected.txt
index 4f6a48f..cceac32 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-outline-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/inline-outline-repaint-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutInline SPAN id='test'",
           "rect": [5, 153, 92, 45],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 156, 86, 39],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
index 32c822d..29c33297 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 8, 26, 24],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 8, 26, 19],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
index f6045d1..fb3c9c88 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt

@@ -22,16 +22,6 @@
           "object": "LayoutTextControl INPUT id='root'",
           "rect": [0, 0, 64, 22],
           "reason": "full"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [3, 4, 60, 16],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 4, 60, 16],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
index bad5759..ed1d3ca 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -23,16 +23,6 @@
         },
         {
           "object": "LayoutBlockFlow P",
-          "rect": [8, 2200, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 2050, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
           "rect": [8, 2050, 777, 100],
           "reason": "subtree"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-child-outline-expected.png
index f662764..f9cfed9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-child-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-expected.png
index bbeb625a..6eac6ee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-horizontal-expected.png
index bbeb625a..6eac6ee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-relative-expected.txt
index fe9b7280..4978274f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-relative-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-relative-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (relative positioned) DIV id='target'",
           "rect": [8, 152, 784, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 152, 37, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset-expected.txt
index 79799cc..52eefa9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [100, 120, 50, 50],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [100, 120, 39, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset2-expected.txt
index 69fba7e7..b4d3024 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset2-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [102, 122, 50, 50],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [102, 122, 39, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset3-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset3-expected.txt
index 8b4d188..21631f2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset3-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layout-state-scrolloffset3-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='target'",
           "rect": [100, 120, 34, 50],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [100, 120, 34, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
index 445c2ef..9af94023 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -25,26 +25,6 @@
           "object": "LayoutInline (relative positioned) SPAN",
           "rect": [8, 120, 100, 104],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 220, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 220, 100, 100],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 200, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 200, 100, 100],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt
index 8901085..737b1243 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
           "rect": [14, 363, 48, 65],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [28, 363, 20, 20],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt
index 151c399..8ac42c8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -13,71 +13,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [13, 240, 408, 139],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [13, 500, 408, 99],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [13, 480, 408, 99],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 180, 406, 79],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [13, 440, 356, 59],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 80, 355, 119],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 420, 355, 59],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 380, 354, 59],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [65, 380, 304, 59],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 380, 298, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [65, 380, 287, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [134, 360, 131, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [83, 360, 131, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [303, 420, 66, 19],
           "reason": "forced by layout"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-overflow-expected.txt
index 3eb6140fe..5e84ca9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-overflow-expected.txt

@@ -25,16 +25,6 @@
           "object": "LayoutInline SPAN id='t'",
           "rect": [77, 122, 33, 19],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [77, 122, 33, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [47, 122, 33, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt
index 483433ee..1e9e92c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/lines-with-layout-delta-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (floating) DIV id='target'",
           "rect": [8, 58, 200, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 58, 37, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-2-expected.txt
index 75f9b274..eecfd08 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-2-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutImage IMG id='target'",
-          "rect": [48, 100, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutListMarker (anonymous)",
           "rect": [30, 185, 7, 19],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-expected.png
index fdc58141..5202e06 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt
index 885e9f4..7b3762ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/make-children-non-inline-expected.txt

@@ -12,21 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 64, 784, 100],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 264, 784, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 264, 104, 19],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [8, 164, 104, 19],
           "reason": "layoutObject removal"
@@ -44,30 +29,15 @@
         {
           "object": "LayoutText #text",
           "rect": [8, 104, 77, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 104, 77, 19],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 284, 65, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 184, 65, 19],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 324, 61, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 224, 61, 19],
           "reason": "layoutObject removal"
         },
@@ -84,37 +54,17 @@
         {
           "object": "LayoutText #text",
           "rect": [8, 124, 42, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 124, 42, 19],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 64, 39, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 64, 39, 19],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 304, 27, 19],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 204, 27, 19],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [8, 164, 10, 100],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt
index 65b9aaa7..b717f3f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [10, 11, 150, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [168, 11, 53, 16],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 53, 16],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multicol-repaint-expected.txt
index e3566b3..2b64904 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multicol-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/multicol-repaint-expected.txt

@@ -18,18 +18,8 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [234, 15, 300, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [234, 15, 50, 50],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [9, 10, 13, 57],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-clip-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-clip-change-expected.txt
index d98c32e..92cb0f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-clip-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-clip-change-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
           "rect": [48, 108, 86, 25],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [48, 108, 81, 19],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
index d1394c3..be44f90f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [6, 6, 204, 58],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 8, 200, 50],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-continuations-expected.txt
index e5eeb64..da03858 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-continuations-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/outline-continuations-expected.txt

@@ -25,16 +25,6 @@
           "object": "LayoutInline SPAN id='outer'",
           "rect": [16, 148, 87, 23],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 150, 83, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 110, 83, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-delete-line-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-delete-line-expected.txt
index 59b9e36..7841701 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-delete-line-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-delete-line-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='dv'",
           "rect": [8, 74, 80, 36],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 74, 80, 19],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-scroll-body-appear-expected.txt
index e03cd64..3629a18 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-scroll-body-appear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -22,31 +22,11 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 52, 784, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 16, 784, 20],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [118, 52, 370, 19],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 324, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 52, 110, 19],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [785, 0, 15, 585],
           "reason": "scroll"
@@ -55,11 +35,6 @@
           "object": "LayoutView #document",
           "rect": [785, 585, 15, 15],
           "reason": "scroll"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [488, 52, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
index ea747ed..4af7415fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -20,11 +20,6 @@
           "object": "LayoutText #text",
           "rect": [18, 18, 22, 19],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 187, 22, 19],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-document-element-expected.txt
index 30d36f6..436c7811 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-document-element-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-document-element-expected.txt

@@ -13,34 +13,14 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [0, 0, 800, 52],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [8, 16, 784, 20],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [100, 100, 418, 52],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [108, 116, 402, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 116, 402, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 402, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-list-offset-change-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
index 31d699e..3788221 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/positioned-list-offset-change-repaint-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutListItem (positioned) LI",
           "rect": [8, 64, 214, 237],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 64, 214, 232],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
index d0b7756d..9b6a678 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -24,11 +24,6 @@
           "object": "LayoutInline (relative positioned) DIV id='block'",
           "rect": [0, 0, 348, 21],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [1, 1, 346, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt
index d50332509..d0a05c0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -15,26 +15,6 @@
           "object": "LayoutText #text",
           "rect": [112, 193, 171, 19],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [282, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 193, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt
index 579b36c1..ad2b721d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -20,26 +20,6 @@
           "object": "LayoutText #text",
           "rect": [112, 193, 171, 19],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [282, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 193, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
index 201f8c6..7aead8e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt

@@ -28,11 +28,6 @@
           "reason": "scroll"
         },
         {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [3, 65, 225, 235],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [3, 65, 52, 17],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/resize-scrollable-iframe-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/resize-scrollable-iframe-expected.txt
index bab242a..31b7fe88 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/resize-scrollable-iframe-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/resize-scrollable-iframe-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutIFrame IFRAME id='iframe'",
-          "rect": [8, 108, 300, 300],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [8, 193, 285, 200],
           "reason": "incremental"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
index f587970..53b3d9a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
-          "rect": [677, 252, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
           "rect": [677, 252, 100, 100],
           "reason": "subtree"
@@ -32,11 +27,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
-          "rect": [677, 52, 100, 100],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
           "rect": [677, 52, 100, 100],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
index 50e595a43..b5bafcf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

@@ -19,19 +19,9 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV id='recentlink'",
-          "rect": [10, 1822, 150, 150],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
           "rect": [10, 1422, 150, 150],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='recentlink'",
-          "rect": [10, 1422, 150, 150],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/search-field-cancel-expected.txt
index 237d79d..20cd23c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/search-field-cancel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/search-field-cancel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [11, 47, 137, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 47, 58, 16],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-after-remove-expected.txt
index 4382288..c7cf71b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-after-remove-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-after-remove-expected.txt

@@ -15,21 +15,6 @@
           "object": "LayoutText #text",
           "rect": [39, 79, 146, 99],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [67, 158, 39, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [70, 79, 36, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [39, 79, 32, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-clear-expected.txt
index ee84840..86ecba7b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-clear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection-clear-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutText #text",
           "rect": [8, 48, 92, 119],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 48, 8, 19],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
index 432f66c..8a2357a5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [7, 7, 66, 24],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [10, 11, 60, 16],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 60, 16],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shadow-multiple-expected.png
index fb38ede6..85d75ca2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt
index 9919ab9..c4f42b4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/shift-relative-positioned-container-with-image-addition-expected.txt

@@ -27,21 +27,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [10, 94, 728, 90],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [10, 94, 728, 90],
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow BODY",
-          "rect": [18, 102, 712, 74],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutImage IMG",
           "rect": [58, 236, 489, 537],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
index cd0e5b4d1..ea25821c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTableCell TH id='target'",
           "rect": [8, 72, 839, 190],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 72, 835, 190],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt
index dc04508d..f505225 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/subtree-root-skipped-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 35, 16],
-          "reason": "full"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='div'",
           "rect": [8, 288, 10, 20],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
index 878b5ac..fe7fe15 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
index 7fc087a..8519cb56 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [42, 119, 334, 268],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [42, 119, 334, 268],
           "reason": "SVG resource change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [42, 119, 334, 268],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGEllipse circle",
           "rect": [242, 253, 167, 200],
           "reason": "bounds change"
@@ -47,21 +37,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [17, 219, 84, 68],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [17, 219, 84, 68],
           "reason": "SVG resource change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [17, 219, 84, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGEllipse circle",
           "rect": [67, 253, 42, 67],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
index 028a5842..4e268447 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
index 63212f3..067ae9f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt

@@ -8,21 +8,11 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [203, 336, 123, 44],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [203, 336, 123, 44],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [247, 90, 122, 43],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [247, 90, 122, 43],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
index bafc84a..7dd728f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -7,51 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 307, 377],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/circle-move-invalidation-expected.png
index 586ab549..77dd30c0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/circle-move-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt
index 4bb2e2ba..f433cde 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/ems-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 561, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 561, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 561, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 54, 561, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 54, 561, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 54, 561, 86],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt
index 129eaa2..14a8a2b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/exs-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 561, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 561, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 561, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 50, 561, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 50, 561, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 50, 561, 82],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
index b29e0861..1156a97 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
index ca05c1b..78579a6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
index ee51e6fe..7c683fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -17,16 +17,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 42, 784, 170],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 42, 784, 170],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 42, 784, 170],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
index 257f062..a812d42b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 42, 784, 170],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 42, 784, 170],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
index 148a9c0..0173080d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
index 73b7edd..86bc904 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 247, 756, 132],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 247, 756, 132],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 130, 595, 132],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 130, 595, 132],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 15, 446, 129],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 15, 446, 129],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-creation-expected.txt
index 51d1419..5820213 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-gradient-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 23, 697, 194],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 23, 697, 194],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
index 95899ca0..fa0f8be 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
index d9d31c8..d66ebd0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 247, 680, 132],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 247, 680, 132],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 130, 519, 132],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 130, 519, 132],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 15, 370, 129],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 15, 370, 129],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-creation-expected.txt
index 5f5bd517..3a1826f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 23, 622, 194],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 23, 622, 194],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
index 7350cbdb..cd9d729 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -7,46 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 307, 377],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/outline-offset-text-expected.txt
index e314d9f..3f0a6159 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/outline-offset-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [103, 26, 160, 113],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [103, 26, 160, 113],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [63, 26, 160, 113],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [63, 26, 160, 113],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-expected.txt
index 6a60793..a732db1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 72, 402, 402],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRect rect id='targetRect'",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
index 594fd0d..b7feb03 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
index 2b651eb1..204ed29 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-content-with-resources-expected.txt

@@ -13,23 +13,8 @@
         },
         {
           "object": "LayoutSVGEllipse circle",
-          "rect": [48, 112, 322, 322],
-          "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [48, 112, 322, 322],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGEllipse circle",
           "rect": [8, 155, 102, 236],
           "reason": "SVG resource change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 155, 100, 236],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
index 5174083..fa59b5e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

@@ -17,21 +17,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [209, 273, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [209, 273, 200, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [209, 273, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [109, 173, 200, 200],
           "reason": "bounds change"
@@ -52,21 +42,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [59, 273, 50, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [59, 273, 50, 200],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [59, 273, 50, 200],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [34, 173, 50, 200],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-image-expected.txt
index 5bf0507..c32da8c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-image-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-image-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 72, 402, 402],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGImage image",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.png
index b3014e5..8693f39 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
index cc006acc..d4081c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

@@ -17,29 +17,9 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [27, 69, 364, 364],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [27, 69, 364, 364],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [13, 207, 92, 91],
           "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [13, 207, 92, 91],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [13, 207, 92, 91],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
index 04b9c24..6299797 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

@@ -12,16 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [209, 273, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [209, 273, 200, 200],
           "reason": "forced by layout"
@@ -37,11 +27,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [9, 73, 200, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGContainer use id='targetUse'",
           "rect": [9, 73, 200, 200],
           "reason": "bounds change"
@@ -62,11 +47,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [59, 273, 50, 200],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGRect rect id='targetRect'",
           "rect": [59, 273, 50, 200],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
index d7a9cffa..7cac538 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

@@ -12,16 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [9, 73, 400, 400],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRoot svg",
-          "rect": [9, 73, 400, 400],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
           "rect": [9, 73, 400, 400],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
index 9bd5fe1e..bd19ffe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
index 3ff8d17..778d1879e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [45, 87, 328, 328],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [45, 87, 328, 328],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [45, 87, 328, 328],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [45, 87, 328, 328],
           "reason": "bounds change"
@@ -37,21 +27,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [18, 211, 82, 83],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [18, 211, 82, 83],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [18, 211, 82, 83],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [18, 211, 82, 83],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
index b3014e5..8693f39 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
index 5fa0200..60f4a764 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

@@ -12,21 +12,11 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [27, 69, 364, 364],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [27, 69, 364, 364],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [27, 69, 364, 364],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [27, 69, 364, 364],
           "reason": "bounds change"
@@ -37,21 +27,11 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGContainer use",
-          "rect": [13, 207, 92, 91],
-          "reason": "bounds change"
-        },
-        {
           "object": "LayoutSVGPath path",
           "rect": [13, 207, 92, 91],
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGRoot svg",
-          "rect": [13, 207, 92, 91],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
           "rect": [13, 207, 92, 91],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
index 9010aea..f72c2ed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -9,49 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 377],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 307, 377],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 307, 377],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-tspan-from-text-expected.txt
index 309a7c1e..26794f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-tspan-from-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -9,39 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 307, 257],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 307, 257],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGTSpan tspan id='remove'",
           "rect": [10, 63, 307, 257],
           "reason": "layoutObject removal"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
index a21d77b..32b1bd1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 13, 46, 28],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 13, 46, 28],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
index a21d77b..32b1bd1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 13, 46, 28],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 13, 46, 28],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 14671387..d1b0e128 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -20,26 +20,6 @@
           "object": "LayoutText #text",
           "rect": [435, 1012, 173, 19],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutInline A",
-          "rect": [384, 1011, 47, 21],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [385, 1012, 45, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [429, 1012, 7, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [379, 1012, 7, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-background-partial-redraw-expected.png
index 426cba7..4bf72e9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-background-partial-redraw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.png
index 666fd51..59565b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.txt
index 58edac80..d3a72ba7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/svg-image-change-content-size-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow div id='contentBox'",
           "rect": [8, 52, 602, 422],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage img",
-          "rect": [9, 53, 420, 420],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.png
index 46fbf024..7082160 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt
index 4de4504d..dfbfed9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tabgroup-expected.txt

@@ -32,26 +32,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRound'",
           "rect": [390, 38, 314, 80],
           "reason": "became visible"
@@ -82,26 +62,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectRound'",
           "rect": [263, 279, 301, 300],
           "reason": "became visible"
@@ -152,26 +112,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectTriangle'",
           "rect": [507, 233, 236, 159],
           "reason": "became visible"
@@ -182,66 +122,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupTriangle'",
           "rect": [7, 257, 236, 158],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGContainer g id='tabgroupTriangle__0_content'",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='contentTabGroupTriangle0'",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [31, 404, 188, 10],
           "reason": "layoutObject insertion"
@@ -297,46 +182,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRect'",
           "rect": [38, 7, 158, 236],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [15, 291, 150, 25],
           "reason": "layoutObject insertion"
@@ -387,11 +237,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__1'",
-          "rect": [415, 331, 63, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRound__1'",
           "rect": [452, 38, 63, 18],
           "reason": "layoutObject insertion"
@@ -402,121 +247,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__2'",
           "rect": [125, 256, 55, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__3'",
-          "rect": [506, 422, 53, 53],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__2'",
-          "rect": [466, 382, 51, 52],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__3'",
           "rect": [674, 233, 50, 18],
           "reason": "layoutObject insertion"
@@ -527,46 +262,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__2'",
           "rect": [630, 233, 47, 18],
           "reason": "layoutObject insertion"
@@ -577,151 +272,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [129, 257, 45, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [129, 257, 45, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [129, 257, 45, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [129, 257, 45, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [129, 257, 45, 29],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__3'",
           "rect": [177, 256, 42, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [182, 257, 31, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [182, 257, 31, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [182, 257, 31, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [182, 257, 31, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [182, 257, 31, 29],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRect__0'",
           "rect": [178, 6, 19, 66],
           "reason": "layoutObject insertion"
@@ -740,66 +295,6 @@
           "object": "LayoutSVGPath path id='tabgroupRect__2'",
           "rect": [178, 130, 19, 47],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt
index 5100839..f746f02d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-mask-update-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 3, 46, 22],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [10, 3, 46, 22],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
index f470d26a..fcd694d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 0, 550, 117],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [80, 0, 550, 117],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [30, 0, 403, 59],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [30, 0, 403, 59],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt
index 7fb4946..b8d445c1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-rescale-expected.txt

@@ -22,66 +22,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 114, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 114, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 14, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 14, 193, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 13, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 113, 100, 87],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [210, 113, 100, 48],
           "reason": "subtree"
@@ -92,36 +32,16 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 114, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 114, 92, 46],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 114, 92, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 14, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 14, 92, 46],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 14, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [210, 114, 92, 46],
           "reason": "subtree"
@@ -142,91 +62,16 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 0, 8, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 0, 8, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 3, 7, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 3, 7, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 3, 5, 3],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [9, 3, 5, 3],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [9, 3, 5, 3],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 5, 2],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 0, 5, 2],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [0, 0, 5, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [6, 3, 4, 4],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [6, 3, 4, 2],
           "reason": "subtree"
@@ -242,11 +87,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [0, 0, 1, 1],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.png
index 998c8cf..21df321 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-viewbox-rescale-expected.txt
index eb115ec7..eae12fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-viewbox-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -7,86 +7,16 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner2'",
           "rect": [59, 143, 95, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner1'",
           "rect": [59, 43, 95, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 8, 2],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 0, 8, 2],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 0, 8, 2],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner1'",
           "rect": [0, 0, 8, 2],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
index 2ee76285..f1298ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [208, 13, 161, 19],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [208, 13, 161, 19],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [18, 193, 161, 19],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [18, 193, 161, 19],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
index 188ef7fe..e644098 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -7,31 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [200, 185, 240, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [200, 185, 240, 19],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [200, 185, 240, 19],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [20, 5, 240, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [20, 5, 240, 19],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [20, 5, 240, 19],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt
index 502c6f8..cd5e20a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutSVGText text id='status'",
           "rect": [90, 115, 59, 19],
           "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [90, 115, 43, 19],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-detach-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-detach-expected.txt
index 666aa1c..252f840 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-detach-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-detach-expected.txt

@@ -29,16 +29,6 @@
         {
           "object": "LayoutSVGContainer use",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {
@@ -54,21 +44,6 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {
@@ -84,21 +59,6 @@
         {
           "object": "LayoutSVGText text id='use_text'",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-setAttribute-crash-expected.txt
index b0a53b8d..d428deca 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-setAttribute-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/use-setAttribute-crash-expected.txt

@@ -17,21 +17,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer svg:use id='use'",
-          "rect": [33, 33, 50, 50],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRoot svg:svg id='svg'",
-          "rect": [33, 33, 50, 50],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='symbol'",
-          "rect": [33, 33, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGEllipse svg:circle id='circle'",
           "rect": [7, 7, 27, 27],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
index 96d3576..a98ccf6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-foreignObject-expected.png
index 367b8dd..a849a1f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table-collapsed-border-expected.txt
index 71fa8da..1c91e9ff 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table-collapsed-border-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table-collapsed-border-expected.txt

@@ -17,11 +17,6 @@
           "reason": "full"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 198, 95, 74],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTable TABLE id='t'",
           "rect": [8, 10, 91, 82],
           "reason": "style change"
@@ -32,11 +27,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 106, 87, 74],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTableCell TD",
           "rect": [22, 338, 81, 30],
           "reason": "forced by layout"
@@ -68,36 +58,11 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 317, 71, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 133, 71, 19],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 339, 46, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 155, 46, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 295, 40, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 111, 40, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 225, 32, 19],
           "reason": "layoutObject removal"
         },
@@ -115,16 +80,6 @@
           "object": "LayoutTableCell TD",
           "rect": [8, 132, 14, 22],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 225, 4, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 133, 4, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
deleted file mode 100644
index 68f4de3..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
+++ /dev/null

@@ -1,105 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 292, 106, 236],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 100, 106, 190],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 102, 106, 46],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 238],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 292, 102, 236],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 46],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 400, 45, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 161, 45, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 115, 45, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 66, 45, 19],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW1'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW2'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
deleted file mode 100644
index 6bc7f623..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 476],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 280, 59, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 90, 59, 19],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt
deleted file mode 100644
index a736cde..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/table/resize-table-row-repaint-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 192, 59, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 142, 59, 19],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-match-document-change-expected.txt
index fba9d1c2..6a3ed40 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-match-document-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-match-document-change-expected.txt

@@ -17,11 +17,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [18, 130, 77, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [295, 102, 15, 400],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-expected.png
index 74340ac5..165dc240c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-horizontal-expected.png
index 74340ac5..165dc240c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length1-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length1-expected.txt
index da1fa854..d090ffe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length1-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length1-expected.txt

@@ -10,31 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 155],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [20, 0, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 130, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 100, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 130, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 100, 20, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length2-expected.txt
index 14e8b0a..231e451 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align-length2-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 205],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [300, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 80, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 50, 100, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align1-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align1-expected.txt
index 5ef73db..1583d72 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align1-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align1-expected.txt

@@ -10,31 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 105],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [20, 0, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 80, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [120, 33, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 80, 20, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 33, 20, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align2-expected.txt
index 724c326..8676ea1a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/vertical-align2-expected.txt

@@ -10,26 +10,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [0, 0, 800, 247],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [300, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV class='other'",
-          "rect": [0, 0, 200, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 147, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [200, 100, 100, 100],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/roundedrects/circle-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/roundedrects/circle-with-shadow-expected.png
index fae84fe..1d5263e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/roundedrects/circle-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/roundedrects/circle-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-125-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-125-expected.png
index 1eaeafa..dc6e386 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-150-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-150-expected.png
index 048cbec..6e9c23b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-150-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-150-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-175-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-175-expected.png
index 5c54e6b8..eacb58a9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-175-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-175-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-200-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-200-expected.png
index db88771..9fd93e5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-250-expected.png b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-250-expected.png
index c8e1cff..1906706 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-250-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/paint/spellmarkers/document-markers-zoom-250-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/plugins/embed-attributes-style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/plugins/embed-attributes-style-expected.png
index bb35092..7d7bb1f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/plugins/embed-attributes-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/plugins/embed-attributes-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/absolute-position-headers-and-footers-expected.png
index 217314d7..a20e3c1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index df64b743..cc3cceb3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index 5273ffd..fdf7c0519 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-expected.png
index 2f6271c..475c3c3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index ca1387fa9..7592ac2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index 4726c75..cdc6d87 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/iframe-print-expected.png
index 7ede3934..57ab9856 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/linux/printing/list-item-with-empty-first-line-expected.png
deleted file mode 100644
index e3df64c6..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/printing/list-item-with-empty-first-line-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
index ec01181b..ceac7b88 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
index eef3fcc2..6f51cbb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
index c6686448..6ca7b10 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
index cb7950c..e54c341f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
index 5fbc53ce..8eb2806 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
index c2dd653..dec0072 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
index 9fa8a25..41461aa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
index 410cd58..a76afea73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
index b62303cd..e2f927e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
index 637e506..136312f8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
index 32e5540..1ea1558 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
index 654984fd..c95a6cb9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
index 5f1dd2ed..57c89258 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
index 085c877a..af2121f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
index 4f550ed..941663d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
index 0d51707..0f828bef 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
index 5498dda..6fa2ed6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
index fb24595..8a934fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
index 227ba6e..ed2ad0a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
index 54a1f77..9a60f60d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
index 0f679b8..845ce5c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
index 10cdf67..69fcfc67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
index 17c369e1..cb564afe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
index 66a12ad..943298db 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
index 4250915..a88e5a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
index b5b89b6..0210e4f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
index b16768f..bd1d0625 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
index c189689..43f99909 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
index e9a01a92..a817445 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
index cb893466..4cf430fd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
index 1f625e7..52a51c0b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
index ae6f86c..aace9f1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
index 52cf3bc..5ca8deb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
index c6b490e..a30d2e0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
index cc4051e0..e8212ad 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
index 7d23b8977..ea54b78 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
index ec74ea34..b4d4de2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
index fe5832d9..7488b38 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
index 860df75..c92695ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
index 97c19c3..4d90f86 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
index ff096df..b3772256 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
index f97c362d..493dd97 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
index 5d58d197..41851ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
index 9629add..87e3105 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
index 4a077e8..9f364c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
index 1186b43e..f84a55f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
index 2773495f..a81ef5a9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
index 74f3677c..ff7d261 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
index ca7b084..56d72ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
index 208f27b7..8d1c602 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
index 5d14131..991db118 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
index 4e801ab..c4fceefc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
index 086740b..db8eaee6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
index 0af0121..deed55c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
index 646f089..dbe9824 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
index e2e3124d..21acbce 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
index 4fb2119..3d6d287 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
index b482b50..95e3f4e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-path-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
index 5316e09..1c2aa10 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
index a446dad..5490db2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
index ef91b5c..d3fc501 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
index 7fa2336..c39cbc8c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
index 75cc643..271bb799 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
index 0036833..af8eeea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
index 611c9e1..c4a0f02 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
index fa2bdb00..4a5ab96 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
index b1fd655..81250a2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
index de08d8c..6edc760 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
index 563e1e4..b983687 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
index c0bf137..64c6a544 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
index e8547c2a..29bdaee3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
index 9b70d48a..b9bcce7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
index 6d6eff0..0ce2b36 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
index e57e0a2..c197483f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
index f2b71f3..2d15cdf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
index d2c670b..4b09a73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
index 7f4eaad9..b525018 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-09-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
index 818463b..f5b11d3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-10-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
index 7f65175d..4961942 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-12-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
index b38cda3..87e1181 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-14-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
index 755e0428..1204007 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-15-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
index 392d029..1a6ebac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
index c43bf23..5caccd8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
index e48abdb..b6bc322 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
index ae88e24..e6cb37a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/render-elems-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
index 49f7cf66..0a2945ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
index 507c2d5..5ff126a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-04-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
index 6e9e27e..9f974d81 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
index 878f1c7..03a5dac4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
index d5769984..38e18f1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
index 3a7bdcc..3026bcb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
index 1e9ea83..72f9dab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
index af047399..21c654b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
index 7a405cb..a2cc2ed 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
index d0facffb..2dee6ba 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
index aee49b9..1a594c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
index 8e200a9..69ca7ce 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
index 84df11d1..0c5ed15 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
index 90097deb..c9122147 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
index cf796f87..2c0b0edc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
index 8bb0b1f6..6c4c5b84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
index 6089abfc..cdc1833 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
index cde6644f..9ec746f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
index 28a3f59..9eb5f169 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
index 039a5c4..cf05f566 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
index 3ae26bba..32bcd55 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
index ca111800..5352bc2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
index 3288e34..b7f51a1a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
index 7a3847f..617112c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-01-b-expected.png
index 5919160..9aa6f727 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-05-b-expected.png
index dbde98bd..4ff9d7f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
index 60729fc..8b5f7c0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
index ba450f38..765ba1c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
index abb1e3d..6125c90 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
index 1fef2d89..8d1dc14a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
index 14d4417..718ae3b6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
index cd75a1d..89ef4d20 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-repeat-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-repeat-expected.png
index 47a0174..dd483a3f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/background-repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-1-expected.png
index 933c364b..9876ce91 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-3-expected.png
index 5fdd1d0..a86ad4b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-5-expected.png
index e9e3b21..f952015 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
index 49f008e..1ba15a3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-deviceScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-deviceScaleFactor-expected.png
index cc231ae..e3b2c10 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-deviceScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-deviceScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-pageScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-pageScaleFactor-expected.png
index edcae5f..a74e20d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-pageScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/image-respects-pageScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-1-expected.png
index 7d0f5fe..233f87ca 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-2-expected.png
index 1f367433..260e36c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-image/img-preserveAspectRatio-support-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/as-object/object-box-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/as-object/object-box-sizing-no-width-height-expected.png
index 09113f4..47ce29d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/as-object/object-box-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/as-object/object-box-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/filters/feTile-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/filters/feTile-expected.png
index c7f3dcd5..0b8b48f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/filters/feTile-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/filters/feTile-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/masking/maskRegions-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/masking/maskRegions-expected.png
index 42ce301..85a16a1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/masking/maskRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/masking/maskRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternPreserveAspectRatioA-expected.png
index 32f73e1..f5ccc8a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternPreserveAspectRatioA-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-expected.png
index 98426bd..10db30c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-positioned-objects-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-positioned-objects-expected.png
index 6e20dae..65650dbf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-positioned-objects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/paints/patternRegions-positioned-objects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textDecoration2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textDecoration2-expected.png
index 4bb0644..23d32eb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textDecoration2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textDecoration2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textFeatures-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textFeatures-expected.png
index 13d7cef1..fef76b5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textFeatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textFeatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textGlyphOrientationHorizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textGlyphOrientationHorizontal-expected.png
index c052a348..faa7378 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textGlyphOrientationHorizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textGlyphOrientationHorizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textProperties-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textProperties-expected.png
index 62c23e68..6be8d0ca2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textProperties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/textProperties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/verticalText-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/verticalText-expected.png
index b641b1f..4b1ce5f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/verticalText-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/batik/text/verticalText-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-default-object-sizing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-default-object-sizing-expected.png
index 8137283..3491a4c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-default-object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-default-object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-pattern-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-pattern-svg-expected.png
index 80ab6e7..c706b31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-pattern-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/canvas/canvas-pattern-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/button-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/button-expected.png
index ba7b0b4..807730d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/colourpicker-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/colourpicker-expected.png
index 7900367..923a06f5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/colourpicker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/colourpicker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/combobox-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/combobox-expected.png
index 39c9afb9..4e3f2aa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/combobox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/combobox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/scrollbar-expected.png
index 043288a..8a63b0c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/selectionlist-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/selectionlist-expected.png
index 1dfe4ad7..5afc2e1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/selectionlist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/selectionlist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/slider-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/slider-expected.png
index d0faeca..36b3547 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/slider-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/carto.net/slider-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-pixelation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-pixelation-expected.png
index 7eab378..2e11704 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-pixelation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-pixelation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-text-and-shape-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-text-and-shape-expected.png
index ec92336..2d3b41cc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-text-and-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-text-and-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-with-text-clipped-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-with-text-clipped-expected.png
index 9cacae6..0a13511 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-with-text-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/clip-path-with-text-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
index 6bbba33a..a9562d3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-expected.png
index 7facd97..ea1ad25d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
index 3304b43..c5ff57ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/clone-element-with-animated-svg-properties-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/clone-element-with-animated-svg-properties-expected.png
index f415df9e..5f18329 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/clone-element-with-animated-svg-properties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/clone-element-with-animated-svg-properties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/embedding-external-svgs-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/embedding-external-svgs-expected.png
index 4f085933..0113d8d5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/embedding-external-svgs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/embedding-external-svgs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/focus-ring-expected.png
index fe675ca4..b364393 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/foreign-object-skew-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/foreign-object-skew-expected.png
index c384813..56e90d02 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/foreign-object-skew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/foreign-object-skew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
index 5c968612..b8a202dc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
index f1c9e045..f38150e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
index f883c1ac..61af6cb7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/gradient-with-1d-boundingbox-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/gradient-with-1d-boundingbox-expected.png
index fe3e213..d775ae1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/gradient-with-1d-boundingbox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/gradient-with-1d-boundingbox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/inline-svg-in-xhtml-expected.png
index 7a91b1fe..8ea9886 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/inline-svg-in-xhtml-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/inline-svg-in-xhtml-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/invalid-css-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/invalid-css-expected.png
index 1d8bde3..4a803f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/invalid-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/invalid-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
index c186e09..85e1df0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-transform-expected.png
index ba5d791..6032abb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-expected.png
index 35280efe..35a4926 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-transform-expected.png
index f93f255..abf5f55 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewBox-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewTarget-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewTarget-expected.png
index c186e09..85e1df0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewTarget-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-viewTarget-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-zoomAndPan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-zoomAndPan-expected.png
index c186e09..85e1df0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-zoomAndPan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-a-03-b-zoomAndPan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-uri-01-b-expected.png
index 679b7b6b..ac69276e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/marker-orient-auto-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/marker-orient-auto-expected.png
index 69a79ee..d26ada0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/marker-orient-auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/marker-orient-auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/masking-clipping-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/masking-clipping-hidpi-expected.png
index 9eca67d..b0ead1a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/masking-clipping-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/masking-clipping-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-expected.png
index 6f4b6158..79a8763 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-standalone-expected.png
index 6f4b6158..79a8763 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-container-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-expected.png
index 1f39dc85..cd9a415 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-standalone-expected.png
index 1f39dc85..cd9a415 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/mouse-move-on-svg-root-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-expected.png
index 64039e6..febc5d7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-height-expected.png
index 6fb3f99b3a..e274033 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-width-expected.png
index 6fb3f99b3a..e274033 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-explicit-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-no-width-height-expected.png
index 10a4ba8..65361ff 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-incorrect-tiling-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-incorrect-tiling-expected.png
index 1e9f4c80..74756517 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-incorrect-tiling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-incorrect-tiling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-expected.png
index 10cd503..af20e5ea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-gaps-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-gaps-expected.png
index 7484a19..d21a1d1f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-gaps-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/pattern-rotate-gaps-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/preserve-aspect-ratio-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/preserve-aspect-ratio-syntax-expected.png
index db30c9d..67435c9a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/preserve-aspect-ratio-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/preserve-aspect-ratio-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/second-inline-text-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/second-inline-text-expected.png
index f769f6b..7128f9b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/second-inline-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/second-inline-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shape-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shape-rendering-expected.png
index 8ce7584..443822c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shape-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shape-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shapes-supporting-markers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shapes-supporting-markers-expected.png
index 901ce67..819dea0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shapes-supporting-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/shapes-supporting-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/stroke-width-large-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/stroke-width-large-expected.png
index e9de682..e976c9ca5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/stroke-width-large-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/stroke-width-large-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-float-border-padding-expected.png
index 131c997..79071c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png
index ddb041f..8f0b4d28 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/svg-fonts-in-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/text-match-highlight-expected.png
index 8ea076f..456c7bd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/transformed-outlines-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/transformed-outlines-expected.png
index 98d2b5ea..1a9df9f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/transformed-outlines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/transformed-outlines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-container-in-target-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-container-in-target-expected.png
index 14ccee9c..3d718a3d5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-container-in-target-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-container-in-target-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-target-container-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-target-container-expected.png
index 27f4e44..dcb2743 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-target-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-modify-target-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-containing-use-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-containing-use-expected.png
index 6334ec74..e9fbec7a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-containing-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-containing-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-expected.png
index d22ca2b..5127c74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-symbol-inside-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-symbol-inside-pattern-expected.png
index 60a2563..2a9e268 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-symbol-inside-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-symbol-inside-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-use-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-use-expected.png
index d22ca2b..5127c74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-on-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-referencing-nonexisting-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-referencing-nonexisting-symbol-expected.png
index 455ce24..4ad029b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-referencing-nonexisting-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-referencing-nonexisting-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-transform-expected.png
index 46e06e7..daee0373 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/use-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/viewbox-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/viewbox-syntax-expected.png
index 9625a70..a3158cf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/viewbox-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/custom/viewbox-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/dom/SVGLocatable-getCTM-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
index 896d9fb1..b9fad19 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/dom/css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/dom/css-transforms-expected.png
index 39d340b0..b9de6f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/dom/css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/dom/css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
index 8e7163d2..ee985b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
index 8754e62a..f99c7f0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
index 8e7163d2..ee985b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
index 8754e62a..f99c7f0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/error/017-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/error/017-expected.png
index 6f7d4c4..23b7a97b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/error/017-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/error/017-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/003-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/003-expected.png
index 68013bf..66173d9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/006-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/006-expected.png
index 693317e..9f09bb44 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/008-expected.png
index ecb9969..5e871b87 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/011-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/011-expected.png
index 693317e..9f09bb44 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/011-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/mixed/011-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/001-expected.png
index 84010ac6..0a47941 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/002-expected.png
index d31a903..2e30a7c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/005-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/005-expected.png
index 783919f..5f6c578 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/006-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/006-expected.png
index bcf10c4..2bc9986 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/007-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/007-expected.png
index 6afc7d3..3bf3afb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/perf/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
index a100a71..ece42a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
index b900226..81cfead 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/in-html/circle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/in-html/circle-expected.png
index a9078b7..bb82e875 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/in-html/circle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/in-html/circle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/ligature-queries-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/ligature-queries-expected.png
index ec904b8..b8db8168 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/ligature-queries-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/ligature-queries-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/small-fonts-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/small-fonts-3-expected.png
index 542084d..3002088 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/small-fonts-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/small-fonts-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-decorations-in-scaled-pattern-expected.png
index 1f0c685b..67a97866 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-decorations-in-scaled-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-decorations-in-scaled-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-fill-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-fill-opacity-expected.png
index e5b706aa..87e466e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-fill-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-fill-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-01-b-expected.png
index 3423c9d..fa47eec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-05-b-expected.png
index 1b71308..191ff7d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-deco-01-b-expected.png
index 703a5a4..a6d1d0b3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-path-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-path-01-b-expected.png
index c44f899..814bf50e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-path-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-path-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-06-t-expected.png
index 0a3a743..369e0d6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-07-t-expected.png
index b3884a0..39467b3d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-08-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-08-b-expected.png
index bf6e34a..94954b08 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-08-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/text/text-selection-text-08-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-clip-path-expected.png
index 204ec07..895c08c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-expected.png
index 5c5ffd9..f7b2eabd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/svg-css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
index e7e3686eef..f4c3bb5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
index 6bdc747..70a4440 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-with-svg-transform-expected.png
index e4e4f0c..b3bedc99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/transforms/text-with-pattern-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/wicd/test-scalable-background-image1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/wicd/test-scalable-background-image1-expected.png
index c360583..c7d43e0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/wicd/test-scalable-background-image1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/wicd/test-scalable-background-image1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
index bc0bc55..7eb5d48 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-foreignObject-expected.png
index 8fa41f5..bbf57f92 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-hixie-mixed-008-expected.png
index f82033a..355fcd05 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
index 9fcf9e53..78d9539 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-mask-with-percentages-expected.png
index 7067d7a..50cfc862 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-mask-with-percentages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-float-border-padding-expected.png
index d6422f31..140921f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
index f16ca70..05d55fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
index f16ca70..05d55fb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
index cb266a2..ec280e1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
index b869e0da..6d5ec047 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-hixie-mixed-008-expected.png
index f3ff55a..6800f9a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-svg-float-border-padding-expected.png
index 5bd9f66d..d3fe510 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/text/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-1-expected.png
index ab2350e..f447909 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-2-expected.png
index 8acde62..9005eef 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/layering/paint-test-layering-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10009-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10009-expected.png
index e050111..22d15344 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10036-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10036-expected.png
index 5a9b8d9..b5531ecc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10036-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10036-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10039-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10039-expected.png
index 279e213..f5a92c0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug10039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1055-1-expected.png
index b31b93d8..fadb304 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1055-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1055-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1067-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1067-2-expected.png
index bca819e..74e83e5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1067-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1067-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug106816-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug106816-expected.png
index 19ad23e..238d1a68 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug106816-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug106816-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug109043-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug109043-expected.png
index 8269538..f12676c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug109043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug109043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-1-expected.png
index 0fd6d34..25c8a7b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-3-expected.png
index b87a287..66e6ca33 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug113235-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384q-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384q-expected.png
index 201da21..cf40a27 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384q-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384q-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384s-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384s-expected.png
index 7061bd1..7825ff3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug11384s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1188-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1188-expected.png
index 14e83b0..76a96b2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug119786-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug119786-expected.png
index a91a2a2..3198303 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug119786-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug119786-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1224-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1224-expected.png
index acb8c1b..fec94ba0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1224-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1224-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12384-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12384-expected.png
index 94193d6..e3c7cd8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12384-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12384-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1261-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1261-expected.png
index 127d696..07f4066b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1261-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1261-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12908-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12908-1-expected.png
index edc74443..9cb3366 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12908-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12908-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12910-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12910-expected.png
index 8fd2c9c..2a0f43e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12910-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug12910-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1302-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1302-expected.png
index 85a586be..d56df90 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1302-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1302-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug13118-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug13118-expected.png
index f2385bc..52e1043b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug13118-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug13118-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug133756-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug133756-2-expected.png
index 6826723..4417460 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug133756-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug133756-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug139524-4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug139524-4-expected.png
index 8797fd5..7607abc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug139524-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug139524-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14323-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14323-expected.png
index 97f5ab0..07d4357e9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14323-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14323-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1474-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1474-expected.png
index 5c4cad5..3e280e3c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1474-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1474-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14929-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14929-expected.png
index 1227d083..02e85f3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14929-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug14929-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug15933-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug15933-expected.png
index e9eb979..60b7ed6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug15933-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug15933-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug16252-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug16252-expected.png
index 81354b1b..9b2ea199 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug16252-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug16252-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17168-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17168-expected.png
index 5f585155..d4fb5ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17168-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17168-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17548-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17548-expected.png
index 27a351e3..007a733 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17548-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17548-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17587-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17587-expected.png
index a7f595c..ef416d3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17587-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug17587-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1800-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1800-expected.png
index ddd2549..d6ea28c4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1800-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1800-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802-expected.png
index 3fc06e0..604ab85 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802s-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802s-expected.png
index 3fc06e0..604ab85 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1802s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1809-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1809-expected.png
index e050111..22d15344 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1809-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1809-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1828-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1828-expected.png
index 3e96f6f..f93a517 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1828-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug1828-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18359-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18359-expected.png
index 188b76e..cb166ba61 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18359-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18359-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18558-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18558-expected.png
index 855508c..eccf1a8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18558-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18558-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18955-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18955-expected.png
index 5dc63e3..303493403 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18955-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug18955-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug19599-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug19599-expected.png
index cf86947..de4c1fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug19599-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug19599-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2065-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2065-expected.png
index 66483d2..598a0ae2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2065-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2065-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug20804-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug20804-expected.png
index ea233db..4fd11be 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug20804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug20804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21299-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21299-expected.png
index 554fbe8f..42c2390 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21299-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21299-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21918-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21918-expected.png
index 2380f46b..a787ee1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21918-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug21918-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug220536-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug220536-expected.png
index 9af9178a..72e0959 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug220536-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug220536-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug221784-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug221784-1-expected.png
index ea1c0ae..b1dcb1e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug221784-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug221784-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2-expected.png
index 3c247af..20ce360 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2a-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2a-expected.png
index 3c247af..20ce360 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-2a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3-expected.png
index 9c51d60d..03a551a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3a-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3a-expected.png
index 9c51d60d..03a551a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug22246-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2267-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2267-expected.png
index ef58994b4..ea295afa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2267-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2267-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2296-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2296-expected.png
index 7ea913c..13e0f35 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2296-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2296-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug23235-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug23235-expected.png
index ea866e6c..4ee121e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug23235-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug23235-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24503-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24503-expected.png
index b52af04..fddfaacf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24503-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24503-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24627-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24627-expected.png
index bde9314d..55247e9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24627-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24627-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24661-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24661-expected.png
index 322449b..bc114421 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24661-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24661-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-3-expected.png
index 564a51e..9126a3ad 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2479-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24880-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24880-expected.png
index b43a3e81..a6a5581 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24880-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug24880-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug25004-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug25004-expected.png
index e050111..22d15344 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug25004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug25004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2585-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2585-expected.png
index 10eafdd..3a33c36 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2585-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2585-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2684-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2684-expected.png
index 9828135..95f396d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2684-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2684-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27038-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27038-2-expected.png
index 2a074fe..024424f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27038-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27038-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2757-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2757-expected.png
index 5c37a46b..4fd622f3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2757-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2757-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2773-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2773-expected.png
index 9828135..95f396d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2773-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2773-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27993-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27993-1-expected.png
index 8d4e6c2..796778d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27993-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug27993-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2886-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2886-expected.png
index b852012e..bd50bfd6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2886-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug2886-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug28928-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug28928-expected.png
index d05ead5..ed05941 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug28928-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug28928-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29058-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29058-1-expected.png
index 35d8326..efd8620 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29058-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29058-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29157-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29157-expected.png
index ce11f33..d659c77c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29157-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug29157-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30273-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30273-expected.png
index 7f4af91..82920fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30273-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30273-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-1-expected.png
index a5a1f488..c7eb339 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-2-expected.png
index a5a1f488..c7eb339 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30332-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30418-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30418-expected.png
index f0738af..874a079 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30418-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30418-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30692-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30692-expected.png
index cff317d..4026f39 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30692-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug30692-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3191-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3191-expected.png
index bb915cd..aade873 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3191-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3191-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-2-expected.png
index f4494b4f..4f1166f45 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-5-expected.png
index 743f87a8..64ba5e8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32205-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3260-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3260-expected.png
index 08cc479..94c51ee 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3260-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3260-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3263-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3263-expected.png
index 7048b3d..4c11c91 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3263-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3263-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32841-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32841-expected.png
index ecf05be..d09d4ec91 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32841-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug32841-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3309-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3309-2-expected.png
index e0a6ca18..c1e161b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3309-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3309-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug33137-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug33137-expected.png
index eaf009b..f09e735b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug33137-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug33137-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug34176-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug34176-expected.png
index cebf081..8d467277 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3454-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3454-expected.png
index 43ffca43..6e9861e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3454-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3454-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug35662-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug35662-expected.png
index 4f47207..4bbc4a1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug35662-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug35662-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3718-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3718-expected.png
index 0ae3669..7001e20 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3718-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3718-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug39209-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug39209-expected.png
index cb03dc8..c7bae74c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug39209-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug39209-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3977-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3977-expected.png
index 36f616d..6fa62109 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3977-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3977-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42187-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42187-expected.png
index f0270f8e..c7e4f509 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42187-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42187-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42443-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42443-expected.png
index 93e96b1..d237ce69 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42443-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug42443-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4284-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4284-expected.png
index 6e0bc217..0cc363c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4284-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4284-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4385-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4385-expected.png
index 2cf11100..ece2a9f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4385-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4385-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug43854-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug43854-1-expected.png
index ddf12ea..8c43395 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug43854-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug43854-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4427-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4427-expected.png
index b4d8a42d..7b18e0a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4427-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4427-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4429-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4429-expected.png
index b6a9d17..5500976 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4429-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4429-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44505-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44505-expected.png
index 61ad16c..deb5ed72 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44505-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44505-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44523-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44523-expected.png
index 80f1ad1..f6b2ba4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug44523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4501-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4501-expected.png
index 27e5b67..f960ffd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4501-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4501-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4520-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4520-expected.png
index d9710c8..f6781ef 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4520-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4520-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4523-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4523-expected.png
index dd164d34..b3b7f5505 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug45486-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug45486-expected.png
index fdebe44c..1c162a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug45486-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug45486-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4576-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4576-expected.png
index ef00d08..d5dd667 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4576-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug4576-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-1-expected.png
index 92eb3f42..70a6151 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-2-expected.png
index 92eb3f42..70a6151 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-3-expected.png
index dbd49a5..553fa83 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-5-expected.png
index 36e8fc23..374f92e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-expected.png
index 36e8fc23..374f92e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46268-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46924-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46924-expected.png
index 2d40a54..77abdbd 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46924-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46924-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46944-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46944-expected.png
index 0425d50..3411aac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46944-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug46944-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug47432-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug47432-expected.png
index 5819c3d4..059cb9e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug47432-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug47432-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-1-expected.png
index 211c5a2..e46290c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-2-expected.png
index 525957fa..b8d95e2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug48028-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51037-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51037-expected.png
index 62311df1..08d5af0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51037-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51037-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51140-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51140-expected.png
index 52e25b8..ae03cb2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51140-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug51140-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5188-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5188-expected.png
index 2e5bb32..c947eaf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-1-expected.png
index cf925b4..1c04486 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-2-expected.png
index 49c04a2..8127afa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug53690-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug54450-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug54450-expected.png
index 8eb2593..8419be28 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug54450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug54450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug55694-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug55694-expected.png
index 4ed75be..bf1ea96 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug55694-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug55694-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug56563-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug56563-expected.png
index 965d3a9..2e7b2e3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug56563-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug56563-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57300-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57300-expected.png
index 08fe4ca..e82d2e3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57300-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57300-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57378-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57378-expected.png
index f1c41a1..af2db07 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57378-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug57378-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5797-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5797-expected.png
index c83cc77..091cc0c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5797-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5797-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5799-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5799-expected.png
index 4ea9202..cbf4957 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5799-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5799-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5835-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5835-expected.png
index 1500fe14d..647e85c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5835-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5835-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5838-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5838-expected.png
index 40619af2..33e5dd7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5838-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug5838-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug58402-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug58402-1-expected.png
index 5fecb10..38251cc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug58402-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug58402-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60013-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60013-expected.png
index 14fc322..9e0b003 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60013-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60013-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60749-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60749-expected.png
index 33dfe60e..77dec324 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60749-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60749-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60804-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60804-expected.png
index 4921c0f..85b5158f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60807-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60807-expected.png
index 4921c0f..85b5158f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60807-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60807-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60992-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60992-expected.png
index fa147d4..f2c016f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60992-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug60992-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6184-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6184-expected.png
index f4de592d..8f81b45b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6184-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6184-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6304-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6304-expected.png
index 3b664bb..1ba08c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6304-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug6304-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug647-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug647-expected.png
index 03da1c34..f14c00b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug68998-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug68998-expected.png
index d239b22a..cadfbaa4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug68998-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug68998-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-1-expected.png
index 1671ed64..9d42426 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-2-expected.png
index 105a8089..5299f39 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug69382-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-1-expected.png
index 6db4cf00..ca0f5a5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-2-expected.png
index 9b95881..5a91629 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7112-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7121-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7121-1-expected.png
index fbfa85b..1980e68 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7121-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7121-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug727-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug727-expected.png
index 9b83bb0..3cce224 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug727-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug727-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7342-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7342-expected.png
index 490a83c..09c2c509b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7342-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7342-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7471-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7471-expected.png
index cb01620..409c2b16 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7471-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7471-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.png
index 23e2c70..b421d42 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug7714-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug81934-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug81934-expected.png
index a48cc295..6eacdd6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug81934-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug81934-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug82946-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug82946-1-expected.png
index 8d08e949..09b337dc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug82946-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug82946-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8381-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8381-expected.png
index e6ec7ca..f6cd0c7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8381-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8381-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug86708-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug86708-expected.png
index a883573..401356a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug86708-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug86708-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8950-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8950-expected.png
index 21eeb53..321a815d4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8950-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug8950-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-1-expected.png
index d756063..a48f2c3c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-2-expected.png
index 5c57193..2a683c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9123-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9271-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9271-1-expected.png
index 8dfd5cdc6..7f6c35e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9271-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9271-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug965-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug965-expected.png
index 3ebefec7..a9dfd9e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug965-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug965-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9879-1-expected.png
index 734235e..6870c67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug99948-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug99948-expected.png
index a01a6bfe..84b47a81 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug99948-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug99948-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/bloomberg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/bloomberg-expected.png
index c0758c65..f4d92ab 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/bloomberg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/bloomberg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/borders-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/borders-expected.png
index dafb21fb..39d86e7b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_span-expected.png
index 351c034..3b29d5c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_auto-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_auto-expected.png
index ad4380ef..a049f94 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFix-expected.png
index abb5168..832dea4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
index eb0b15f..391fc00 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoPer-expected.png
index 333c2d14..4f0ef10 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fix-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fix-expected.png
index 969a8c8d..4fb8970 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fixPer-expected.png
index bedfddf..b65a810 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_per-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_per-expected.png
index cb0b384..c773f5d8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_auto_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_auto-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_auto-expected.png
index 0db29f70..928ced46 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoFix-expected.png
index 5fea300..0444732 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoPer-expected.png
index 4a38e84..bd39df1f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fix-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fix-expected.png
index 93a703e7..e224a3a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fixPer-expected.png
index 15a45b9f..01f944084 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_per-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_per-expected.png
index 629b2e20..550bc09 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/col_widths_fix_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/margins-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/margins-expected.png
index 2836901b..2eb7360 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/margins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/margins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/misc-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/misc-expected.png
index 13c70c2b..b7e1c54 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/misc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/misc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/one_row-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/one_row-expected.png
index 5cc0700..ff61b803 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/one_row-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/one_row-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/row_span-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/row_span-expected.png
index 1f65a97..713fad6c5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/row_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/row_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_frame-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_frame-expected.png
index 4c3f4d3..176c4632 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_frame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_frame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_widths-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_widths-expected.png
index 2364ad5f..d0e3a26f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/core/table_widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendCol2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendCol2-expected.png
index 89b8f723..ac09f2c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendRowsExpand1-expected.png
index 6d118e94..6e83ade 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendTbodyExpand1-expected.png
index 7d17662..bf7b17d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/appendTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsRebuild1-expected.png
index 1d10447..9a6c1f8d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink1-expected.png
index 6361464..7d298e3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink2-expected.png
index 512d417..d069890 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCellsShrink2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol1-expected.png
index 2182d565..a503043 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol2-expected.png
index c070b50..67eedac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol3-expected.png
index a53cef2e..aefa3842 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteCol3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup1-expected.png
index 31f330a..b8b3a952 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup2-expected.png
index 543841a..9905daa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteColGroup2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsRebuild1-expected.png
index 62d179bc..8c5c3252 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsShrink1-expected.png
index 62d179bc..8c5c3252 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteRowsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyExpand1-expected.png
index ea0d3ec..27bf33c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
index f238c9c..456ccb4e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand1-expected.png
index 4971881c..fa893ff 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand2-expected.png
index b862d0b..7aa0efe 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsExpand2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild1-expected.png
index 813f822..6788831 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild2-expected.png
index 1cbbdb8..a976340 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCellsRebuild2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups1-expected.png
index 081641b..a28e8b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups2-expected.png
index 84a65e8..7fd90e3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertColGroups2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols1-expected.png
index 081641b..a28e8b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols2-expected.png
index 081641b..a28e8b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols3-expected.png
index 84a65e8..7fd90e3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols4-expected.png
index 081641b..a28e8b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols5-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols5-expected.png
index 081641b..a28e8b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertCols5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsExpand1-expected.png
index ec917d1e..f3d5cf4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsRebuild1-expected.png
index fa93201..1559ad73 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/insertRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/tableDom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/tableDom-expected.png
index 64a760b..75d7d36 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/tableDom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/dom/tableDom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/body_col-expected.png
index 450326e..99a4aa3c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/col_span-expected.png
index 50a079f..1808f78 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_center-expected.png
index a200995..60f97ac 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_justify-expected.png
index 77c325c..4c480266 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_left-expected.png
index 56249076..cee6dea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_right-expected.png
index 19950402..0348332f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_span-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_span-expected.png
index f3af146..f7b9bc6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_pct-expected.png
index 65a0362..8f71ab5b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_px-expected.png
index 27129c09..1bfd453d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_border-expected.png
index e0610d8..ff2a32e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_box-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_box-expected.png
index e0610d8..ff2a32e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_frame_box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_overflow_hidden_td-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
index eb37af4..7d84c0d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_center-expected.png
index feba357..903beed8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_left-expected.png
index 54a446d5..2b3229c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_right-expected.png
index cb0a0d9..9ea1803 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/table_row_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
index 9277e3a..e660c561 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
index 9277e3a..e660c561 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black-expected.png
index eaa897a0..59cfe7c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
index eaa897a0..59cfe7c6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
index c527083..d0e87a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
index c527083..d0e87a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
index c5d7e71..70113109 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
index c5d7e71..70113109 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
index fde3e17..a5d02bdb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
index fde3e17..a5d02bdb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green-expected.png
index 9767895..77457449 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
index 9767895..77457449 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
index aba478f..73485f95 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
index aba478f..73485f95 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
index b6e78d0..557fded 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
index b6e78d0..557fded 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
index e7dde1b..1e06e67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
index e7dde1b..1e06e67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
index 8d8c883..7d7c37fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
index 8d8c883..7d7c37fa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
index f00beba..78cde55 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
index f00beba..78cde55 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red-expected.png
index d5519f5..d0a533b5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
index d5519f5..d0a533b5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
index 91423aa..b1bfb908 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
index 91423aa..b1bfb908 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
index 12a5dafb..cb733734 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
index 12a5dafb..cb733734 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white-expected.png
index b51df4f1..a9d14422 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
index b51df4f1..a9d14422 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
index 8b5f61d..8f3f378 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
index 8b5f61d..8f3f378 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_1-expected.png
index 3aab808b..0f12b7ea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_2-expected.png
index a367e97..94d3f20 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_3-expected.png
index 5344567..3c81219 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_border_3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_bot-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_bot-expected.png
index 258b9a3..b2c189c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_bot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_bot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_top-expected.png
index 7bd9d096..41580da 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding-expected.png
index 843aebb..8f5ebaa 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding_pct-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
index a6734b38..a8f768f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_id-expected.png
index aa1fc9b..d11bb900 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_row_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
index e8ec73b..9068321 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_center-expected.png
index 7a7ea00..bd9e214 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_left-expected.png
index 203c8015..31dd0b99 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_right-expected.png
index 4b10ed9..aa47430a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_colspan-expected.png
index 1af5bfa..6546fcb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_height-expected.png
index 69a9ded..646b7215 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_nowrap-expected.png
index 960ba27d..e7a959a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_rowspan-expected.png
index efd335d8..e374e0f6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_width-expected.png
index 7cfe37c..7e0ac1a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_center-expected.png
index 2b203cc0d..0d3c5613 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_left-expected.png
index f642c92..f689a13 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_right-expected.png
index 75a40f4b..be6a6f8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_colspan-expected.png
index 68f6046..ac98a12 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_height-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_height-expected.png
index eab1c85..adf6be1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_rowspan-expected.png
index 46311119..cfb9fb7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_width-expected.png
index 15744df..898aee7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tables_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_center-expected.png
index 0aa5d529..d10e59f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_char-expected.png
index 645622ea..6ec95595 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_justify-expected.png
index 5ea9cda..b647eef 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_left-expected.png
index e22ac4b..c1000ab8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_right-expected.png
index 8627286..22aa66f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_char-expected.png
index 9cd62c6..4d528d4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_baseline-expected.png
index 3b200532..5309ad6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_bottom-expected.png
index b4d76ee9..d091575a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_middle-expected.png
index 3aa7bd02..7404efc7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_top-expected.png
index 28c5d81..a1a9ac0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_center-expected.png
index 7c84ac9..7f81cdb 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_char-expected.png
index 912ffb6..4bdcb3fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_justify-expected.png
index eaaca486..18d864d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_left-expected.png
index 065a55e0..09fd473 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_right-expected.png
index d7b5482d..c4a9f54f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_char-expected.png
index b6c8c4fa2..4ce746d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
index 7f19e40..edc6ff8b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
index 97b3394..e89ebe0c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_middle-expected.png
index 815a119..784de21 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_top-expected.png
index 64120a8..ef92e9c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_center-expected.png
index 3216be5..991dfbdc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_char-expected.png
index 995c38e..83ea450 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_justify-expected.png
index f6a61de..8daafc1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_left-expected.png
index c8fb36d6..2ffa665 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_right-expected.png
index e8ef228..421d594 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_char-expected.png
index 4c9ce4097..74d4d227 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_baseline-expected.png
index 460c05e..aec7373 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_bottom-expected.png
index a57f0e6c..b60e679 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_middle-expected.png
index b927e4e..6fe6001 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_top-expected.png
index ec6a0db..9f9812b2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
index f0444748..af9615c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black-expected.png
index b69db82..e769d3f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
index b69db82..e769d3f9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
index 3e414c0..ae7912c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
index 3e414c0..ae7912c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
index 9d463f0b..3354c4f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
index 9d463f0b..3354c4f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
index d7098c6..58ee5e81 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
index d7098c6..58ee5e81 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green-expected.png
index 839a4f7..a7fbd2a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
index 839a4f7..a7fbd2a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
index e57e5b5..5e5aedb0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
index e57e5b5..5e5aedb0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
index 012846a4..70c546d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
index 012846a4..70c546d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
index ecdc26db..4f3d427 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
index ecdc26db..4f3d427 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
index 908945b..9d8b42a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
index 908945b..9d8b42a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
index 8ef0a2a..a809748 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
index 8ef0a2a..a809748 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red-expected.png
index aa24588..bf0314d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
index aa24588..bf0314d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
index 7b3fd7b..202c90d2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
index 7b3fd7b..202c90d2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
index 238be790..46b933e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
index 238be790..46b933e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white-expected.png
index e530a70..60d8df7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
index e530a70..60d8df7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
index db057b1..ac067a00 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
index db057b1..ac067a00 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_bottom-expected.png
index 6f7f0d6..d2b8a98d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_top-expected.png
index 5b9b04b..940bf09 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_class-expected.png
index cf9eb5cf..a1e8d56 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_id-expected.png
index cf9eb5cf..a1e8d56 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_style-expected.png
index cf9eb5cf..a1e8d56 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_caption_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_center-expected.png
index cb809dd..b595ec6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_char-expected.png
index d9cda94..b494df9a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_left-expected.png
index 0afab34..960573f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_right-expected.png
index ce427c9..686341d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_col_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_center-expected.png
index cb809dd..b595ec6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_char-expected.png
index 3549d87..54a505d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_left-expected.png
index 0afab34..960573f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_right-expected.png
index ce427c9..686341d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_center-expected.png
index 1f0dde33..00c5a0d4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_left-expected.png
index 9c71cde1..af15eb3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_right-expected.png
index ba6ed046..2fdea01 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
index e48da5d..5a0062e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
index e48da5d..5a0062e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border-expected.png
index 40993415..0d79c1e4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border_px-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border_px-expected.png
index 6f6b9c81c..af67b79 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_border_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing-expected.png
index 53fa3bf..50dd7a83 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
index 73c3e68..4e2c5b7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_pct-expected.png
index 34741d2..e9d964e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_px-expected.png
index bb394c5c..bbd41ce 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_table_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_center-expected.png
index 5769cbd8..968e2be 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_char-expected.png
index 8f5ffb1..21bacdf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_justify-expected.png
index 5a06c9d..09cb341 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_left-expected.png
index 92bcda0..ff68e06e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_right-expected.png
index c268f2c0..df46e8a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_class-expected.png
index 6c7b87f..4664bae 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_id-expected.png
index 6c7b87f..4664bae 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_style-expected.png
index 6c7b87f..4664bae 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
index 015c75d..fe805a8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
index 58d956c..b7c7083 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
index e95416f7..ec9039d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_top-expected.png
index e24fa64..34ed21b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_center-expected.png
index 2bc2273..4c013cf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_char-expected.png
index ea72fa7..001a4f84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_left-expected.png
index 4555eaa5..4624391f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_right-expected.png
index 58b089d..8a77c461 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
index 48e101e..ea7fac5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
index 48e101e..ea7fac5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_class-expected.png
index fa71f20..c67ca6d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_colspan-expected.png
index 3d29cc3..a6222397 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_id-expected.png
index fa71f20..c67ca6d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_nowrap-expected.png
index a8cc3bc..bc85a07f3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_rowspan-expected.png
index b61606d..1088d08 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_style-expected.png
index fa71f20..c67ca6d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_width-expected.png
index f278590..3be551b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_center-expected.png
index 19c5a90..ef66060 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_char-expected.png
index b8ca9f8..7f8e3f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
index 2fba253..6aadf3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_left-expected.png
index 4014b4c..4a5369f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_right-expected.png
index b5ef61b..ea7a96f4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_class-expected.png
index 6f7c860..ba65ca6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_id-expected.png
index 6f7c860..ba65ca6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_style-expected.png
index 6f7c860..ba65ca6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
index 04cf6212..fa1fdaf 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
index a708eb23..065b13f7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
index 8e5b84a..d09033a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
index be3a418..dcd3163 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_center-expected.png
index fc91956..1601aa9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_char-expected.png
index 2919e992..db9342b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_left-expected.png
index 4221a756..3a4c1439 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_right-expected.png
index b584c61..2045374 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
index a68dcff..c9050d80 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
index a68dcff..c9050d80 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_class-expected.png
index 4e1d1e6..a5daa773 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_colspan-expected.png
index c834b89..b0b590c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_id-expected.png
index 4e1d1e6..a5daa773 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_nowrap-expected.png
index c9a61f1..3345854 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_rowspan-expected.png
index 4c88264..5d5e07d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_style-expected.png
index 4e1d1e6..a5daa773 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_width-expected.png
index 5109746..f627dc93e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_center-expected.png
index 5e77f59..67ff1a0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_char-expected.png
index e196d7a..c461494 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_justify-expected.png
index 6aabdb5b..f13d666 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_left-expected.png
index bda1815c..98c67ea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_right-expected.png
index a4cdefc7..f6c8a8f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_class-expected.png
index 8ac5c9f..53d63a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_id-expected.png
index 8ac5c9f..53d63a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_style-expected.png
index 8ac5c9f..53d63a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
index 51d26f74..faff50e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
index ac2e74b..22434f3e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_middle-expected.png
index 7042ddc..012f8ea 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_top-expected.png
index 020bb33..1bee273 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_center-expected.png
index f4c46c6..b38fe31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_char-expected.png
index ea72fa7..001a4f84 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_left-expected.png
index 6f063ef..d2db1a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_right-expected.png
index fa6c5f3..fb3b13c7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
index 48e101e..ea7fac5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
index 48e101e..ea7fac5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_class-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_class-expected.png
index c650291d..3ff6b76 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_id-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_id-expected.png
index c650291d..3ff6b76 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_style-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_style-expected.png
index c650291d..3ff6b76 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/marvin/x_tr_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/body_col-expected.png
index 450326e..99a4aa3c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/cellspacing-expected.png
index eea3491f..64cabb5e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/nestedTables-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/nestedTables-expected.png
index 4391a88..b9b446a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/nestedTables-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/nestedTables-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test3-expected.png
index 82433d1..ad49f2b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test6-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test6-expected.png
index 6052964..53ddf71 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/test6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_thtd_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
index ff94e9d..89ccb4af 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_tr_align-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_tr_align-expected.png
index fd75e511..57ac3e7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_tr_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/other/wa_table_tr_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/97619-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/97619-expected.png
index 3a227d6..2ffe6e38 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/97619-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/97619-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1010-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1010-expected.png
index 896db553..68b6160 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug10216-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug10216-expected.png
index fe8b2260..261c474 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug10216-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug10216-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1128-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1128-expected.png
index ea3ea4b..62b2a66 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1128-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1128-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1164-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1164-expected.png
index 553819e..6b562d9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1164-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1164-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug11945-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug11945-expected.png
index 3189aec7..038071502 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug11945-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug11945-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1262-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1262-expected.png
index 8354269..6d85ec3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1262-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1262-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
index 86372fc8..bd1c29c8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1647-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1647-expected.png
index b2e00c0..0d3354f0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug1647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug18770-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug18770-expected.png
index 02d7d6a0..ab5a8ab5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug18770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug18770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug21518-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug21518-expected.png
index 41fc416..98c19fc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug21518-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug21518-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug22122-expected.png
index 7ac5376..97b67a7 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug22122-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug22122-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
index b43a3e81..a6a5581 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
index 8d4e6c2..796778d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
index d23b1c36..6787cd5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug3105-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug3105-expected.png
index afda4040..0d3df74 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug3105-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug3105-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
index d6fcdc6..323a166e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug42043-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug42043-expected.png
index 7811974..4a96e75 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug42043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug42043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug4294-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug4294-expected.png
index c88fde4..3b9f3b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug4294-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug4294-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
index d328555..e22dbb0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug51000-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug51000-expected.png
index 35dd355..f16429d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug51000-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug51000-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
index ba85b28..ae551430 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
index d764d16..0a28ed9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
index d764d16..0a28ed9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug65372-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug65372-expected.png
index 530af52..25c25783 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug65372-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug65372-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
index 6c00fdc9..aac8651 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7113-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7113-expected.png
index 2ad2e860..7a340c5a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7113-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7113-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug72393-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug72393-expected.png
index d34b5110..5fae513e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug72393-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug72393-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png
index 184b9cfc..48c7554 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug7243-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug73629-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug73629-expected.png
index 1000ee2..b8ab7f01 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug73629-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug73629-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
index 5ff9b1f..95df60f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug8499-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug8499-expected.png
index f212b4f..71b3ef9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug8499-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug8499-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
index 6484794..e483e33 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
index 734235e..6870c67 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/backgrounds-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/backgrounds-expected.png
index 73671efb..0230251 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/backgrounds-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/backgrounds-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/col_span2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/col_span2-expected.png
index 788d4eb..51ec35f 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/col_span2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/col_span2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/cols1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/cols1-expected.png
index bd622a9..5fa34156 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/cols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/cols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/columns-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/columns-expected.png
index 28b7a04..7b4773e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/columns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/columns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.png
index 5c76dbdd..52faad4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/core/conflicts-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCells1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCells1-expected.png
index 44c9e71d..25afe48 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCells1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCells1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
index 27cc07c8..83a083b 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCol1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCol1-expected.png
index 89b8f723..ac09f2c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
index 3299bdc..dc4f3a9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
index 400d89c3..a5ba6ef9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
index 400d89c3..a5ba6ef9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index a3753d9..8277607 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
index 813575d..f4adcf9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
index 12be46a..c45ca4c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
index 1d7f124..0b1827e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
index ca29273..f6894e2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
index 3ead3e8..a95d0c2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
index 204da75..4ab79694 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
index 8b65b3e..000bca7d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
index 11cdae5..5f9a9fda 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
index 98c101b..8774974 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
index 98c101b..8774974 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
index 2eb8282..988e689 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
index c62b946..8ffa5d5 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
index e6bfebd..08bd6b8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
index be53a1f..c86bc8b9 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
index 93e44d5..e345ebb1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
index 5242ceb1..7905e4d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/empty_cells-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/empty_cells-expected.png
index 5f82093..9b1e4a269 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/empty_cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/empty_cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/test4-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/test4-expected.png
index 125ecc3..0db1ef2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/test4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla_expected_failures/other/test4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/compound-transforms-vs-containers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/compound-transforms-vs-containers-expected.png
index 037b6a8..51b588a 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/compound-transforms-vs-containers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/compound-transforms-vs-containers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/hindi-rotated-expected.png
index 343623a..df5b6a4 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/diamond-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/diamond-expected.png
index 3748d57..381b738 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/diamond-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/diamond-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/shadows-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/shadows-expected.png
index 59aac9c2..e5fe328 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/skew-with-unitless-zero-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/skew-with-unitless-zero-expected.png
index 58a5ed9..42a1ef368 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/skew-with-unitless-zero-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/skew-with-unitless-zero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/svg-vs-css-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/svg-vs-css-expected.png
index 9995a84..8b0ea42 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/svg-vs-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/svg-vs-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-caret-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-caret-expected.png
index 01c016e..78e56d3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-focused-text-input-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-focused-text-input-expected.png
index 34c2e2c..99db4c3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-focused-text-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/transforms/transformed-focused-text-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
new file mode 100644
index 0000000..03be6ef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) SPAN",
+          "rect": [162, 37, 278, 20],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [162, 37, 278, 19],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN",
+          "rect": [324, 37, 277, 20],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [324, 37, 277, 19],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) SPAN",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) SPAN",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'the quick brown fox jumped over the lazy dog'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt
new file mode 100644
index 0000000..b4cd321
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [0, 0, 58, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 58, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'La la la la'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt
new file mode 100644
index 0000000..2327e50b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt

@@ -0,0 +1,73 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [40, 107, 111, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [8, 107, 111, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [40, 107, 111, 27],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 107, 111, 27],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 88, 32, 67],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='foo'",
+          "rect": [8, 88, 32, 32],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='foo'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow H2",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'Chromium'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt
new file mode 100644
index 0000000..5af7b30
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='im'",
+          "rect": [11, 131, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 131, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='im'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt
new file mode 100644
index 0000000..384fa84d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 136, 784, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 184, 32, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 156, 32, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='d'",
+          "rect": [8, 150, 4, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 150, 4, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 136, 4, 19],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='d'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt
new file mode 100644
index 0000000..57fa03d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt

@@ -0,0 +1,120 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 138, 292, 160],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 303, 292, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 138, 290, 159],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 138, 242, 180],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [10, 323, 242, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableCell TD id='col1'",
+          "rect": [10, 353, 242, 20],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 138, 240, 179],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='target'",
+          "rect": [254, 138, 52, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutTableCell TD id='col1'",
+          "rect": [252, 138, 50, 215],
+          "reason": "incremental"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD id='col1'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Curabitur pretium, quam quis semper'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'malesuada, est libero feugiat libero, vel'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'fringilla orci nibh sed neque. Quisque eu'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'nulla non nisi molestie accumsan. Etiam'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'tellus urna, laoreet ac, laoreet non,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'suscipit sed, sapien. Phasellus vehicula,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sem at posuere vehicula, augue nibh'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'molestie nisl, nec ullamcorper lacus ante'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'vulputate pede.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutTableCell TD id='target'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt
new file mode 100644
index 0000000..7207655
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='allcontent'",
+          "rect": [8, 136, 784, 52],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) P",
+          "rect": [8, 152, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) P",
+          "rect": [8, 136, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 152, 69, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 136, 69, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='allcontent'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt
new file mode 100644
index 0000000..4b76289
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 156, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='t'",
+          "rect": [8, 176, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='p'",
+          "rect": [8, 156, 4, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 156, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN id='p'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='t'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
new file mode 100644
index 0000000..fb764f5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
new file mode 100644
index 0000000..df259fd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
new file mode 100644
index 0000000..796face
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt
new file mode 100644
index 0000000..86317a81
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTextControl (positioned) INPUT id='input'",
+          "rect": [8, 8, 244, 68],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [30, 30, 200, 24],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [30, 30, 45, 23],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTextControl (positioned) INPUT id='input'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'NEW'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clip-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/clip-with-layout-delta-expected.txt
rename to third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt
new file mode 100644
index 0000000..c380b977
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='inner'",
+          "rect": [8, 74, 204, 232],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 74, 204, 232],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='inner'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt
new file mode 100644
index 0000000..384094e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [9, 87, 198, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [16, 117, 184, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [76, 117, 64, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText (anonymous)",
+          "rect": [9, 87, 63, 16],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText (anonymous)",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
new file mode 100644
index 0000000..4f4cd43
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt
new file mode 100644
index 0000000..58f72e330
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt

@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='details-content'",
+          "rect": [8, 72, 784, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTextControl INPUT",
+          "rect": [8, 72, 154, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 75, 150, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutDetailsMarker DIV id='details-marker'",
+          "rect": [8, 56, 11, 11],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutDetailsMarker DIV id='details-marker'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='details-content'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTextControl INPUT",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
new file mode 100644
index 0000000..df13b1d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
new file mode 100644
index 0000000..df13b1d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt
new file mode 100644
index 0000000..243abb5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt

@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV class='em-units'",
+          "rect": [8, 8, 784, 147],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='box4' class='box'",
+          "rect": [344, 18, 302, 122],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='box3' class='box'",
+          "rect": [18, 18, 302, 122],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='indicator'",
+          "rect": [345, 19, 240, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [330, 135, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV class='em-units'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='box3' class='box'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='box4' class='box'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='indicator'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
new file mode 100644
index 0000000..1d7926a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt
new file mode 100644
index 0000000..8b3642e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 72, 37, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 72, 37, 19],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt
new file mode 100644
index 0000000..fdf43bb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt

@@ -0,0 +1,76 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 36, 800, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [0, 0, 800, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 36, 395, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A id='link'",
+          "rect": [585, -1, 216, 234],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 37, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A id='link'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Home'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'crbug.com/424078: ensure inline elements get their outline painted'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
new file mode 100644
index 0000000..32c822d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 8, 26, 24],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 26, 19],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Text'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
new file mode 100644
index 0000000..bad5759
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -0,0 +1,161 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 2350],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2046, 767, 107],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2046, 767, 107],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2196, 639, 107],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2196, 639, 107],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
new file mode 100644
index 0000000..f9cfed9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
new file mode 100644
index 0000000..6eac6ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
new file mode 100644
index 0000000..6eac6ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt
new file mode 100644
index 0000000..fe9b7280
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='target'",
+          "rect": [8, 152, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 152, 37, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt
new file mode 100644
index 0000000..79799cc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [100, 120, 50, 50],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [100, 120, 39, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt
new file mode 100644
index 0000000..69fba7e7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [102, 122, 50, 50],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [102, 122, 39, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt
new file mode 100644
index 0000000..8b4d188
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [100, 120, 34, 50],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [100, 120, 34, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..445c2ef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -0,0 +1,103 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 40, 784, 105],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 220, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 200, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN",
+          "rect": [8, 120, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 220, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 220, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 200, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 200, 100, 100],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'x'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt
new file mode 100644
index 0000000..8901085
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -0,0 +1,153 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [13, 240, 408, 139],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 380, 304, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 380, 287, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [134, 360, 131, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 363, 48, 65],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [28, 363, 20, 20],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hedgehog had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the way'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion that it'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'foo'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'for'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'turns,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'quarrelling all the while, and fighting for the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hedgehogs; and in\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'a very short time '",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt
new file mode 100644
index 0000000..151c399
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -0,0 +1,354 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 74, 418, 526],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [13, 240, 408, 139],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [13, 500, 408, 99],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [13, 480, 408, 99],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 180, 406, 79],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [13, 440, 356, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 80, 355, 119],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 420, 355, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 380, 354, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 380, 304, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 380, 298, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 380, 287, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [134, 360, 131, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [83, 360, 131, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [303, 420, 66, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [143, 420, 64, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 363, 48, 65],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [151, 180, 40, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [485, 0, 15, 600],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The chief difficulty Alice found at first was in managing her'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'flamingo: she succeeded in getting its body tucked away,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'comfortably enough, under her arm, with its legs hanging'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'down,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'but generally, just as she had got its neck nicely'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'straightened\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'out, and was going to give the hedgehog a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'blow with its head, it\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'would'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' twist itself round and look up in her'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'face, with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'such a puzzled expression that she could not help'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'bursting out\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'laughing: and when she had got its head down, and was'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'going to\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hedgehog had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the way'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion that it'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'for turns,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'quarrelling all the while, and fighting for the hedgehogs; and'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'in\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'a very short time '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the Queen'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' was in a furious passion,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'and went\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'stamping about, and shouting \u2018Off with his head!\u2019'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'or \u2018Off with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'her head!\u2019 about once in a minute.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Alice began to feel very uneasy: to be sure, she had not as\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'yet had'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'any dispute with the Queen, but she knew that it might\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'happen any'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'minute, \u2018and then,\u2019 thought she, \u2018what would become of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'me?'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'They\u2019re dreadfully fond of beheading people here; the great'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'wonder is, that there\u2018s any one left alive!\u2019'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-in-scrolled-clipped-block-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
rename to third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt
new file mode 100644
index 0000000..3eb6140fe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt

@@ -0,0 +1,97 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [7, 122, 197, 79],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 82, 190, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [47, 92, 33, 49],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [77, 122, 33, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [77, 122, 33, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [47, 122, 33, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Cras faucibus. Nunc adipiscing,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'enim in scelerisque convallis,'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'augue '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'purus'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' eleifend lacus, at'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sagittis eros leo pulvinar velit.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Integer sollicitudin nisi ut urna'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'blandit convallis.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt
new file mode 100644
index 0000000..483433ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (floating) DIV id='target'",
+          "rect": [8, 58, 200, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 58, 37, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt
new file mode 100644
index 0000000..75f9b274
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutListItem LI",
+          "rect": [48, 100, 744, 105],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='target'",
+          "rect": [48, 100, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [30, 185, 7, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [30, 135, 7, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutListItem LI",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutListMarker (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='target'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
new file mode 100644
index 0000000..5202e06
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt
new file mode 100644
index 0000000..885e9f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt

@@ -0,0 +1,353 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 64, 784, 280],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 64, 784, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 264, 784, 80],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 264, 104, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 164, 104, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [7, 144, 78, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [7, 144, 78, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 104, 77, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 104, 77, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 284, 65, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 184, 65, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 324, 61, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 224, 61, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [7, 84, 43, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [7, 84, 43, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 124, 42, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 124, 42, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 64, 39, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 64, 39, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 304, 27, 19],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 204, 27, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [8, 164, 10, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Word,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'words,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'more words.'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'I could'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'write a book'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'about all the stuff'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'that comes'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'the break.'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt
new file mode 100644
index 0000000..65b9aaa7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [168, 11, 150, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 11, 150, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [168, 11, 53, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 11, 53, 16],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt
new file mode 100644
index 0000000..e3566b3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt

@@ -0,0 +1,84 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutMultiColumnFlowThread (anonymous)",
+          "rect": [9, 9, 400, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='a'",
+          "rect": [234, 10, 300, 57],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 300, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 50, 50],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 10, 13, 57],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutMultiColumnFlowThread (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'XXXXXX'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
new file mode 100644
index 0000000..d1394c3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [6, 6, 204, 58],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 8, 200, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt
new file mode 100644
index 0000000..e5eeb64
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt

@@ -0,0 +1,101 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 150, 200, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 110, 200, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 108, 87, 63],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 148, 87, 23],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 150, 83, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 110, 83, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt
new file mode 100644
index 0000000..59b9e36
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='dv'",
+          "rect": [8, 74, 80, 36],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 74, 80, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='dv'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'Lorem ipsu'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt
new file mode 100644
index 0000000..e03cd64
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -0,0 +1,134 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [2008, 2096],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 2008, 2096],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 585, 785, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 16, 784, 2072],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 52, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [118, 52, 370, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 324, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 52, 110, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 0, 15, 585],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 585, 15, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [488, 52, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This is the test for '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
new file mode 100644
index 0000000..ea747ed
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [8, 187, 784, 20],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [18, 18, 284, 20],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 18, 22, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 187, 22, 19],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'abc'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject removal"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt
new file mode 100644
index 0000000..30d36f6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt

@@ -0,0 +1,79 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 800, 600],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [0, 0, 800, 52],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [100, 100, 418, 52],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [108, 116, 402, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 116, 402, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 402, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Tests that the entire viewport is painted with a floated html element.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
new file mode 100644
index 0000000..31d699e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt

@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutListItem (positioned) LI",
+          "rect": [8, 64, 214, 237],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 64, 214, 232],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutListItem (positioned) LI",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutListMarker (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
new file mode 100644
index 0000000..d0b7756d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 784, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    },
+    {
+      "name": "LayoutInline (relative positioned) DIV id='block'",
+      "position": [68, 7],
+      "bounds": [348, 21],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline (relative positioned) DIV id='block'",
+          "rect": [0, 0, 348, 21],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [1, 1, 346, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) DIV id='block'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'When this layer moves it shouldn't generate a repaint rect.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt
new file mode 100644
index 0000000..d50332509
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 105],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 193, 171, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [282, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 193, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt
new file mode 100644
index 0000000..579b36c1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -0,0 +1,82 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 105],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [112, 108, 171, 104],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 193, 171, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [282, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 193, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt
new file mode 100644
index 0000000..bab242a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt

@@ -0,0 +1,97 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 305],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutIFrame IFRAME id='iframe'",
+          "rect": [8, 108, 300, 300],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 193, 285, 200],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 393, 285, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 108, 200, 285],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 193, 85, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [293, 108, 15, 285],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 108, 15, 85],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [293, 393, 15, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 193, 15, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutIFrame IFRAME id='iframe'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
new file mode 100644
index 0000000..f587970
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt

@@ -0,0 +1,87 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 1895],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+          "rect": [677, 252, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+          "rect": [677, 252, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+          "rect": [677, 252, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [677, 252, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+          "rect": [677, 52, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+          "rect": [677, 52, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+          "rect": [677, 52, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [677, 52, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
new file mode 100644
index 0000000..50e595a43
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 5056],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) HEADER",
+      "position": [8, 28],
+      "bounds": [769, 1972],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+          "rect": [10, 1822, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='recentlink'",
+          "rect": [10, 1822, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+          "rect": [10, 1422, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='recentlink'",
+          "rect": [10, 1422, 150, 150],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='recentlink'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt
new file mode 100644
index 0000000..237d79d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 47, 137, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 47, 58, 16],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'some text'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt
new file mode 100644
index 0000000..4382288
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt

@@ -0,0 +1,80 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='test'",
+          "rect": [38, 78, 152, 102],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 79, 146, 99],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [67, 158, 39, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [70, 79, 36, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 79, 32, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='removeme'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='test'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hello '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'world'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt
new file mode 100644
index 0000000..ee84840
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='firstLine'",
+          "rect": [8, 8, 100, 200],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 208, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='root'",
+          "rect": [8, 208, 100, 100],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 48, 92, 119],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 48, 8, 19],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow HTML",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='firstLine'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "selection"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "location change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
new file mode 100644
index 0000000..85d75ca2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
new file mode 100644
index 0000000..cd0e5b4d1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1059, 585],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell TH id='target'",
+          "rect": [8, 72, 839, 190],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 72, 835, 190],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TH id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Col 1'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt
new file mode 100644
index 0000000..dc04508d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 11, 150, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 11, 35, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div'",
+          "rect": [8, 288, 10, 20],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..fe7fe15
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
new file mode 100644
index 0000000..7fc087a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt

@@ -0,0 +1,116 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 52, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [42, 119, 334, 268],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [42, 119, 334, 268],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [42, 119, 334, 268],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [242, 253, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [242, 53, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [9, 253, 167, 200],
+          "reason": "location change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [9, 53, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [17, 219, 84, 68],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [17, 219, 84, 68],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [17, 219, 84, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [67, 253, 42, 67],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [67, 186, 42, 67],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "SVG resource change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
new file mode 100644
index 0000000..4e268447
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
new file mode 100644
index 0000000..bafc84a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -0,0 +1,145 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 307, 377],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'SS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
new file mode 100644
index 0000000..77dd30c0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt
new file mode 100644
index 0000000..4bb2e2ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 54, 561, 86],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 54, 561, 86],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt
new file mode 100644
index 0000000..129eaa2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 50, 561, 82],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 50, 561, 82],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
new file mode 100644
index 0000000..1156a97
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
new file mode 100644
index 0000000..78579a6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
rename to third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
new file mode 100644
index 0000000..ee51e6fe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -0,0 +1,98 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 42, 784, 170],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 42, 784, 170],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 42, 784, 170],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 42, 784, 170],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 42, 784, 170],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 42, 784, 170],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
new file mode 100644
index 0000000..257f062
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 42, 784, 170],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 42, 784, 170],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 42, 784, 170],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
index 148a9c0..0173080d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
index 95899ca0..fa0f8be 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt
new file mode 100644
index 0000000..5f5bd517
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [33, 23, 622, 194],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [33, 23, 622, 194],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [16, 25, 18, 25],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [8, 12, 17, 26],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on fill'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourcePattern pattern id='dynPattern'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
new file mode 100644
index 0000000..7350cbdb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -0,0 +1,132 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 307, 377],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt
new file mode 100644
index 0000000..e314d9f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [103, 26, 160, 113],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [103, 26, 160, 113],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [63, 26, 160, 113],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [63, 26, 160, 113],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Foo'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt
new file mode 100644
index 0000000..6a60793
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt

@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 72, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..b7feb03
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..5174083
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

@@ -0,0 +1,121 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 72, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [209, 273, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [209, 273, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [209, 273, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [209, 273, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [109, 173, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [109, 173, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 173, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [59, 273, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [59, 273, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [59, 273, 50, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [59, 273, 50, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [34, 173, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [34, 173, 50, 200],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt
new file mode 100644
index 0000000..5bf0507
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt

@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 72, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGImage image",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
new file mode 100644
index 0000000..8693f39
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
new file mode 100644
index 0000000..cc006acc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

@@ -0,0 +1,70 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 52, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [27, 69, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [27, 69, 364, 364],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [27, 69, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [13, 207, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [13, 207, 92, 91],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [13, 207, 92, 91],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..04b9c24
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

@@ -0,0 +1,128 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 72, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [209, 273, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [209, 273, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 273, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [9, 73, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [9, 73, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [9, 73, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 73, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 73, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 73, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [59, 273, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [59, 273, 50, 200],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
new file mode 100644
index 0000000..d7a9cffa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

@@ -0,0 +1,78 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 72, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [9, 73, 400, 400],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 73, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
+          "rect": [9, 73, 400, 400],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [209, 273, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [9, 73, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [59, 273, 50, 50],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
new file mode 100644
index 0000000..bd19ffe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
new file mode 100644
index 0000000..3ff8d17
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 52, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [45, 87, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [45, 87, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [45, 87, 328, 328],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [45, 87, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [16, 59, 136, 137],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [18, 211, 82, 83],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [18, 211, 82, 83],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [18, 211, 82, 83],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [18, 211, 82, 83],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
new file mode 100644
index 0000000..8693f39
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
new file mode 100644
index 0000000..5fa0200
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 52, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [27, 69, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [27, 69, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [27, 69, 364, 364],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [27, 69, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [16, 59, 136, 137],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [13, 207, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [13, 207, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [13, 207, 92, 91],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [13, 207, 92, 91],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
new file mode 100644
index 0000000..9010aea
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -0,0 +1,129 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 377],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 307, 377],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 307, 377],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt
new file mode 100644
index 0000000..309a7c1e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -0,0 +1,120 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 307, 257],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 307, 257],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='remove'",
+          "rect": [10, 63, 307, 257],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [10, 63, 307, 257],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='remove'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
new file mode 100644
index 0000000..a21d77b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 13, 46, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 13, 46, 28],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 13, 46, 28],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
new file mode 100644
index 0000000..a21d77b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 13, 46, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 13, 46, 28],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 13, 46, 28],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
new file mode 100644
index 0000000..14671387
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -0,0 +1,106 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1026, 1036],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [24, 1011, 737, 21],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [177, 1012, 203, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [435, 1012, 173, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A",
+          "rect": [384, 1011, 47, 21],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [385, 1012, 45, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [429, 1012, 7, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [379, 1012, 7, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pservers-pattern-01-b \u2190'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'index'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u2192 script-handle-01-b'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
new file mode 100644
index 0000000..4bf72e9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
new file mode 100644
index 0000000..59565b3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt
new file mode 100644
index 0000000..58edac80
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 52, 602, 422],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage img",
+          "rect": [9, 53, 420, 420],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage img",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
new file mode 100644
index 0000000..7082160
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt
new file mode 100644
index 0000000..5100839
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 3, 46, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 3, 46, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='text1'",
+          "rect": [10, 3, 46, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 33, 41, 22],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text2'",
+          "rect": [10, 33, 41, 22],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 33, 41, 17],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text1'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='text2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
new file mode 100644
index 0000000..f470d26a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [80, 0, 550, 117],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [80, 0, 550, 117],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [30, 0, 403, 59],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [30, 0, 403, 59],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='bounce'",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'Repaint me!'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt
new file mode 100644
index 0000000..7fb4946
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt

@@ -0,0 +1,424 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='text2g'",
+          "rect": [0, 63, 402, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 13, 402, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 113, 402, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 114, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 114, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 14, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 14, 193, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 13, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 113, 100, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 113, 100, 48],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 13, 100, 48],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 3, 14, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 8, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 3, 7, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 3, 7, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 3, 5, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [9, 3, 5, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [9, 3, 5, 3],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [0, 0, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [6, 3, 4, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='text1g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text2g'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text3g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
new file mode 100644
index 0000000..21df321
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt
new file mode 100644
index 0000000..eb115ec7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -0,0 +1,176 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner2'",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner1'",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 8, 2],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 0, 8, 2],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 8, 2],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner1'",
+          "rect": [0, 0, 8, 2],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner1'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
new file mode 100644
index 0000000..2ee76285
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [808, 621],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [208, 13, 161, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [208, 13, 161, 19],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [18, 193, 161, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [18, 193, 161, 19],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='ttt'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Passes, if text is at 200x20'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
new file mode 100644
index 0000000..188ef7fe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [200, 185, 240, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [200, 185, 240, 19],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [200, 185, 240, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [20, 5, 240, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [20, 5, 240, 19],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [20, 5, 240, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='ts'",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This text should be at visible at 200,200'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt
new file mode 100644
index 0000000..502c6f8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 115, 59, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='status'",
+          "rect": [90, 115, 59, 19],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 115, 43, 19],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='status'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Passed'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt
new file mode 100644
index 0000000..b0a53b8d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt

@@ -0,0 +1,91 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow body",
+          "rect": [8, 8, 784, 205],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [32, 32, 52, 52],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer svg:use id='use'",
+          "rect": [33, 33, 50, 50],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRoot svg:svg id='svg'",
+          "rect": [33, 33, 50, 50],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='symbol'",
+          "rect": [33, 33, 50, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [7, 7, 27, 27],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [52, 52, 12, 12],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='symbol'",
+          "rect": [53, 53, 10, 10],
+          "reason": "layoutObject removal"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='symbol'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow body",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg:svg id='svg'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer svg:use id='use'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='symbol'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
new file mode 100644
index 0000000..a98ccf6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
new file mode 100644
index 0000000..a849a1f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt
new file mode 100644
index 0000000..71fa8da
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt

@@ -0,0 +1,311 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 194, 103, 82],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 102, 95, 82],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 198, 95, 74],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTable TABLE id='t'",
+          "rect": [8, 10, 91, 82],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableCell TD id='d2'",
+          "rect": [22, 224, 89, 22],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 106, 87, 74],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 338, 81, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 286, 81, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 154, 81, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 102, 81, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d3'",
+          "rect": [22, 316, 81, 22],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d'",
+          "rect": [22, 132, 81, 22],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 317, 71, 19],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 133, 71, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 339, 46, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 155, 46, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 295, 40, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 111, 40, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 225, 32, 19],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [74, 286, 29, 82],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 224, 14, 22],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 132, 14, 22],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 225, 4, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 133, 4, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d2'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD id='d3'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'ipsum dolor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt
new file mode 100644
index 0000000..fba9d1c2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='to-be-changed'",
+          "rect": [18, 130, 269, 40],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 130, 235, 39],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 130, 77, 19],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [295, 102, 15, 400],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='to-be-changed'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'After change'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
new file mode 100644
index 0000000..165dc240c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
new file mode 100644
index 0000000..165dc240c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/transform-layout-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/transform-layout-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt
new file mode 100644
index 0000000..da1fa854
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt

@@ -0,0 +1,65 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 155],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [20, 0, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 130, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 100, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 130, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 100, 20, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt
new file mode 100644
index 0000000..14e8b0a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 205],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [300, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 80, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 50, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt
new file mode 100644
index 0000000..5ef73db
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt

@@ -0,0 +1,65 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 105],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [20, 0, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 80, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 33, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 80, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 33, 20, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt
new file mode 100644
index 0000000..724c326
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 247],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [300, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 147, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 100, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
new file mode 100644
index 0000000..609d5f1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt

@@ -0,0 +1,427 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [939, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 939, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 923, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 7, 920, 213],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [339, 0, 600, 500],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 600, 500],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [339, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [505, 8, 426, 484],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [507, 7, 423, 471],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [939, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [200, 0, 939, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 939, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 939, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [208, 8, 923, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 923, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 7, 920, 213],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 7, 920, 213],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [539, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [539, 235, 400, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "bounds change"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [400, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 939, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [-539, 0, 939, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [-531, 8, 923, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [-529, 7, 920, 213],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 400, 600],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 235, 400, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [37, 8, 355, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 7, 352, 554],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [400, 0, 400, 600],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [437, 8, 355, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [37, 8, 355, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [439, 7, 352, 554],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 7, 352, 554],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
index d84fb19..4147317 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
index b6adfe2..ae68e7d6 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
index 7c3b581..3c4692bc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
index cc531ad5..e16b017 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 4b1055e..1215e43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index 3957d38..d8fdd0c 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 4b1055e..1215e43 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index 8034a4d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
index f8537de8..e8b2ead8 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
index efe0d5d..f7344ec 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
index 7f8558c..9bd0264 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
index c12706a..8ab4ac04 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
index 496f182..233ef91e 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
index 13cebe6..c2f23451 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index b201ef2..633b8d03 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
index 8c04ad8..c3c532b0 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index 4bb6d8d..c2c1130d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index 33dab86..9f109b1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
index 8df50db..e41d7cc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
index 7aa796f..ee576e78 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
index 4bb6d8d..c2c1130d 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index 33dab86..9f109b1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
index 8df50db..e41d7cc 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
index 7aa796f..ee576e78 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/spv2/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/spv2/fast/block/basic/018-expected.png
index 1b9f95c..67f8f31 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/spv2/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/spv2/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
index 217314d7..a20e3c1 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index df64b743..cc3cceb3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index 5273ffd..fdf7c0519 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
index 2f6271c..475c3c3 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index ca1387fa9..7592ac2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index 4726c75..cdc6d87 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/iframe-print-expected.png
index 7ede3934..57ab9856 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
index e3df64c6..cad65fc2 100644
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index ac463f3..ba8ad8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/comments-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/comments-expected.png
index 8ba9dd2..87a83039 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/comments-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/comments-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/containment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/containment-expected.png
index 821cd055..efc6962 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/containment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/containment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/contextual_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/contextual_selectors-expected.png
index 7688bbc..332a918 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/contextual_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/contextual_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/grouping-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/grouping-expected.png
index 67de2a5..4f4526d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/grouping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/grouping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/id_as_selector-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/id_as_selector-expected.png
index c71640d..d0e2b372 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/id_as_selector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/id_as_selector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/inheritance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/inheritance-expected.png
index 75d7641d..196fef1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/inheritance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/basic/inheritance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border-expected.png
index b3d7a60..78472b2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom-expected.png
index 9a37b35b..1fa94fa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_inline-expected.png
index 7997aa9d0..6d5c804 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width-expected.png
index 6287d401d..bbf3f136 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width_inline-expected.png
index 13394a7..4342308 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_bottom_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color-expected.png
index 0a80cfc..03354a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color_inline-expected.png
index 15594dde..557e5fa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_color_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_inline-expected.png
index f209bdf..523936b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left-expected.png
index 2776346..9a901aee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_inline-expected.png
index 72123012..a3aaeaa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width-expected.png
index 6b0dc1c0..bf9b2aa3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width_inline-expected.png
index 3b6b7b9f..83cb014 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_left_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right-expected.png
index 4bf2f85..247ed16a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_inline-expected.png
index 7636c77..d70000d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width-expected.png
index 2b5fc60..306511b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width_inline-expected.png
index 6439385..49d4a38 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_right_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style-expected.png
index b8c5efa..d103c556 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style_inline-expected.png
index fba3100..c74e7ee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_style_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top-expected.png
index ab6ff6d..234f3b5d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_inline-expected.png
index fe1142b..e6f6d80 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width-expected.png
index 351f542..b5b16ad 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width_inline-expected.png
index 272b245..82fa8e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_top_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width-expected.png
index 335d224..6cb50c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width_inline-expected.png
index 5b13cf63..60a896f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/border_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear-expected.png
index efd71a9..9f6c421 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear_float-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear_float-expected.png
index 69e7eb2..68f6f4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear_float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/clear_float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float-expected.png
index b4412f2..b626d1c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_elements_in_series-expected.png
index f15ded0..7ed511c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_margin-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_margin-expected.png
index ff6080e..b0c898b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/float_margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/height-expected.png
index f92d8685..4d89ef2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin-expected.png
index a8213d2..bbd0dcd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom-expected.png
index 7247599..80e86c11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom_inline-expected.png
index 1a62713..4bed312 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_inline-expected.png
index c52581e..ef3ebe1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left-expected.png
index 990b6b5..b54dd80 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left_inline-expected.png
index 80e7d30d..9cf26350 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right-expected.png
index 509c77d..be23d992 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right_inline-expected.png
index c33df93..4e3768f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top-expected.png
index 0821a5a..70f6e9c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top_inline-expected.png
index 9713a6a5..f7e1ec0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/margin_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding-expected.png
index c864dd8..0af2932 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom-expected.png
index efba484..6f8b3176 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom_inline-expected.png
index 2d7e4d3..37ff2d1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_inline-expected.png
index 2b0f1c7..18f090f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left-expected.png
index 58370cc..50e19a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left_inline-expected.png
index c49fcce..57edf69 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right-expected.png
index 874a34d..87a7dcfe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right_inline-expected.png
index a79064a..374781c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top-expected.png
index b0cd9e0..23ae134a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top_inline-expected.png
index b3e5b1af..356f3ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/padding_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/width-expected.png
index 861f76f1..41072bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/box_properties/width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/cascade_order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/cascade_order-expected.png
index d51c2b2..8bf3b0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/cascade_order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/cascade_order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/important-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/important-expected.png
index 6b03ae6..eabc354 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/important-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/cascade/important-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/display-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/display-expected.png
index 432c4805..4b96727 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/display-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style-expected.png
index df6d156..0d38fcb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_image-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_image-expected.png
index e2a2d824..c362ac5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_position-expected.png
index 6cbe180..e5b2ca06 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_type-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_type-expected.png
index ca091f2..e4a958e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/list_style_type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/white_space-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/white_space-expected.png
index 12aaeea..537fa16eb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/white_space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/classification/white_space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background-expected.png
index a6af59a..59f75a60a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_attachment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_attachment-expected.png
index 40872e4..8efcca9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_color-expected.png
index 4e6e3583..dff0515 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_image-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_image-expected.png
index 68469ef..a16a9c41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_position-expected.png
index 6f16e6fe..e4d8e4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_repeat-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_repeat-expected.png
index 093da7e..67ae283 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/background_repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/color-expected.png
index 3698240d..1ad1a880 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/color_and_background/color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_family-expected.png
index 4a5fa10..e5a719c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_size-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_size-expected.png
index ad44009..bcd4949 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_style-expected.png
index fc81eb7c..aa7abec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_variant-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_variant-expected.png
index df5b005..778bc93 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_variant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_variant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_weight-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_weight-expected.png
index 33b650c..2903922 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_weight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/font_properties/font_weight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/canvas-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/canvas-expected.png
index ac04915..4e92d60 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/floating_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/floating_elements-expected.png
index 77b93c1..d8e43160 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/floating_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/floating_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/height_of_lines-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/height_of_lines-expected.png
index db4f7ca..a8c58bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/height_of_lines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/height_of_lines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/inline_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/inline_elements-expected.png
index d22b51b..f1c3ce2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/inline_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/inline_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/replaced_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/replaced_elements-expected.png
index 171278c..cdd236d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/replaced_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/replaced_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/vertical_formatting-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/vertical_formatting-expected.png
index 732542a..d2915a12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/vertical_formatting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/formatting_model/vertical_formatting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/anchor-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/anchor-expected.png
index 7816bf4a..82f87a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/anchor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/anchor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstletter-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstletter-expected.png
index 70ef16f..1322cba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstletter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstletter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstline-expected.png
index fe69bd4..30866bc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/multiple_pseudo_elements-expected.png
index e85ce65..b60c67c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/pseudo_elements_in_selectors-expected.png
index c880ffea..c5adb610 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/pseudo_elements_in_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/letter_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/letter_spacing-expected.png
index 9923ae227..c8f9e6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/letter_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/letter_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/line_height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/line_height-expected.png
index a99dafe4..4fce89f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/line_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/line_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_align-expected.png
index 80150b42..0445289 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_decoration-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_decoration-expected.png
index 4fb9ef00..a9fc131 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_decoration-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_decoration-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_indent-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_indent-expected.png
index 9571ae44..1107330 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_indent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_indent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_transform-expected.png
index ce02c0f..f5e14351f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/vertical_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/vertical_align-expected.png
index c4bfbcf..720ee85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/vertical_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/vertical_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/word_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/word_spacing-expected.png
index a0aa15ab..27f8304 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/word_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/text_properties/word_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/color_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/color_units-expected.png
index fb8553e..c8b12cb1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/color_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/color_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/length_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/length_units-expected.png
index 91151c8..eb7eb7d7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/length_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/length_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/percentage_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/percentage_units-expected.png
index 4ac1b39..e209082 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/percentage_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/percentage_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/urls-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/urls-expected.png
index cd158bce..d3e347b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/urls-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css1/units/urls-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t050803-c14-classes-00-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t050803-c14-classes-00-e-expected.png
index 4eb32b09..8385fe8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t050803-c14-classes-00-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t050803-c14-classes-00-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t0509-c15-ids-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t0509-c15-ids-01-e-expected.png
index 7abd6d1..28d99a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t0509-c15-ids-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css2.1/t0509-c15-ids-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-161-expected.png
index 8bcee09..1654fa7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-23-expected.png
index 2985af22..d23d56e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-24-expected.png
index b3e093e..5bef7f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-68-expected.png
index b3e093e..5bef7f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-69-expected.png
index 2985af22..d23d56e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/html/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-161-expected.png
index 8bcee09..1654fa7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-23-expected.png
index 2985af22..d23d56e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-24-expected.png
index b3e093e..5bef7f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-68-expected.png
index b3e093e..5bef7f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-69-expected.png
index 2985af22..d23d56e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xhtml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-161-expected.png
index cc257495..9bc26c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-23-expected.png
index a01406e..5daa7c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-24-expected.png
index 8f0a29a..55c742b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-68-expected.png
index 8f0a29a..55c742b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-69-expected.png
index a01406e..5daa7c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/css3/selectors3/xml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/5144139-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/5144139-2-expected.png
index bfb23cd..6fac6f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/5144139-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/5144139-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/merge-whitespace-pre-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/merge-whitespace-pre-expected.png
index 4da011f3..b91fe3a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/merge-whitespace-pre-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/deleting/merge-whitespace-pre-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/execCommand/format-block-with-trailing-br-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/execCommand/format-block-with-trailing-br-expected.png
index afdea2c..d0cdaac9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/execCommand/format-block-with-trailing-br-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/execCommand/format-block-with-trailing-br-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/input/reveal-caret-of-multiline-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/input/reveal-caret-of-multiline-input-expected.png
index eff2edb1..8602106 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/input/reveal-caret-of-multiline-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/input/reveal-caret-of-multiline-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/inserting/4278698-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/inserting/4278698-expected.png
index d4fd18f..3839345 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/inserting/4278698-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/inserting/4278698-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/drop-text-without-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/drop-text-without-selection-expected.png
index ee06b46..5528f2bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/drop-text-without-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/drop-text-without-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/innerText-inline-table-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/innerText-inline-table-expected.png
index b03b31f..9d3dda3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/innerText-inline-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/innerText-inline-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/pasting-tabs-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/pasting-tabs-expected.png
index 159be145..9f5026b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/pasting-tabs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/pasteboard/pasting-tabs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/3690719-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/3690719-expected.png
index c5a0c05..5e0cc83 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/3690719-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/3690719-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-backward-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-backward-expected.png
index ef1ebaa3..812e396 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-backward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-backward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-forward-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-forward-expected.png
index a225090..1d75b6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-forward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/extend-inside-transforms-forward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/replaced-boundaries-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/replaced-boundaries-3-expected.png
index 9482552c..18ac48cc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/replaced-boundaries-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/replaced-boundaries-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-box-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-box-expected.png
index 7afcc205..b773b047 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-element-paragraph-boundary-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-element-paragraph-boundary-expected.png
index f9914be..9bb8957 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-element-paragraph-boundary-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/select-element-paragraph-boundary-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/triple-click-in-pre-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/triple-click-in-pre-expected.png
index 55f70ee6..67e27998 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/triple-click-in-pre-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/editing/selection/triple-click-in-pre-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/backgrounds/background-inherit-color-bug-expected.png
index ecf11ad..27556f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/backgrounds/background-inherit-color-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/backgrounds/background-inherit-color-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/float-avoidance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/float-avoidance-expected.png
index a8d063b..b26c39f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/float-avoidance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/float-avoidance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/shrink-to-avoid-float-complexity-expected.png
index 4244749..c319260 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/block/float/shrink-to-avoid-float-complexity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css-generated-content/014-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css-generated-content/014-expected.png
index 8d23125..7f22e76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css-generated-content/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css-generated-content/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/hover-subselector-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/hover-subselector-expected.png
index bc2df35f..27b40d8d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/hover-subselector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/hover-subselector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/outline-auto-empty-rects-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/outline-auto-empty-rects-expected.png
index 5eb083f..91a51fb3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/outline-auto-empty-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/outline-auto-empty-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/shadow-multiple-expected.png
index cfbd7cb..48f3b78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/universal-hover-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/universal-hover-quirk-expected.png
index 0b6257e..c41ade8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/universal-hover-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/css/universal-hover-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
index 6f767e8..dacc534 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-non-draggable-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-non-draggable-link-expected.png
index c76c3acb..5086aff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-non-draggable-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dnd/link-dragging-non-draggable-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
index 7c1faaea..51a76aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/row-inner-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/row-inner-text-expected.png
index 864bb0d..4d6d0529 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/row-inner-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/dom/row-inner-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/events/autoscroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/events/autoscroll-expected.png
index 8e080964..bc428ad9d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/events/autoscroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/events/autoscroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/001-expected.png
index 59ec846e..aae1665 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-default-title-expected.png
index 9233dd7..60bad7be 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-default-title-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-default-title-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-style-color-expected.png
index 33d9ef9..ed3eeac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/button-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index 78f1373..e304152 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index 31b2db69..2fb3b11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index 80f4929..78ef08e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index 7949aa51..c671c94b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index 8e494cd..346e509 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index d4a183e..4cbb5484 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index c8e6fb6..186411f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
index 546eaadb..711310af 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
index e6540e95..9ed5873c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-expected.png
index 006ffc1..a034e504 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index ad10b32..8ec12f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-expected.png
index dc8d39c..913cf56 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index 6289e60..09dd63f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-expected.png
index f286b92..c82062b8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index 1e63d51..ebc7504 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
index 3ff9749..0d03223 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
index 0ba6ce7..018a5ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
index 857a667..0e1d166 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-basic-expected.png
index a54e464..ae54881 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-pseudo-elements-expected.png
index 72e0775..dd521067 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/date/date-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
index 4fdd2599..dc74603 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/floating-textfield-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/floating-textfield-relayout-expected.png
index 5621cc9..b454f97 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/floating-textfield-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/floating-textfield-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-appearance-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-appearance-height-expected.png
index e31f41f..565c0b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-appearance-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-appearance-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-first-letter-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-first-letter-expected.png
index 02c7476f..df7d4c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-first-letter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-first-letter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-value-expected.png
index 0669f5d..c960511 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-basic-expected.png
index 5f31ac3..05dcc01c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-pseudo-elements-expected.png
index 37c71a8..e9aa681 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/number/number-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/number/number-appearance-rtl-expected.png
index e60bc03..d5ad2cf1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/number/number-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/number/number-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/placeholder-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/placeholder-position-expected.png
index f6d5b3d..7dc8852 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/placeholder-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/placeholder-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/plaintext-mode-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/plaintext-mode-2-expected.png
index f9434528..438019c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/plaintext-mode-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/plaintext-mode-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-appearance-basic-expected.png
index c1b39a4..2a605d31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-cancel-button-style-sharing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-cancel-button-style-sharing-expected.png
index bfa51f8..8a85ee8d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-cancel-button-style-sharing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-cancel-button-style-sharing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-rtl-expected.png
index abb97f1..7566277 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-vertical-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-vertical-alignment-expected.png
index 2f38d65..671d69e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-vertical-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/search/search-vertical-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/basic-selects-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/basic-selects-expected.png
index bd2ea0f7..76a8a068d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/basic-selects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/basic-selects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-appearance-rtl-expected.png
index cb9cefe..55d0b76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-clip-expected.png
index e9022bc..fd693b5f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-no-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-no-overflow-expected.png
index 354b53fb..ca3e31d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-no-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-no-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-option-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-option-wrap-expected.png
index 483bffb4..441acedb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-option-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-option-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-restrict-line-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-restrict-line-height-expected.png
index 8035491..daf0549f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-restrict-line-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-restrict-line-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-style-color-expected.png
index 0b1d275ee..8f5b697 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/menulist-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-autofilled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-autofilled-expected.png
index 1449f5ca..3302f2d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-autofilled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-autofilled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-background-none-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-background-none-expected.png
index f336230..90b6de6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-background-none-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-background-none-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-baseline-expected.png
index 2c33f83e..8f9d0300 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-dirty-parent-pref-widths-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-dirty-parent-pref-widths-expected.png
index cc459bfd..df3490a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-dirty-parent-pref-widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-dirty-parent-pref-widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-listbox-multiple-no-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
index a91264b4..100f9c0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-style-expected.png
index f68179a..2610968 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/select/select-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/submit/submit-appearance-basic-expected.png
index 545d089..c27c6c69 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/submit/submit-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/submit/submit-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index b229755e..46be501 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
index 4ceabdc..74a3d45 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
index 31b3807b..7b6c86e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
index 40f4e455..ca79a89 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index 5361455a..4bd2b40 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index f7fbcab..ad9816d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
index a427826..57213d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index 88921a46..d6284f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index c561790..db247eb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index e1ff779..70b1ff7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
index 5db3371..3b0af7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 9c05311..06abc52 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
index 5fee09f4..fb4f4bc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
index c934df0..8ba8f546 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index b7e5742..980f5ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
index 8f9cc1a..0cf4374 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
index 3b533f2..f0bf756 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/tabbing-input-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/tabbing-input-iframe-expected.png
index ffcfc1e..815f4b8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/tabbing-input-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/tabbing-input-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-focus-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-focus-expected.png
index 8683ce6..1d61b7d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-focus-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-focus-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-selection-expected.png
index 09d02ec..b0dcb76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-appearance-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-double-click-selection-gap-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-double-click-selection-gap-bug-expected.png
index e29bfc4..2a44119 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-double-click-selection-gap-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-double-click-selection-gap-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-paint-order-expected.png
index d2bfe9c..fd8211f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-1-expected.png
index 93f593e9..9b28e78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-3-expected.png
index f837bb5..13494111 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-placeholder-visibility-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-double-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-double-click-expected.png
index e0ee28f9..e14a4ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-double-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-double-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-drag-down-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-drag-down-expected.png
index dfe3f8f..df052ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-drag-down-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-drag-down-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-option-delete-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-option-delete-expected.png
index e5e1f53..a9eea0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-option-delete-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/input-text-option-delete-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/text-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/text-appearance-basic-expected.png
index 06c7b4de..b86bc004e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/text-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/text-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/textfield-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/textfield-outline-expected.png
index 764f5d32..6c9befc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/textfield-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/text/textfield-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
index b056b22..b49cb2ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
index 51cf431..a0e7e41e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
index 84e0421..bd37a70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrollbar-expected.png
index 5b622492..1f46fba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
index 1d7caf39..56d59d37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-type-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-type-expected.png
index 7709935e..8a80c5a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/textarea/textarea-scrolled-type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-basic-expected.png
index 1cc34962..786df75 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-pseudo-elements-expected.png
index 8afd974..7c51569 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/time/time-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-basic-expected.png
index f9e84ee..baacd90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-pseudo-elements-expected.png
index 6fdaffd..dc04789 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/forms/week/week-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-expected.png
index e9ce4ed7..a1e6f53 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-vertical-expected.png
index c76d12c..984e83b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/003-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/dynamic-marker-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/dynamic-marker-crash-expected.png
index 1958aaa..2675a72d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/dynamic-marker-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/lists/dynamic-marker-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
index 4086a7b..7ed39eb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/spatial-navigation/snav-multiple-select-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
index d3c6e1d..de24c2d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/018-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/018-expected.png
index 444d2ea..d0dacf9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/spanOverlapRepaint-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/spanOverlapRepaint-expected.png
index 46c53014..6fa0310 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/spanOverlapRepaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/spanOverlapRepaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/text-field-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/text-field-baseline-expected.png
index 612ad3d..128dd37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/text-field-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/table/text-field-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text-autosizing/list-item-above-dbcat-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text-autosizing/list-item-above-dbcat-expected.png
index a1b65df..ccaa1ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text-autosizing/list-item-above-dbcat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text-autosizing/list-item-above-dbcat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-kerning-and-ligatures-expected.png
index cb92e37..1d7b3aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-multiple-renderers-expected.png
index 7c9e2a3..904d6687 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-pointtooffset-calls-cg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-pointtooffset-calls-cg-expected.png
index 2148a8f..f60ed52 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-pointtooffset-calls-cg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-pointtooffset-calls-cg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-rtl-override-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-rtl-override-selection-expected.png
index ac950f4..1a79b1ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-rtl-override-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-rtl-override-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-small-caps-punctuation-size-expected.png
index 4ec28ed..619b856 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-spacing-features-expected.png
index 3914edef..61b5b88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/001-expected.png
index db0c217..c0f1b6bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/006-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/006-expected.png
index 61df8190..329fa66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/007-expected.png
index 22a66b1..f31c7bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/015-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/015-expected.png
index 08235ff5..d92d4f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/basic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/capitalize-empty-generated-string-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/capitalize-empty-generated-string-expected.png
index ef17ab1..5c8374d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/capitalize-empty-generated-string-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/capitalize-empty-generated-string-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-disabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-disabled-expected.png
index 30e1cfd..0de6585 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-disabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-disabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-expected.png
index 83c51d0e..09069fcd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-rtl-expected.png
index 308995c..f43ff7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/caps-lock-indicator-enabled-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/cg-vs-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/cg-vs-atsui-expected.png
index 89e0a69b..492d811d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/cg-vs-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/cg-vs-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/color-emoji-expected.png
index 913eafc..14856ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/complex-synthetic-bold-space-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/complex-synthetic-bold-space-width-expected.png
index 27c2a03..3352f9f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/complex-synthetic-bold-space-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/complex-synthetic-bold-space-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/delete-hard-break-character-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/delete-hard-break-character-expected.png
index 2e04fc10..43bec5ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/delete-hard-break-character-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/delete-hard-break-character-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
index 654faeeb..0999f11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
index d338e5f..38efae5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
index 99c15818..18fdc707 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
index 5ad85e0..5ebcaba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/in-rendered-text-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/in-rendered-text-rtl-expected.png
index 3590669..e0c7454d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/in-rendered-text-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/in-rendered-text-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-CSS-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-CSS-expected.png
index 5e06fa7..246ec50 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-CSS-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-CSS-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-HTML-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-HTML-expected.png
index 259cab8..929e96c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-HTML-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-HTML-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
index 4002b7c..e7a5a40 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-european-terminators-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-european-terminators-expected.png
index 383350e..e05b695 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-european-terminators-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-european-terminators-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
index 2b817c3..9ccb5e1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-innertext-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-innertext-expected.png
index 0a4d2a2..79fdcf65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-innertext-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/bidi-innertext-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/hebrew-vowels-expected.png
index 06fd909..592cfff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/mixed-directionality-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/mixed-directionality-selection-expected.png
index e72a2e3..f244263 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/mixed-directionality-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/mixed-directionality-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-caret-expected.png
index 7c018e6..075734c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-white-space-pre-wrap-expected.png
index 0d4c8ac..02b3918 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/text-spliced-font-expected.png
index b7198e0..b0489b0d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/vertical-text-glyph-test-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/vertical-text-glyph-test-expected.png
index bb61c923..19977bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/vertical-text-glyph-test-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/international/vertical-text-glyph-test-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/midword-break-hang-expected.png
index 408fb09..be099ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/should-use-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/should-use-atsui-expected.png
index 2daa4afc..3656e0b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/should-use-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/should-use-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/webfont-synthetic-bold-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/webfont-synthetic-bold-expected.png
index 1ef271c..92441ea3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/webfont-synthetic-bold-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/webfont-synthetic-bold-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-overflow-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
index 6c8944f..c04622d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
index 3a46dcb..e5ebc63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
index c7cfb5d..2408e1bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/writing-mode/border-vertical-lr-expected.png
index 7ad10a3..76523d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-summary-child-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-summary-child-expected.png
index c8eb4acaa..5dd6955f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-summary-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-summary-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-text-expected.png
index bd333d9c3..72a4442 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/html/details_summary/details-replace-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/control-clip-expected.txt
deleted file mode 100644
index 8b4cf5f..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/control-clip-expected.txt
+++ /dev/null

@@ -1,67 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [9, 84, 198, 14],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 114, 184, 13],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [81, 114, 54, 13],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText (anonymous)",
-          "rect": [9, 84, 53, 14],
-          "reason": "full"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow (anonymous)",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText (anonymous)",
-      "reason": "full"
-    },
-    {
-      "object": "InlineTextBox 'SUCCESS'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutBlockFlow (anonymous)",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "full"
-    },
-    {
-      "object": "InlineTextBox 'SUCCESS'",
-      "reason": "full"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
index 4e0dad8..304565b7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 29, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 29, 13],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
index cd63966b..3168b3c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 36, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 36, 13],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/shadow-multiple-expected.png
index 50943a3..ba0baaf1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/textarea-caret-expected.png
index 76bf290e..5f0cbe8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/textarea-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/plugins/embed-attributes-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/plugins/embed-attributes-style-expected.png
index 93dad97..a0a7b73b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/plugins/embed-attributes-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/plugins/embed-attributes-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/inline-svg-in-xhtml-expected.png
index f4e6aa68..467f62f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/inline-svg-in-xhtml-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/inline-svg-in-xhtml-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/object-sizing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/object-sizing-expected.png
index dda0525c..657f00f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/custom/object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/SVGLocatable-getCTM-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
index 61453159..366696d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/css-transforms-expected.png
index 93b4797..cc69e71c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/dom/css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/hixie/mixed/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/hixie/mixed/003-expected.png
index ee31b547..915e53cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/hixie/mixed/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/svg/hixie/mixed/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1055-1-expected.png
index 3d98e61..2aa4751 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1055-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1055-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1188-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1188-expected.png
index 4fa144e..3b18a18b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug1188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug13118-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug13118-expected.png
index 97af6ab3..881cd59 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug13118-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug13118-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug18359-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug18359-expected.png
index decd2b5..e1f2e96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug18359-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug18359-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug23235-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug23235-expected.png
index bfa99f2..f96247f1c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug23235-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug23235-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug2479-3-expected.png
index 352767b..6a19563 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug2479-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug2479-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug28928-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug28928-expected.png
index dc0b8de7..f05405e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug28928-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug28928-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug30692-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug30692-expected.png
index 663193ab..62af317 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug30692-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug30692-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug39209-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug39209-expected.png
index 50aa702..d5db9b0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug39209-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug39209-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug4429-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug4429-expected.png
index c3fa86af5..2e236bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug4429-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug4429-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug44505-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug44505-expected.png
index fed4ce19..7aed259 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug44505-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug44505-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug51037-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug51037-expected.png
index 14da22c..cc4b02ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug51037-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug51037-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug59354-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug59354-expected.png
index e9ef950..d7b53339 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug59354-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug59354-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug60749-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug60749-expected.png
index c43f7111..c8a28a425 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug60749-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug60749-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-1-expected.png
index 93feb75..ef25394 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-2-expected.png
index d382a5c..fe0b1ce6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7112-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7121-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7121-1-expected.png
index f0552e81..1e43a275 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7121-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7121-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7342-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7342-expected.png
index de847b2c..6ca62feb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7342-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug7342-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug8950-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug8950-expected.png
index e737073..2485484 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug8950-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/bugs/bug8950-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/core/margins-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/core/margins-expected.png
index 5ebae75..57900714 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/core/margins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/core/margins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/dom/tableDom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/dom/tableDom-expected.png
index c387d5c..f6a806c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/dom/tableDom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/dom/tableDom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/other/test6-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/other/test6-expected.png
index 3ccab0b..017ef39 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/other/test6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla/other/test6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug1128-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug1128-expected.png
index a2e5498..aa76b00d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug1128-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug1128-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug21518-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug21518-expected.png
index 81fcb4e..512d9df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug21518-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug21518-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug22122-expected.png
index acca75e..991f036e4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug22122-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug22122-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
index beaf7ee..c5def04 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index 1cd1f32..ef8ce75 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/hindi-rotated-expected.png
index 5d282ab8..e1d7109 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/zoom-menulist-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/zoom-menulist-expected.png
index c9a41b8..e63f92f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/zoom-menulist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/transforms/2d/zoom-menulist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/change-text-content-and-background-color-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/search-field-cancel-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
new file mode 100644
index 0000000..ba0baaf1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac-mac10.10/paint/invalidation/subtree-root-skipped-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
new file mode 100644
index 0000000..5f0cbe8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index ac463f3..ba8ad8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index 0218429..8d707ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index aec9050..3d4ca315 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.10/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index 70526b2..9359ecf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/comments-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/comments-expected.png
index 3c0d3c4..e995caeb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/comments-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/comments-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/containment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/containment-expected.png
index 0753871..27e80048 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/containment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/containment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/contextual_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/contextual_selectors-expected.png
index df9394e..06aa4c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/contextual_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/contextual_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/id_as_selector-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/id_as_selector-expected.png
index 945b77d..cd2b0b3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/id_as_selector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/basic/id_as_selector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border-expected.png
index 1a6978ad..2d7351a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom-expected.png
index f6991755..5927f006 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom_width-expected.png
index a422fb4..49620f8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_bottom_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left-expected.png
index b8437392..c3cb29b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left_width-expected.png
index eb021b2..3d8da9d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_left_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_inline-expected.png
index 6aa7497..128a7ad 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_width-expected.png
index 928fdb3..f4189ffc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_right_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_style-expected.png
index bb7c5a8..3544bd9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top-expected.png
index 75ad247..87118d0d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top_width-expected.png
index 533a7f1f..58654d64 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_top_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_width-expected.png
index 53823764..96b8fcc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/border_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/clear-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/clear-expected.png
index dc57a9a..3141a8d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_elements_in_series-expected.png
index 23f3cff..0dbd39c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_margin-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_margin-expected.png
index 091a63f..e107155 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_on_text_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_on_text_elements-expected.png
index 850f29f1..ace4b553 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_on_text_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/float_on_text_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/height-expected.png
index 18b057d..855ef83 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_bottom-expected.png
index af7c1ed0..67b0795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_left-expected.png
index 890c330..42e6426f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_top-expected.png
index c82d3a4d..6fc938f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/margin_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding-expected.png
index 60c2e98f..eec6b9cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_bottom-expected.png
index 3d73f404..3301c2d9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_inline-expected.png
index f899913..eaf9d18 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_left-expected.png
index 17ae178..19076ea4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_right-expected.png
index 1744feab..40825a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_top-expected.png
index ce3c42b..e63f403f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/padding_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/width-expected.png
index e566919..fa139f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/box_properties/width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/cascade/cascade_order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/cascade/cascade_order-expected.png
index 1c8ae9f..a9ef615 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/cascade/cascade_order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/cascade/cascade_order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/display-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/display-expected.png
index 172e827d..97af81ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/display-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/list_style_type-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/list_style_type-expected.png
index 4a55693..920f4f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/list_style_type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/classification/list_style_type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background-expected.png
index 3c93aad..e189e34 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background_position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background_position-expected.png
index edcd793d..5358d41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/color_and_background/background_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font-expected.png
index 62291154..f6b822b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_family-expected.png
index 01187eb..7813199 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_size-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_size-expected.png
index e5e1b2c..1623ccc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_weight-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_weight-expected.png
index 9965a549..3bf8725 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_weight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/font_properties/font_weight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/floating_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/floating_elements-expected.png
index b618861e..056f35c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/floating_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/floating_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/height_of_lines-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/height_of_lines-expected.png
index db85270..3dbb70a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/height_of_lines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/height_of_lines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/inline_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/inline_elements-expected.png
index 9a91bf8..c99d311 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/inline_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/inline_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/replaced_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/replaced_elements-expected.png
index e8483b4..368c633 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/replaced_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/replaced_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/vertical_formatting-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/vertical_formatting-expected.png
index 4e4f86db..bde32737 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/vertical_formatting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/formatting_model/vertical_formatting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/anchor-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/anchor-expected.png
index 4ca75ad..1a79c666 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/anchor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/anchor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstletter-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstletter-expected.png
index 0f9c2b5..218a0e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstletter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstletter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstline-expected.png
index e44224e..2812429 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/multiple_pseudo_elements-expected.png
index 7607a7b4..557357b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/letter_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/letter_spacing-expected.png
index 2c82a8b..b7565ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/letter_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/letter_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/line_height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/line_height-expected.png
index 6e437722..4869f65c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/line_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/line_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_decoration-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_decoration-expected.png
index 4494f521..76f6d11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_decoration-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_decoration-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_indent-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_indent-expected.png
index e645859c..7c83ac8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_indent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_indent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_transform-expected.png
index 5f63294..0fd9e8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/vertical_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/vertical_align-expected.png
index 55be854..86062e90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/vertical_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/vertical_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/word_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/word_spacing-expected.png
index 7850a83..03bfc9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/word_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/text_properties/word_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/color_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/color_units-expected.png
index 5210036..31b45d7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/color_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/color_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/length_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/length_units-expected.png
index 09e1a2d..1064807 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/length_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css1/units/length_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/flexbox/button-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/flexbox/button-expected.png
index cc443bc..e4c1964a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/flexbox/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/flexbox/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-luminance-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-luminance-svg-expected.png
index ec68116..d3485a65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-luminance-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-luminance-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-repeat-space-content-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-repeat-space-content-expected.png
index e0baf8f8..5dc0684 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-repeat-space-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/masking/mask-repeat-space-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-161-expected.png
index f7cfca3d..119c454 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-23-expected.png
index 85bae41..d3cd1fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-24-expected.png
index 36f0672..84cff64f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-68-expected.png
index 36f0672..84cff64f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-69-expected.png
index 85bae41..d3cd1fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/html/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-161-expected.png
index f7cfca3d..119c454 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-23-expected.png
index 85bae41..d3cd1fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-24-expected.png
index 36f0672..84cff64f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-68-expected.png
index 36f0672..84cff64f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-69-expected.png
index 85bae41..d3cd1fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xhtml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-161-expected.png
index d7e96b6..b814876e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-23-expected.png
index a9db893..990801e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-24-expected.png
index 3c3fab4..7bb1728 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-68-expected.png
index 3c3fab4..7bb1728 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-69-expected.png
index a9db893..990801e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/css3/selectors3/xml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/caret/caret-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/caret/caret-position-expected.png
index 9c6bb26..25f33574 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/caret/caret-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/caret/caret-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/caret-at-the-edge-of-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/caret-at-the-edge-of-input-expected.png
index 65e1647..7ae2f62c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/caret-at-the-edge-of-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/caret-at-the-edge-of-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
index b6b8a4f..9dd8df12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-input-expected.png
index 7476375..326f913 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/input/reveal-caret-of-multiline-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/inserting/4960120-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/inserting/4960120-1-expected.png
index 9e5e091..81e555ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/inserting/4960120-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/inserting/4960120-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/4806874-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/4806874-expected.png
index d9319e4..42b8adb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/4806874-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/4806874-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/drop-text-without-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/drop-text-without-selection-expected.png
index c0b93ca..6e45231 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/drop-text-without-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/drop-text-without-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/input-field-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/input-field-1-expected.png
index 7c8fa5b..e4bc8ea4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/input-field-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/input-field-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/pasting-tabs-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/pasting-tabs-expected.png
index 9855281e..0b9edb50 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/pasting-tabs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/pasteboard/pasting-tabs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/3690719-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/3690719-expected.png
index 824a251..cf389e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/3690719-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/3690719-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/drag-select-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/drag-select-1-expected.png
index e626a66..36bfb9d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/drag-select-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/drag-select-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/replaced-boundaries-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/replaced-boundaries-3-expected.png
index 1f0d4eb..699e285 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/replaced-boundaries-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/replaced-boundaries-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-box-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-box-expected.png
index e6f0658..f9c29b9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-element-paragraph-boundary-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-element-paragraph-boundary-expected.png
index b9f3f5e8..d35b9e1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-element-paragraph-boundary-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/editing/selection/select-element-paragraph-boundary-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-inherit-color-bug-expected.png
index fc485cf4..681d409 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-inherit-color-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-inherit-color-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-leakage-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-leakage-transforms-expected.png
index 1a2a786..83f306f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-leakage-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/backgrounds/background-leakage-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/016-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/016-expected.png
index 30e5534..152789d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/025-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/025-expected.png
index 2cfdf069..47486ca7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/025-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/025-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/026-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/026-expected.png
index 05c68ee..8e5dc097a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/026-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/026-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/027-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/027-expected.png
index 2cfdf069..47486ca7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/027-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/027-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/028-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/028-expected.png
index 05c68ee..8e5dc097a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/028-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/028-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/float-avoidance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/float-avoidance-expected.png
index fa3a741b..9243ce0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/float-avoidance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/float-avoidance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/shrink-to-avoid-float-complexity-expected.png
index 7d5166d..8741a05 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/float/shrink-to-avoid-float-complexity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/margin-collapse/empty-clear-blocks-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/margin-collapse/empty-clear-blocks-expected.png
index 1dcae77..6a77125e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/margin-collapse/empty-clear-blocks-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/block/margin-collapse/empty-clear-blocks-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-01-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-01-expected.png
index 4ae644c..2baa1aca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-01-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-02-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-02-expected.png
index 82131ec..0faa971 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-02-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-03-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-03-expected.png
index c0d0ab4a..3abb018 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-03-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/borders/rtl-border-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/box-shadow/basic-shadows-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/box-shadow/basic-shadows-expected.png
index 6ed7e64..03911476 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/box-shadow/basic-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/box-shadow/basic-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css-generated-content/014-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css-generated-content/014-expected.png
index 534dea33..cdf313a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css-generated-content/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css-generated-content/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/nested-rounded-corners-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/nested-rounded-corners-expected.png
index b40b132..d2a0dfce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/nested-rounded-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/nested-rounded-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/resize-corner-tracking-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/resize-corner-tracking-expected.png
index e58e5e19..f181c79 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/resize-corner-tracking-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/resize-corner-tracking-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/rtl-ordering-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/rtl-ordering-expected.png
index 21b1efa..f1a9d81b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/rtl-ordering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/rtl-ordering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/shadow-multiple-expected.png
index 1ef54d0..82faf43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
index 5587dd0..33e4f58 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
index 6df5b95..ba7988f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-non-draggable-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-non-draggable-link-expected.png
index 070113b..962321a76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-non-draggable-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dnd/link-dragging-non-draggable-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/34176-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/34176-expected.png
index f2b47b1d..982157f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/52776-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/52776-expected.png
index 5a40f5f..ac951a93 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/52776-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/52776-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
index 7fb1987..684ce486 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/focus-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/focus-contenteditable-expected.png
index b3d8cbe..f61b7f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/focus-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/dom/focus-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/encoding/invalid-UTF-8-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/encoding/invalid-UTF-8-expected.png
index 70a916f..d5680ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/encoding/invalid-UTF-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/encoding/invalid-UTF-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/autoscroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/autoscroll-expected.png
index b39dcb3..ffd56522 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/autoscroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/autoscroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/context-no-deselect-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/context-no-deselect-expected.png
index 433a94f..2ec46ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/context-no-deselect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/context-no-deselect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/reveal-link-when-focused-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/reveal-link-when-focused-expected.png
index 1b38662..2a1eee65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/reveal-link-when-focused-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/events/reveal-link-when-focused-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/001-expected.png
index f3ed436..366b26a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-default-title-expected.png
index 8d8c986..076f7ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-default-title-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-default-title-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-style-color-expected.png
index ed40183..72bc67b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button/button-inner-block-reuse-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button/button-inner-block-reuse-expected.png
index 7431de8..3bc69ea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button/button-inner-block-reuse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/button/button-inner-block-reuse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index c53a3c4..8d4e9e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index 41a615b..dbe4d05 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index 6864aa63..127ce24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index bdf474a7..42bee2b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index afe5b8d4..77f04cd0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index 4d1881d..14cabbb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index 99c5a8b7..e6efa98 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-expected.png
index 4a13b1c..0b69e1a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index 9d5a8ac..2f03436 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-expected.png
index 3fff0ccf..b8439e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index 31279c63..2c0def4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/checkbox/checkbox-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/checkbox/checkbox-appearance-basic-expected.png
index 1aec597..d316e598 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/checkbox/checkbox-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/checkbox/checkbox-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-expected.png
index 4f330ee..1db987a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index a49360d..0778eb61 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
index 7d69bdc..f2849c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
index d9786332..6106f93 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
index 4cef70df..cef7509 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/input-appearance-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/input-appearance-color-expected.png
index 3eb7fa0..7268d5c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/input-appearance-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/color/input-appearance-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-basic-expected.png
index b5da166..b62d1a8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-pseudo-elements-expected.png
index 9e03f07c..285717c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/date/date-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
index ecfbed7..6f15dd7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/fieldset/fieldset-align-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/fieldset/fieldset-align-expected.png
index 0a199530..0702d82 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/fieldset/fieldset-align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/fieldset/fieldset-align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/floating-textfield-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/floating-textfield-relayout-expected.png
index e64fae9..e4de8c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/floating-textfield-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/floating-textfield-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-appearance-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-appearance-height-expected.png
index 60736a28..14a8fd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-appearance-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-appearance-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-first-letter-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-first-letter-expected.png
index b3180dc..98aeb750 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-first-letter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-first-letter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-value-expected.png
index 2d143b6..957a5db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-basic-expected.png
index 334637b..8cacfab4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-pseudo-elements-expected.png
index 5ca4a11b..7740278 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-datalist-expected.png
index ff247b8..ed5475e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-rtl-expected.png
index c40bd2f..27a4a95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/number/number-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/placeholder-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/placeholder-position-expected.png
index 8d267ad..e6b5fb8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/placeholder-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/placeholder-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/plaintext-mode-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/plaintext-mode-2-expected.png
index f4c18762..be0d3c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/plaintext-mode-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/plaintext-mode-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/radio/radio-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/radio/radio-appearance-basic-expected.png
index eafce57..8f420dc4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/radio/radio-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/radio/radio-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-appearance-basic-expected.png
index edf0f5b..ed48a6e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-cancel-button-style-sharing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-cancel-button-style-sharing-expected.png
index 7d56a56..57fbd77 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-cancel-button-style-sharing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-cancel-button-style-sharing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-rtl-expected.png
index af69247..0323eafa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-vertical-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-vertical-alignment-expected.png
index 79bc7ed..ac3a167 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-vertical-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/search/search-vertical-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/basic-selects-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/basic-selects-expected.png
index ad51fffb..93eddbb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/basic-selects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/basic-selects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-none-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-none-expected.png
index 6c523641..9db9d55 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-none-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-none-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-rtl-expected.png
index 8b755ea..df10e37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-clip-expected.png
index 602bde3..8f1988b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-no-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-no-overflow-expected.png
index e61580d..7a10502 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-no-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-no-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-option-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-option-wrap-expected.png
index 492bb24..95ede20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-option-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-option-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-restrict-line-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-restrict-line-height-expected.png
index 6e9afd3..4424c73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-restrict-line-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-restrict-line-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-style-color-expected.png
index 1abba03..c5ce69a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/menulist-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-autofilled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-autofilled-expected.png
index c0bdac2..0ceba26 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-autofilled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-autofilled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-background-none-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-background-none-expected.png
index 800822f..14466628 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-background-none-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-background-none-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-baseline-expected.png
index b3b354e..d943eb17 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-dirty-parent-pref-widths-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-dirty-parent-pref-widths-expected.png
index 365b771..d5b0530 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-dirty-parent-pref-widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-dirty-parent-pref-widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-listbox-multiple-no-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
index cb3cecc..e6d8d10 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-style-expected.png
index c761104..cfd67f41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-visual-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-visual-hebrew-expected.png
index ef83cec..fff35a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-visual-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-visual-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-writing-direction-natural-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-writing-direction-natural-expected.png
index df2169e..a684916 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-writing-direction-natural-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/select/select-writing-direction-natural-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/submit/submit-appearance-basic-expected.png
index aa96c04a..5d04488 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/submit/submit-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/submit/submit-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index 9b44dbe7..8ccc231 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
index 96eaf2f..dc1812ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
index 9e87fad..1b504e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
index 18d4f1a..9d70920 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index 7e3f5233..288e2ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index e7c98f2..6e0e99e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
index 47f7687..a7325ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index dd38923..1818761 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index 5fc057a..aa3ef0a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index 2ab85d0..9639c0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
index 11cebb8..2f2de8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 2686a0e..44993dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
index 59e2407..23f559b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
index 663d3ff..983923a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index b6e409d..d9467c0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
index 9de9c7f..2008dfc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
index ef78e5b9..3ba18ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/tabbing-input-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/tabbing-input-iframe-expected.png
index 011df61..9465385 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/tabbing-input-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/tabbing-input-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-focus-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-focus-expected.png
index 8c190019..3bc9395 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-focus-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-focus-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-selection-expected.png
index 1bf302d..f9c1f604 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-appearance-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-double-click-selection-gap-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-double-click-selection-gap-bug-expected.png
index 649c980..e572cbc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-double-click-selection-gap-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-double-click-selection-gap-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-paint-order-expected.png
index 9d61993..14d3ea58 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-1-expected.png
index 827a278..9285575 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-3-expected.png
index 03688a4..bd43584 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-placeholder-visibility-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-tab-shows-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-tab-shows-caret-expected.png
index e62d315..f9e7a71a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-tab-shows-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-tab-shows-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-click-inside-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-click-inside-expected.png
index b8f69d9..fdbd64f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-click-inside-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-click-inside-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-double-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-double-click-expected.png
index ee27479..1cdde0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-double-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-double-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-drag-down-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-drag-down-expected.png
index 16dc5de..f9a11e27 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-drag-down-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-drag-down-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-option-delete-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-option-delete-expected.png
index 1e3d4b41..1d8ba26 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-option-delete-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-option-delete-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-self-emptying-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-self-emptying-click-expected.png
index 95d0174b..be42f1b7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-self-emptying-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/input-text-self-emptying-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-basic-expected.png
index fe36522..00729aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-datalist-expected.png
index 04fcdde..5b389c7d1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/text-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-focus-ring-expected.png
index da9e2a4..589e07c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-outline-expected.png
index 8b448e8c..356da130 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-overflow-expected.png
index 6912389..823ed69 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/text/textfield-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
index 8185b1b..95b8239 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
index aa8560ad..d6103a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
index 7f68481..ca68a03 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrollbar-expected.png
index 62da30a..9186db80 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
index 6dc15ce4..9b2cad9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-type-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-type-expected.png
index 03cb079..01ea094 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/textarea/textarea-scrolled-type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-basic-expected.png
index 58d2404..e857a6d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-pseudo-elements-expected.png
index 5a8fea4..a0164f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/time/time-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/visual-hebrew-text-field-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/visual-hebrew-text-field-expected.png
index 7bec0fc..808b646b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/visual-hebrew-text-field-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/visual-hebrew-text-field-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-basic-expected.png
index d71f1f15d..91f84e7c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-pseudo-elements-expected.png
index a0b0a10..79c88c2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/forms/week/week-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/frames/onlyCommentInIFrame-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/frames/onlyCommentInIFrame-expected.png
index 24af36f..60a0441 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/frames/onlyCommentInIFrame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/frames/onlyCommentInIFrame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-borders-with-bidi-override-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-borders-with-bidi-override-expected.png
index 1e3bbb8..d95cdca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-borders-with-bidi-override-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-borders-with-bidi-override-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-continuation-borders-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-continuation-borders-expected.png
index 7afe4589..8e74023b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-continuation-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/inline/inline-continuation-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/008-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/008-expected.png
index 35685d8..2bfc872 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/dynamic-marker-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/dynamic-marker-crash-expected.png
index a189d713..76d32c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/dynamic-marker-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/dynamic-marker-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/ol-start-parsing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/ol-start-parsing-expected.png
index 6355d5a..208393f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/ol-start-parsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/ol-start-parsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/olstart-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/olstart-expected.png
index 4ca36616..34c3b236 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/olstart-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/lists/olstart-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
index 610c52b..71b8df5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/image-selection-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/image-selection-highlight-expected.png
index d43599d..fbf47b3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/image-selection-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/image-selection-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-expected.png
index 950865b8..2f6b32c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-vertical-expected.png
index d6e19184..1d1809e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-rtl-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-text-hit-testing-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-text-hit-testing-expected.png
index b6cabb4..1647d2a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-text-hit-testing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-text-hit-testing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-update-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-update-transform-expected.png
index a79b7a5..51b8abd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-update-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-update-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-with-local-background-attachment-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-with-local-background-attachment-expected.png
index 69f58ae..098ae866 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-with-local-background-attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/replaced/border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/replaced/border-radius-clip-expected.png
index da735611..41fd5f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/replaced/border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/replaced/border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/selectors/166-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/selectors/166-expected.png
index 3aba749..f01a873 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/selectors/166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/selectors/166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/spatial-navigation/snav-multiple-select-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
index 33e7bd6f..27401ebb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/003-expected.png
index 770aabd..56b977b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-expected.png
index 01a428f..12972d43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-vertical-expected.png
index 45401787..a99542c2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/040-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-collapsed-border-expected.png
index 4bd2deb..0be9b41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-expected.png
index 5e7d2bc6..60e36bdb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/edge-offsets-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/edge-offsets-expected.png
index 60544fe..a998714 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/edge-offsets-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/edge-offsets-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/spanOverlapRepaint-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/spanOverlapRepaint-expected.png
index f9867c1..4c15622 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/spanOverlapRepaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/spanOverlapRepaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/text-field-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/text-field-baseline-expected.png
index 07d7c08..7ee2c39 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/text-field-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/table/text-field-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-kerning-and-ligatures-expected.png
index fff7292..b50abc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-multiple-renderers-expected.png
index 65ae352..5431543 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-pointtooffset-calls-cg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-pointtooffset-calls-cg-expected.png
index 673c9fa..b4cce635 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-pointtooffset-calls-cg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-pointtooffset-calls-cg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-rtl-override-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-rtl-override-selection-expected.png
index 7db1a0e..8210ce2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-rtl-override-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-rtl-override-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-small-caps-punctuation-size-expected.png
index bcba5d28..bd4678e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-spacing-features-expected.png
index ccaba15..a5c0dd7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/006-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/006-expected.png
index 622a02f..5fffd23 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/007-expected.png
index a2158652..3e6a61a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/015-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/015-expected.png
index 38722a13..551dbae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/basic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/capitalize-empty-generated-string-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/capitalize-empty-generated-string-expected.png
index 6e2e458..964fbf3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/capitalize-empty-generated-string-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/capitalize-empty-generated-string-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-disabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-disabled-expected.png
index cab7cb1..c3791a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-disabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-disabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-expected.png
index 24171496..bf77d4d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-rtl-expected.png
index bf515742..d03f493 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/caps-lock-indicator-enabled-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/color-emoji-expected.png
index 28edbc2..8e8c48b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/complex-synthetic-bold-space-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/complex-synthetic-bold-space-width-expected.png
index 9ae6740..29f9ab059 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/complex-synthetic-bold-space-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/complex-synthetic-bold-space-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/delete-hard-break-character-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/delete-hard-break-character-expected.png
index 7287337..d3bd7828 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/delete-hard-break-character-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/delete-hard-break-character-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
index 374fa77..d28530a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
index dff3209..c228591 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
index c603488..551f092a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
index 6ea56fd9..d5df110 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/in-rendered-text-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/in-rendered-text-rtl-expected.png
index 3ca9bf8..4763062 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/in-rendered-text-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/in-rendered-text-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-CSS-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-CSS-expected.png
index 39743b5..da8a56ac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-CSS-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-CSS-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-HTML-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-HTML-expected.png
index 5f051b5..d5cbaab7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-HTML-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-HTML-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
index 9b856cd..22e3e8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-european-terminators-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-european-terminators-expected.png
index ca423cac..99dc213 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-european-terminators-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-european-terminators-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
index d7d6c2c..71280c0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-innertext-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-innertext-expected.png
index 2e646d6c..9bab634 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-innertext-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/bidi-innertext-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/hebrew-vowels-expected.png
index 998c6405..5f1a4312 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/mixed-directionality-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/mixed-directionality-selection-expected.png
index 50439288..5871d5b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/mixed-directionality-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/mixed-directionality-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-caret-expected.png
index f1d528a20..0382949c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-white-space-pre-wrap-expected.png
index 232f387..2a461a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/text-spliced-font-expected.png
index 8bf9097..fd4e3fe3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/vertical-text-glyph-test-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/vertical-text-glyph-test-expected.png
index c905dee..001a11a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/vertical-text-glyph-test-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/international/vertical-text-glyph-test-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/midword-break-hang-expected.png
index b9696e0..74d37b5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/should-use-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/should-use-atsui-expected.png
index 63682dc..74c26577 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/should-use-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/should-use-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-overflow-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
index 4508486..56cf4c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
index 8e529fd..932f92e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
index 8717c93..6cd1e9b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
index 6274768..e250168 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-vertical-lr-expected.png
index 376e846..f1d7917 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-no-summary4-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-no-summary4-expected.png
index 72f5baa..2a695f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-no-summary4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-no-summary4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open-javascript-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open-javascript-expected.png
index db233b1..e77005f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open-javascript-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open-javascript-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open2-expected.png
index 1f6a470f..d75dbf961 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open4-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open4-expected.png
index 1f6a470f..d75dbf961 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-open4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-summary-child-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-summary-child-expected.png
index 7337515..cca3dd72 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-summary-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-summary-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-text-expected.png
index 3b200f0..96158db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/html/details_summary/details-replace-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
index 3ef58f19..14410d01 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/caret-with-composited-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/caret-with-composited-scroll-expected.png
index cd191dc4..74c963d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/caret-with-composited-scroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/caret-with-composited-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/control-clip-expected.txt
deleted file mode 100644
index 77f260e6..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/control-clip-expected.txt
+++ /dev/null

@@ -1,67 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [9, 84, 198, 14],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 114, 184, 13],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [84, 114, 48, 13],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText (anonymous)",
-          "rect": [9, 84, 47, 14],
-          "reason": "full"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow (anonymous)",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText (anonymous)",
-      "reason": "full"
-    },
-    {
-      "object": "InlineTextBox 'SUCCESS'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutBlockFlow (anonymous)",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "full"
-    },
-    {
-      "object": "InlineTextBox 'SUCCESS'",
-      "reason": "full"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
index dda2761..a76b0a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 38, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 38, 13],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
index 3f18e774..def0e6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt

@@ -22,16 +22,6 @@
           "object": "LayoutTextControl INPUT id='root'",
           "rect": [0, 0, 48, 19],
           "reason": "full"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [6, 6, 42, 13],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [6, 6, 42, 13],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/multi-layout-one-frame-expected.txt
index eb75d96..2deda66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [11, 11, 117, 13],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [138, 11, 40, 13],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 40, 13],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
index e62d315..f9e7a71a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/search-field-cancel-expected.txt
index c9f65f4..98ae7fb7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/search-field-cancel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/search-field-cancel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [12, 45, 105, 13],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [12, 45, 54, 13],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
index 8f30984..3daef986 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [5, 5, 54, 25],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 42, 13],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 42, 13],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/subtree-root-skipped-expected.txt
index 7017d91..a08dbba0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/subtree-root-skipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/subtree-root-skipped-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 26, 13],
-          "reason": "full"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='div'",
           "rect": [8, 288, 10, 20],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.png
index 59981f4..bb07880 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.txt
index 4c17e86..788a8d9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/textarea-caret-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 155, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [9, 24, 144, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/plugins/embed-attributes-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/plugins/embed-attributes-style-expected.png
index 9b75abd..3ac1267 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/plugins/embed-attributes-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/plugins/embed-attributes-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
index 6850c2e..ce72c59a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
index e579ca1b..fdd12659 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
index 7bd2c9b..fe5f6f6d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
index 2f742e1..5e413e9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
index e291ecb3..9644314 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
index c830ede8..5f920a5c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/batik/text/verticalText-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/batik/text/verticalText-expected.png
index 84a4fe36..e0253a09 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/batik/text/verticalText-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/batik/text/verticalText-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/foreign-object-skew-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/foreign-object-skew-expected.png
index e2a5e8af4..f05d21e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/foreign-object-skew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/foreign-object-skew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
index 1fcc4525..98808c88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
index 0973441..17127e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
index 81f7e73..f42a3d7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/inline-svg-in-xhtml-expected.png
index 38f3f7f1..d43a626 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/inline-svg-in-xhtml-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/inline-svg-in-xhtml-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/linking-uri-01-b-expected.png
index 3495c63..13ae491 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/object-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/object-sizing-no-width-height-expected.png
index 3ef58f19..14410d01 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/object-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/custom/object-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/dom/css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/dom/css-transforms-expected.png
index 4ee20438..49362e6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/dom/css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/dom/css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
index a2d3435..5af84e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
index f39d18f..0aa8c795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
index a2d3435..5af84e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
index f39d18f..0aa8c795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/hixie/mixed/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/hixie/mixed/003-expected.png
index 99936fa..abab369 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/hixie/mixed/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/hixie/mixed/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/text/ligature-queries-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/text/ligature-queries-expected.png
index 7a800d9..22835bf3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/text/ligature-queries-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/text/ligature-queries-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/wicd/test-scalable-background-image1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/wicd/test-scalable-background-image1-expected.png
index c52eba4a..f218be7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/wicd/test-scalable-background-image1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/wicd/test-scalable-background-image1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-hixie-mixed-008-expected.png
index 86b674d..e8bc6fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-mask-with-percentages-expected.png
index 85f4d020..bfe2174 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-mask-with-percentages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-svg-float-border-padding-expected.png
index 383160b..056d357 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/page/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/text/zoom-svg-float-border-padding-expected.png
index 9fe7320e..ee8ab11c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/text/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/svg/zoom/text/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1055-1-expected.png
index e15e925..a02654da 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1055-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1055-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-1-expected.png
index f611a15..8bd46b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-3-expected.png
index 6254a0e2..1edf0f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug113235-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1188-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1188-expected.png
index 9134631..8c7e192 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug12384-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug12384-expected.png
index b9c94603..d1c793d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug12384-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug12384-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1302-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1302-expected.png
index c5b37af..bfd0fe3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1302-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug1302-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug18359-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug18359-expected.png
index 0188466..aed43fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug18359-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug18359-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug2479-3-expected.png
index 974f0a0..eaba90d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug2479-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug2479-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug27038-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug27038-2-expected.png
index 2cd61bb..7fd5809 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug27038-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug27038-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug28928-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug28928-expected.png
index 2d5dcce..2a5cb23 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug28928-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug28928-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug30692-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug30692-expected.png
index 53f1f51a..ffe64b8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug30692-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug30692-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug32205-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug32205-2-expected.png
index 1696070..d8cc50e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug32205-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug32205-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug39209-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug39209-expected.png
index d5de551..b004017b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug39209-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug39209-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug3977-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug3977-expected.png
index 0b4cf5f..7fed0b7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug3977-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug3977-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug4429-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug4429-expected.png
index a6b7eb1d..1795162 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug4429-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug4429-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug44505-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug44505-expected.png
index ee945aa..6092cbc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug44505-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug44505-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug51037-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug51037-expected.png
index 92de00f..f78332c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug51037-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug51037-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug5835-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug5835-expected.png
index 3057099..77288e4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug5835-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug5835-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug59354-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug59354-expected.png
index ec7d246d..b60de300 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug59354-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug59354-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug60749-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug60749-expected.png
index 46f875e..b450e12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug60749-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug60749-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-1-expected.png
index 4a5cf93..bb315e0a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-2-expected.png
index 4cbc43b..26e2d2e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7112-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7342-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7342-expected.png
index 960cf5e..e5d2911 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7342-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug7342-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug92647-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug92647-2-expected.png
index f4a7f525..d6493590 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug92647-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/bugs/bug92647-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/bloomberg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/bloomberg-expected.png
index 5e225ec..32371a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/bloomberg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/bloomberg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/col_widths_fix_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/col_widths_fix_fixPer-expected.png
index cc6abfb2..c921b4e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/col_widths_fix_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/col_widths_fix_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/margins-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/margins-expected.png
index 61c8aa4..3f172bcb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/margins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/margins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/row_span-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/row_span-expected.png
index 5e6d5a89..cb26187 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/row_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/core/row_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/dom/tableDom-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/dom/tableDom-expected.png
index bf4bb31..97438c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/dom/tableDom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/dom/tableDom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
index 53ffef1..0d0482e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
index 53ffef1..0d0482e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
index 6290e902..6fb7127 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
index 6290e902..6fb7127 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
index 9e3a3842..731f434 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
index 9e3a3842..731f434 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
index 6290e902..6fb7127 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
index 6290e902..6fb7127 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/nestedTables-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/nestedTables-expected.png
index 7427ead1..6b7dc96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/nestedTables-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/nestedTables-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test3-expected.png
index d38a695c..ae20f211 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test6-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test6-expected.png
index 9ab8ade2..5468b6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/test6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_thtd_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
index a6c879a..3b176de0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_tr_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_tr_align-expected.png
index 6244e50..1c3c7392 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_tr_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla/other/wa_table_tr_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug10216-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug10216-expected.png
index 0502f55..e38d1db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug10216-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug10216-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
index e47450d..708e772 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug22122-expected.png
index 0dddb41..66b99ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug22122-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug22122-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
index 7bf69e64..7d34a150 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
index 9df6ecae..cc4a1d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
index f191cd0..35335f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
index 1f7f068..505d9fa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/backgrounds-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/backgrounds-expected.png
index cf870184..399ae7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/backgrounds-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/backgrounds-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/col_span2-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/col_span2-expected.png
index f99e0ec..84f81394 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/col_span2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/col_span2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/columns-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/columns-expected.png
index 5fca26e0..27dc2192 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/columns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/columns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/conflicts-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/conflicts-expected.png
index effd47d65..57643891 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/conflicts-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/core/conflicts-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index 7ef0c15..d2fec69c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/empty_cells-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/empty_cells-expected.png
index 64b1d30..0c5f7ea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/empty_cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/empty_cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/test4-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/test4-expected.png
index 45886f02..a9a5805 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/test4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/tables/mozilla_expected_failures/other/test4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/hindi-rotated-expected.png
index a42698bd..6cfbd89 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/zoom-menulist-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/zoom-menulist-expected.png
index 0d6534f..8b7acbd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/zoom-menulist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/2d/zoom-menulist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/transformed-focused-text-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/transformed-focused-text-input-expected.png
index 61024d2..2b1a61d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/transformed-focused-text-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/transforms/transformed-focused-text-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png
new file mode 100644
index 0000000..74c963d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/change-text-content-and-background-color-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac-mac10.9/paint/invalidation/details-open-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt
new file mode 100644
index 0000000..eb75d96
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [138, 11, 117, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 117, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [138, 11, 40, 13],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 11, 40, 13],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
new file mode 100644
index 0000000..f9e7a71a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt
new file mode 100644
index 0000000..c9f65f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [12, 45, 105, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [12, 45, 54, 13],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'some text'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt
new file mode 100644
index 0000000..7017d91
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 117, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 11, 26, 13],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div'",
+          "rect": [8, 288, 10, 20],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
new file mode 100644
index 0000000..bb07880
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index 70526b2..9359ecf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index 8aa12313a2..48b3e60 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index 171ce34..918f68f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-mac10.9/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/001-expected.png
index 188cfa87d..dcc83f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/checkbox/checkbox-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/checkbox/checkbox-appearance-basic-expected.png
index 3c126cd..7c1328c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/checkbox/checkbox-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/checkbox/checkbox-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-appearance-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-appearance-height-expected.png
index e88ecaa..b2d1e9e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-appearance-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-appearance-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-value-expected.png
index faed5bf1..aac5ba1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/radio/radio-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/radio/radio-appearance-basic-expected.png
index 740c4614..7457aad1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/radio/radio-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac-retina/fast/forms/radio/radio-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-added-filters-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
index 13ce80d..cbbb920 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-removed-filters-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-removed-filters-expected.png
index 42dec872..5b568110 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-removed-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/masks/mask-with-removed-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index 1df2487..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index e2df93d8..47ca47e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-filter-expected.png
index f8537de8..e8b2ead8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-small-content-rect-expected.png
index 0b6a76c35..6506a6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/nested-border-radius-clipping-expected.png
index 5c79f85..8c6cf76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scaled-mask-expected.png
index 060bfe9..a1d21a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/tiled-mask-expected.png
index 496f182..233ef91e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed-expected.png
index f3f6cd5..cd6d214b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed2-expected.png
index 5528a7a..9517ed2a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/nested-reflection-transformed2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/reflection-in-composited-expected.png b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/reflection-in-composited-expected.png
index 24ddc8f..349bd305 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/reflection-in-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/compositing/reflections/reflection-in-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/comments-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/comments-expected.png
index 145b5f17..4d4b3183 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/comments-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/comments-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/containment-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/containment-expected.png
index 951e0c5f..cf7690b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/containment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/containment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/contextual_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/contextual_selectors-expected.png
index 6dd0292..296b86f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/contextual_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/contextual_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/grouping-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/grouping-expected.png
index a060060..815ca1b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/grouping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/grouping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/id_as_selector-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/id_as_selector-expected.png
index 3652450..fb05b5d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/id_as_selector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/id_as_selector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/inheritance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/inheritance-expected.png
index 4b9035cd..2695759 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/basic/inheritance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/basic/inheritance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border-expected.png
index 94eb361d..7a82a39f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom-expected.png
index f551730..28226390 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_inline-expected.png
index 4bc6c15..dd0b7c03 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width-expected.png
index be575fd..2c0ae987 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width_inline-expected.png
index 55a8c2a..45748e41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_bottom_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color-expected.png
index 173261c..ea70e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color_inline-expected.png
index 61ccab45..84ea7cd1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_color_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_inline-expected.png
index 25f2b39..9c30b54 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left-expected.png
index 36cd1e6..49c5db4b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_inline-expected.png
index 1013599a..7e06c536 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width-expected.png
index d0bb2ec..a7f16f4f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width_inline-expected.png
index faa40ee..3dfcb8c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_left_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right-expected.png
index ef5633b..a6fedfcc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_inline-expected.png
index 042d9c4..6c38aa80 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width-expected.png
index a87a113..6dfad2e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width_inline-expected.png
index a3378f29..74e3c31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_right_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style-expected.png
index 8dc4614..41956c2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style_inline-expected.png
index b36038df..46e72554 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_style_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top-expected.png
index 306ca8e..5ab0d7f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_inline-expected.png
index 2e08466..f5a56fc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width-expected.png
index 32b7d48..9ac5195 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width_inline-expected.png
index c435e7a..90ecb520 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_top_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width-expected.png
index 3a3707c..be5e380 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width_inline-expected.png
index b2e2bfd..563a0f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/border_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear-expected.png
index a3c72fe..d03fe6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.png
index f6cfc6b6..52355278 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/clear_float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float-expected.png
index d085e39..25038d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_elements_in_series-expected.png
index d2a21472..b97c34f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.png
index f3f49c4..d4855ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.png
index db010409..a2bbe7d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/float_on_text_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/height-expected.png
index ee376cd..158b3378 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin-expected.png
index 8bf2a12..a1e3b24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom-expected.png
index 7d01553..b1d0159 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom_inline-expected.png
index 92df0cb4..48e080c4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_inline-expected.png
index 184b12a..797867d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left-expected.png
index 672301f..d494fe0a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left_inline-expected.png
index c059323b..4f4107d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.png
index 87580cc..df08795a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right_inline-expected.png
index be61964..f46ee83 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top-expected.png
index e1a4a827..75d9e7f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top_inline-expected.png
index ec069c5..43932a1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/margin_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding-expected.png
index 7fed779..d2fd48ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom-expected.png
index c9c5a5c..ee2a1e2d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom_inline-expected.png
index 97478515..9c99f51 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_inline-expected.png
index 532f99c5..e9f76ca6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left-expected.png
index b51eac35..2004b601 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left_inline-expected.png
index 4135853..0ab7804 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.png
index 6e47ca4..d3dd1ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right_inline-expected.png
index 70ef87ea..fe2d1ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.png
index 88683b12..060c3e8a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top_inline-expected.png
index f10d72e..aab74a1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/padding_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/width-expected.png
index 30c23e4..2981ad5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/box_properties/width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.png
index 9b28530..ef645017 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/important-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/important-expected.png
index e257e25..b11aa90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/important-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/cascade/important-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/display-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/display-expected.png
index 00f2d8c..55c1ccd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/display-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style-expected.png
index 88c262c9..49fc1be 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_image-expected.png
index a81d13c..eeccd98 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_position-expected.png
index f7390b1b..c1c8f95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_type-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_type-expected.png
index 91627e5..2c26b31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/list_style_type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/white_space-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/white_space-expected.png
index aea62c6..9c6003a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/classification/white_space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/classification/white_space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background-expected.png
index 1b759758..6665d96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.png
index 94fdbd8..60fc7d1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_color-expected.png
index ca95af25..f4488f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_image-expected.png
index 96a2354..93cf295d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_position-expected.png
index 448c493..b7b29e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.png
index 2668ff57..71b3aa0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/background_repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/color-expected.png
index f523ba5..7a3efb8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/color_and_background/color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.png
index c746332a..73638e99 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_family-expected.png
index 163dc13..63c5071 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_size-expected.png
index e94be99d..b65e3ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_style-expected.png
index cfd5cc93..eb2d611 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_variant-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_variant-expected.png
index fcaca8d..3789b3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_variant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_variant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_weight-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_weight-expected.png
index dc02011..eef1fe91 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_weight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/font_properties/font_weight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/canvas-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/canvas-expected.png
index b753d46..5fd0454 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/floating_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/floating_elements-expected.png
index 9ae0f7f..a3b97f7c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/floating_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/floating_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.png
index 64ea1ae4..c3de95d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/inline_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/inline_elements-expected.png
index 7e10bd3..9b450f49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/inline_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/inline_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.png
index d58afab..f0bfa1e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.png
index c165859..3847ef8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/anchor-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/anchor-expected.png
index 8ed43425..00748e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/anchor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/anchor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstletter-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstletter-expected.png
index b9848ef..b653366 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstletter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstletter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstline-expected.png
index c1bd0e6..2cfdf0a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/multiple_pseudo_elements-expected.png
index cf5196d6..6598c92 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/pseudo_elements_in_selectors-expected.png
index ff74f0b..fa804307 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/pseudo_elements_in_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/letter_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/letter_spacing-expected.png
index ae6582b..a1516f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/letter_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/letter_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/line_height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/line_height-expected.png
index 71d7fe9..fefc70f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/line_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/line_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_align-expected.png
index 9ea2f251..55da9bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_decoration-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_decoration-expected.png
index 7f303415..5ee58d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_decoration-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_decoration-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_indent-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_indent-expected.png
index ffd9e7ac..1eb345f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_indent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_indent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.png
index b97dad31c..5237cb63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.png
index 27722de..220af9b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/word_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/word_spacing-expected.png
index 8d839b1..f6f62f63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/word_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/text_properties/word_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/units/color_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/units/color_units-expected.png
index aae8d8f..a786e8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/units/color_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/units/color_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/units/length_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/units/length_units-expected.png
index 3b91729..2662f69b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/units/length_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/units/length_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/units/percentage_units-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/units/percentage_units-expected.png
index 9ed31a32..26afa66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/units/percentage_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/units/percentage_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/units/urls-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css1/units/urls-expected.png
index 0c8d0940..23821fa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css1/units/urls-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css1/units/urls-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/margin-applies-to-010-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/margin-applies-to-010-expected.png
index c26c38f6..b6fa1b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/margin-applies-to-010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/margin-applies-to-010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-elements-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-elements-001-expected.png
index 23bbd2b3..f6ce62ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-elements-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-elements-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
index a157af22..befa5ff5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
index 1bf7707..7338a9ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0505-c16-descendant-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0505-c16-descendant-01-e-expected.png
index 08810c2..d8a4219 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0505-c16-descendant-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0505-c16-descendant-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t050803-c14-classes-00-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t050803-c14-classes-00-e-expected.png
index d64d537b..213f279 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t050803-c14-classes-00-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t050803-c14-classes-00-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0509-c15-ids-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0509-c15-ids-01-e-expected.png
index ad35254..cd6f7ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0509-c15-ids-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0509-c15-ids-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5517-brdr-s-00-c-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5517-brdr-s-00-c-expected.png
index be4ca3d..74059e1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5517-brdr-s-00-c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5517-brdr-s-00-c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5518-brdr-t-01-e-expected.png
index 485eecc..2cbd0aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5518-brdr-t-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5518-brdr-t-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5519-brdr-r-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5519-brdr-r-02-e-expected.png
index e127a7c..e023f76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5519-brdr-r-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5519-brdr-r-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5520-brdr-b-01-e-expected.png
index 9b684f4..4cc9ee2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5520-brdr-b-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5520-brdr-b-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5521-brdr-l-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5521-brdr-l-02-e-expected.png
index c09f120f..56f4da08 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5521-brdr-l-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5521-brdr-l-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5522-brdr-00-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5522-brdr-00-b-expected.png
index b12cb5c5..e23fd01 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5522-brdr-00-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t0805-c5522-brdr-00-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c563-list-type-00-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c563-list-type-00-b-expected.png
index c734649..371e4fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c563-list-type-00-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c563-list-type-00-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c564-list-img-00-b-g-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c564-list-img-00-b-g-expected.png
index c926dea..8adf484 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c564-list-img-00-b-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t1205-c564-list-img-00-b-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.png
index 0188908c9..2ad568e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-03-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-93-d-expected.png
index accfb2e..3b99795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-93-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css2.1/t170602-bdr-conflct-w-93-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
index 0a3a969..f4a5a7f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-image-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-image-svg-expected.png
index 3bd939d..e6d180f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-image-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/blending/background-blend-mode-image-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/css3-modsel-33-expected.png
index 351c2e69..b261a494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
index d624c56..4aff4f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
index d624c56..4aff4f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/flexbox/button-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/flexbox/button-expected.png
index 772b5c66..759f7cc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/flexbox/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/flexbox/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/clip-path-inset-corners-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/clip-path-inset-corners-expected.png
index c8680e41..c90b07a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/clip-path-inset-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/clip-path-inset-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-luminance-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-luminance-svg-expected.png
index 385022e..1b9a5dd8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-luminance-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-luminance-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-repeat-space-content-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-repeat-space-content-expected.png
index ec76a544..0310403 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-repeat-space-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/masking/mask-repeat-space-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-1-expected.png
index 776e1db..70c1c26 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-13-expected.png
index 44cdfbcc..1cb27f7b2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-15-expected.png
index 6cfe6639..1daaf217 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-161-expected.png
index 672bb52..0fb5873 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-22-expected.png
index 50e83a7d..4bc19cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-23-expected.png
index bf851fc..e4f3b43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-24-expected.png
index 5e162df..38a64dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28-expected.png
index 7d154100..86cbd73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28b-expected.png
index 12961be4..83bd978 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29-expected.png
index 565ec6f1..f3fd9af 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29b-expected.png
index 57e1f81c..37a0a12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-32-expected.png
index 0b0bc0a..e45cd7d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-33-expected.png
index 351c2e69..b261a494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-3a-expected.png
index 52315b63..b2e6d4f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-68-expected.png
index 5e162df..38a64dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-69-expected.png
index bf851fc..e4f3b43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73-expected.png
index 7dee06e96..3a765ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73b-expected.png
index 7dee06e96..3a765ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74-expected.png
index fb5684a..8129bab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74b-expected.png
index fb5684a..8129bab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/html/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-1-expected.png
index 776e1db..70c1c26 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-13-expected.png
index 44cdfbcc..1cb27f7b2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-15-expected.png
index 6cfe6639..1daaf217 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-161-expected.png
index 672bb52..0fb5873 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-22-expected.png
index 50e83a7d..4bc19cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-23-expected.png
index bf851fc..e4f3b43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-24-expected.png
index 5e162df..38a64dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28-expected.png
index 7d154100..86cbd73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28b-expected.png
index 12961be4..83bd978 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29-expected.png
index 565ec6f1..f3fd9af 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29b-expected.png
index 57e1f81c..37a0a12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3-expected.png
index d44ffa4..647f25c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-32-expected.png
index 0b0bc0a..e45cd7d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-33-expected.png
index 351c2e69..b261a494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3a-expected.png
index 52315b63..b2e6d4f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-68-expected.png
index 5e162df..38a64dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-69-expected.png
index bf851fc..e4f3b43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73-expected.png
index 7dee06e96..3a765ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73b-expected.png
index 7dee06e96..3a765ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74-expected.png
index fb5684a..8129bab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74b-expected.png
index fb5684a..8129bab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xhtml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-1-expected.png
index 7a89028..59332fa2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-13-expected.png
index 61818ff..0b3ffe3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-15-expected.png
index be3aa3f7..ffcaf22 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-161-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-161-expected.png
index 12664ac..4f27ed48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-161-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-161-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-22-expected.png
index 3950dd5..82c43347 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-23-expected.png
index 34cfc35..2243af2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-24-expected.png
index 93ec487..0599b3ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28-expected.png
index 746f69c..cbcd33cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28b-expected.png
index ba6ace4..e98bc78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29-expected.png
index 051c9f51..797bb7c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29b-expected.png
index 2d248b0..f2f68ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3-expected.png
index 7a3c3d2..a2a04a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-32-expected.png
index 0614da4..cf6c8cc6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-33-expected.png
index 184b6ea0..1888b13 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3a-expected.png
index 48774dc..7390fa48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-68-expected.png
index 93ec487..0599b3ed 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-69-expected.png
index 34cfc35..2243af2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73-expected.png
index dc83f0b..b73dc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73b-expected.png
index dc83f0b..b73dc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74-expected.png
index ada3f760..a77b957 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74b-expected.png
index ada3f760..a77b957 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/css3/selectors3/xml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-001-expected.png
index e1e9341..9fcd8d4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-002-expected.png
index e1e9341..9fcd8d4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-003-expected.png
index b2fb271..0eee5f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-004-expected.png
index 6485691..f4e5f22 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-005-expected.png
index 2211d8f4..898c0d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-007-expected.png
index ea4f9723..da369fde 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-010-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-010-expected.png
index 228f2fc4..9d1f657 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-011-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-011-expected.png
index 79a34c9b..3a4c605 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-011-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-011-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-012-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-012-expected.png
index e1e9341..9fcd8d4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-012-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-012-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-014-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-014-expected.png
index 658bf5aa..d9e0cfc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-015-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-015-expected.png
index 6bd42795..786d8fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-expected.png
index 98eb4cdc..f6dd67c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-position-expected.png
index 2e164c6..d94f22d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/caret/caret-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/4922367-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/4922367-expected.png
index 260153e..c83b99e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/4922367-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/4922367-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5099303-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5099303-expected.png
index 4d814b7..ca18ee8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5099303-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5099303-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5126166-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5126166-expected.png
index 11e4059..0f61e648 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5126166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5126166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5144139-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5144139-2-expected.png
index 19f549d..e455f0d1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5144139-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5144139-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5206311-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5206311-1-expected.png
index 82f96942..ed2d4c83 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5206311-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5206311-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5272440-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5272440-expected.png
index 4a1164f..45e2f8ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5272440-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5272440-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5369009-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5369009-expected.png
index 44a20f90..746cdba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5369009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5369009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5433862-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5433862-2-expected.png
index 9077eddb..76607a70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5433862-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5433862-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5483370-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5483370-expected.png
index accf8c6..ccd0526 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5483370-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/5483370-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-at-paragraph-boundaries-011-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-at-paragraph-boundaries-011-expected.png
index 7d5d476..eec2c9d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-at-paragraph-boundaries-011-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-at-paragraph-boundaries-011-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-block-merge-contents-010-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-block-merge-contents-010-expected.png
index d2ab67a..eb796c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-block-merge-contents-010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-block-merge-contents-010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-br-013-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-br-013-expected.png
index 4bbe8c31a..8e4669dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-br-013-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-br-013-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-015-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-015-expected.png
index 3f22952..f6a3c3cc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-016-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-016-expected.png
index 93ff00c..7135b5a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-017-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-017-expected.png
index a3c206e7..33f49c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-017-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/delete-line-017-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-different-styles-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-different-styles-expected.png
index 60a5829e..9ff4189c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-different-styles-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-different-styles-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-endOfParagraph-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-endOfParagraph-expected.png
index d7fd3966..8d4dded 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-endOfParagraph-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-endOfParagraph-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-no-br-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-no-br-expected.png
index 15980f3..2a5b4d8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-no-br-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-no-br-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-whitespace-pre-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-whitespace-pre-expected.png
index 4d0a350..a17e419 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-whitespace-pre-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/merge-whitespace-pre-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/table-cells-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/table-cells-expected.png
index d8f15c56..8617c08 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/table-cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/table-cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/type-delete-after-quote-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/type-delete-after-quote-expected.png
index 798f7d05..2cc52f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/type-delete-after-quote-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/deleting/type-delete-after-quote-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-1-expected.png
index 9bc6e9b..ff37e67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-2-expected.png
index 24120fce5..7d702fc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4580583-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4747450-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4747450-expected.png
index e856d3a..c3ce343 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4747450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4747450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4916541-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4916541-expected.png
index 3749cae..460062f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4916541-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/4916541-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5136770-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5136770-expected.png
index 617a5f9..d6b25f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5136770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5136770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5138441-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5138441-expected.png
index 4d42e1a70..20bc1faa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5138441-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5138441-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5142012-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5142012-1-expected.png
index b820d16..bd9d58dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5142012-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5142012-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5481523-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5481523-expected.png
index 05f5a2c..1e3ec60 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5481523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5481523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5569741-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5569741-expected.png
index ec5e7b73..6a7332b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5569741-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/5569741-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/format-block-with-trailing-br-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/format-block-with-trailing-br-expected.png
index 92f01c0f..7b41251 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/format-block-with-trailing-br-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/format-block-with-trailing-br-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/insertImage-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/insertImage-expected.png
index f4d1709..33528c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/insertImage-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/insertImage-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/remove-list-from-range-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/remove-list-from-range-selection-expected.png
index fd9382e..e01fa05 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/remove-list-from-range-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/execCommand/remove-list-from-range-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-at-the-edge-of-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-at-the-edge-of-contenteditable-expected.png
index b7e33998..dae3d03 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-at-the-edge-of-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-at-the-edge-of-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-read-only-after-editable-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-read-only-after-editable-expected.png
index bb30d893..38a6e7a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-read-only-after-editable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/caret-read-only-after-editable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/emacs-ctrl-o-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/input/emacs-ctrl-o-expected.png
index 68414a6..a7ae2a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/emacs-ctrl-o-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/emacs-ctrl-o-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
index 44236cc..0159f55 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.png
index 1fcf555..67f910f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/input/reveal-caret-of-multiline-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4278698-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4278698-expected.png
index db20e19..320e864 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4278698-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4278698-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4840662-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4840662-expected.png
index 425c125a..0e6197a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4840662-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4840662-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-1-expected.png
index 35efc851..5eaddbc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-2-expected.png
index 3b3d90da..66050d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4875189-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4959067-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4959067-expected.png
index 7a01d608..55f383b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4959067-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4959067-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-1-expected.png
index 25a6fab1..7611cb42 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-2-expected.png
index d0307f93..fef154453 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/4960120-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5002441-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5002441-expected.png
index b1a7e24..bf517a1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5002441-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5002441-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-1-expected.png
index c0013ee..4c4a0a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-2-expected.png
index c8c96df..933d426 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5058163-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5156401-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5156401-2-expected.png
index a92f8db..0afdb7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5156401-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5156401-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5418891-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5418891-expected.png
index 3d42cd86..a8f1e7e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5418891-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5418891-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5510537-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5510537-expected.png
index 89360f9..4f5f077 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5510537-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5510537-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-2-expected.png
index d0400ee3..6c1b2fe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-3-expected.png
index e14f1a3..6ff72e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/5549929-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/6703873-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/6703873-expected.png
index 60a21c24..814a96b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/6703873-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/6703873-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/break-blockquote-after-delete-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/break-blockquote-after-delete-expected.png
index f01f5881..509d5af 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/break-blockquote-after-delete-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/break-blockquote-after-delete-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-3800346-fix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-3800346-fix-expected.png
index 8d3ab57..d584a66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-3800346-fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-3800346-fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-001-expected.png
index 33dfbb5..7b08131 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-002-expected.png
index 33dfbb5..7b08131 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-003-expected.png
index d2d1edd..f3a7d768 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-004-expected.png
index d2d1edd..f3a7d768 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-005-expected.png
index 33dfbb5..7b08131 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-006-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-006-expected.png
index 1eadeba..c1bfd16 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-br-quoted-006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-space-in-empty-doc-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-space-in-empty-doc-expected.png
index a95e939..d8205ee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-space-in-empty-doc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-space-in-empty-doc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-001-expected.png
index ec85c0f..233ed33 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-002-expected.png
index 0eacbde..64e74769 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-003-expected.png
index f8c22d6..a8cde6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/insert-text-at-tabspan-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/line-break-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/line-break-expected.png
index 4306553..0f6c869 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/line-break-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/line-break-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-1-expected.png
index 4cefc4e32..82fd2626 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-2-expected.png
index ffe0287..ba41f03 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/inserting/paragraph-separator-in-table-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4631972-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4631972-expected.png
index 6a52574..5268ca3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4631972-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4631972-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4806874-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4806874-expected.png
index a4f873c..5ac369c9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4806874-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4806874-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4947130-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4947130-expected.png
index 6024ca4..96e4d0e8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4947130-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/4947130-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.png
index a023d609..695afb3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5006779-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5032095-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5032095-expected.png
index d568b79..ef03e0ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5032095-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5032095-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-2-expected.png
index ff404b0..97456ee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-expected.png
index a0b117fe..fff3f8d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5071074-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5134759-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5134759-expected.png
index 90dad3a..11e592b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5134759-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5134759-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5156401-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5156401-1-expected.png
index 022c99f..84b902f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5156401-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5156401-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5478250-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5478250-expected.png
index 197edb4..7da0e90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5478250-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5478250-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5601583-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5601583-1-expected.png
index d6dc026..09139ef4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5601583-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/5601583-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/bad-placeholder-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/bad-placeholder-expected.png
index c33cfd8..e11b959 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/bad-placeholder-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/bad-placeholder-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/copy-standalone-image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/copy-standalone-image-expected.png
index 950de07f..a8bbc147 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/copy-standalone-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/copy-standalone-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
index 98c8a0527..4d39ffb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drop-text-without-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drop-text-without-selection-expected.png
index 0d23893..c66cb319 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drop-text-without-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/drop-text-without-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-cntl-y-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-cntl-y-001-expected.png
index d4e7c759..b268c4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-cntl-y-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-cntl-y-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-ctrl-k-y-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-ctrl-k-y-001-expected.png
index 52f9986..0df0086 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-ctrl-k-y-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/emacs-ctrl-k-y-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.png
index be392e9..1068ed3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/innerText-inline-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/input-field-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/input-field-1-expected.png
index b6cb024..abc35cbad 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/input-field-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/input-field-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-blockquote-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-blockquote-expected.png
index 8f7e36d..737495e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-blockquote-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-blockquote-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-list-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-list-expected.png
index d0fe285..ed8af9b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-list-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/merge-start-list-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-after-blockquote-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
index 425996f0..5ff9c834 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-after-blockquote-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-4-expected.png
index bea6cf7..04fa114 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-001-expected.png
index 889a00b..f06ddd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-002-expected.png
index 889a00b..f06ddd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-003-expected.png
index 889a00b..f06ddd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-004-expected.png
index 889a00b..f06ddd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-005-expected.png
index 889a00b..f06ddd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-line-endings-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-at-tabspan-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-at-tabspan-003-expected.png
index b51681d7..48ae28c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-at-tabspan-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/paste-text-at-tabspan-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-object-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-object-expected.png
index 41dfc6f..3b69247 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-object-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-object-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-tabs-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-tabs-expected.png
index a62ba40b..eae28bec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-tabs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/pasting-tabs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/quirks-mode-br-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/quirks-mode-br-1-expected.png
index 5b616f5..185b6f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/quirks-mode-br-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/quirks-mode-br-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/styled-element-markup-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/styled-element-markup-expected.png
index 1c2a19f..ee2f69b5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/styled-element-markup-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/pasteboard/styled-element-markup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/3690719-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/3690719-expected.png
index 4fe885f..d4d431b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/3690719-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/3690719-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/4402375-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/4402375-expected.png
index 20faca7d..23cc941 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/4402375-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/4402375-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5099303-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5099303-expected.png
index f6cdff8..b442c07b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5099303-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5099303-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-1-expected.png
index 88b5d3d..61a7ca4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-2-expected.png
index 42e07aa..4c5ee5c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-3-expected.png
index 923d27a..1b091bf1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-4-expected.png
index fe3df48..336768e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5131716-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5195166-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5195166-2-expected.png
index 72841b0a..89fa2d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5195166-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/5195166-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/6476-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/6476-expected.png
index 3d78151..45cb966 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/6476-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/6476-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-expected.png
index eb120b76..9977631f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-left-expected.png
index 9fb692b..c7a38ecb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-2-left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-expected.png
index 54d8a5b..accb6cdc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-right-expected.png
index 021c8be..1354eac1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-ltr-right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-expected.png
index 7de2e49..935d151 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-left-expected.png
index 146beec..298c825 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-2-left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-expected.png
index 93a34b5..6c9b44c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-right-expected.png
index d51c16e..b84b970 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/caret-rtl-right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/click-start-of-line-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/click-start-of-line-expected.png
index f0f1b40..3476701 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/click-start-of-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/click-start-of-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contains-boundaries-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contains-boundaries-expected.png
index cfb2592..f55c067 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contains-boundaries-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contains-boundaries-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contenteditable-click-inside-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contenteditable-click-inside-expected.png
index f7e64a3..bdc8fb0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contenteditable-click-inside-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/contenteditable-click-inside-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-select-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-select-1-expected.png
index 4a15a75..4574c3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-select-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-select-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-to-contenteditable-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-to-contenteditable-iframe-expected.png
index e28adbd..4887a8c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-to-contenteditable-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/drag-to-contenteditable-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections-expected.png
index aeccab0..fa7e7e92 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections2-expected.png
index 13c13dd..8078d89 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/expanding-selections2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-by-sentence-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-by-sentence-001-expected.png
index c276b3d..ca5af96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-by-sentence-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-by-sentence-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-backward-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-backward-expected.png
index 3e54bc9e..77c895bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-backward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-backward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-forward-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-forward-expected.png
index 539008f..2e4aa82 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-forward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-inside-transforms-forward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-selection-bidi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-selection-bidi-expected.png
index 300631f..21ca933b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-selection-bidi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/extend-selection-bidi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/leave-requested-block-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/leave-requested-block-expected.png
index 0fc477e9..55d1e65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/leave-requested-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/leave-requested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-4-expected.png
index 83c7326f..929469e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-5-expected.png
index e1aadc85..f5b2749 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-6-expected.png
index 0e14c34..8704d74 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-7-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-7-expected.png
index 5bd0fe3..6408625c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-7-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-7-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-8-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-8-expected.png
index 3a2cb3e5..ee4cd7d9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-9-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-9-expected.png
index 4f58eba..5581f95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/mixed-editability-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-backwords-by-word-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-backwords-by-word-001-expected.png
index 6ae4e95..7f7b19e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-backwords-by-word-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-backwords-by-word-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-line-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-line-002-expected.png
index abe449b..ffdb3ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-line-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-line-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-sentence-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-sentence-001-expected.png
index f2681bd..3dbc5d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-sentence-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-sentence-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-word-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-word-001-expected.png
index 2c3727b..0e8b26b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-word-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-by-word-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-past-trailing-space-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-past-trailing-space-expected.png
index de1868d..99b1abc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-past-trailing-space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/move-past-trailing-space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/previous-line-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/previous-line-position-expected.png
index 2b725d5..9b4cdf6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/previous-line-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/previous-line-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-1-expected.png
index dbc1e6b..e2a5acc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-2-expected.png
index 98a5323..b0fab023 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-3-expected.png
index b7b098d..9804c11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/replaced-boundaries-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-box-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-box-expected.png
index f5a8dd8a..3d0ffae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-element-paragraph-boundary-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-element-paragraph-boundary-expected.png
index 6091708..928017e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-element-paragraph-boundary-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-element-paragraph-boundary-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-missing-image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-missing-image-expected.png
index 511831d1..69f9e37e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-missing-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/select-missing-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNode-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNode-expected.png
index 95c5d20..694cb17c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNodeContents-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNodeContents-expected.png
index 70ee537c..eac15a8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNodeContents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selectNodeContents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selection-3748164-fix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selection-3748164-fix-expected.png
index f25c73b..0f89453 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selection-3748164-fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/selection-3748164-fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/transformed-selection-rects-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/transformed-selection-rects-expected.png
index 10c17fb..e98de65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/transformed-selection-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/transformed-selection-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.png
index 55f6a0c..e03d47a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/triple-click-in-pre-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-1-expected.png
index d8565b93..1e668a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-2-expected.png
index ecb7577..31a79da0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/selection/wrapped-line-caret-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-expected.png
index 349eb2a..ee7d269 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-hidpi-expected.png
index d88b30d..85276d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/grammar-markers-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-composited-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-composited-expected.png
index e0a6625..0b85794 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-expected.png
index e0a6625..0b85794 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline-spelling-markers-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline_spelling_markers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline_spelling_markers-expected.png
index 72afc0c..dc4b062 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline_spelling_markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/spelling/inline_spelling_markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/4916887-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/4916887-expected.png
index 979fdd09..729fbdf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/4916887-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/4916887-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5065910-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5065910-expected.png
index 5d77332..af86415 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5065910-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5065910-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5084241-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5084241-expected.png
index a496983f..042f4e57 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5084241-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5084241-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5228141-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5228141-expected.png
index bb2e7dd..ceff0a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5228141-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5228141-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5279521-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5279521-expected.png
index 3c6a77f..6920acc6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/5279521-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/5279521-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/block-styles-007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/block-styles-007-expected.png
index 2519544..ed8a459 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/block-styles-007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/block-styles-007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/highlight-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/highlight-expected.png
index aa27203c..fabdbc3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-boundary-005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-boundary-005-expected.png
index 92fa4fc..8afe3ec7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-boundary-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-boundary-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-001-expected.png
index d6ef56f..f83d2c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-003-expected.png
index 58d74271..6b61076 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-delete-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-after-expected.png
index 67c87af3..9beae4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-before-expected.png
index 4a5104a..3a211ea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/list-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-001-expected.png
index 7b184107..0d6d92e8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-002-expected.png
index 2431921..99992e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-003-expected.png
index e65be50..f46485b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-delete-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-after-expected.png
index 33698eb..fef9be15 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-before-expected.png
index 09abb54b..7124f1f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/unsupported-content/table-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt
new file mode 100644
index 0000000..baf644b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt

@@ -0,0 +1,41 @@
+This is a testharness.js-based test.
+PASS A step-start function on a keyframe affects the resulting style 
+PASS A steps(1, start) function on a keyframe affects the resulting style 
+PASS A steps(2, start) function on a keyframe affects the resulting style 
+PASS A step-end function on a keyframe affects the resulting style 
+PASS A steps(1) function on a keyframe affects the resulting style 
+PASS A steps(1, end) function on a keyframe affects the resulting style 
+PASS A steps(2, end) function on a keyframe affects the resulting style 
+PASS A linear function on a keyframe affects the resulting style 
+FAIL A ease function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 109.47963055884654 at 1100ms expected 109.47963055884654 +/- 0.01 but got 109.312
+PASS A ease-in function on a keyframe affects the resulting style 
+FAIL A ease-in-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 101.97224534417684 at 1100ms expected 101.97224534417684 +/- 0.01 but got 101.953
+FAIL A ease-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 116.05721544376388 at 1100ms expected 116.05721544376388 +/- 0.01 but got 116.078
+FAIL A easing function which produces values greater than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 171.60874310990272 at 1100ms expected 171.60874310990272 +/- 0.01 but got 172.219
+FAIL A easing function which produces values less than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 77.13128857063907 at 1100ms expected 77.13128857063907 +/- 0.01 but got 76.9531
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-start function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, start) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, start) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 0ms expected "50.3438px" but got "50px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-end function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1) function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, end) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, end) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 500ms expected "50.3438px" but got "50px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a linear function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "25.0938px" but got "25px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "41.875px" but got "41.8594px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "8.95312px" but got "9.32812px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "12.9375px" but got "12.875px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "38.0469px" but got "37.9688px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values greater than 1 does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "100px" but got "102.406px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values less than 1 does not alter the result 
+FAIL step-start easing with input progress greater than 1 assert_equals: expected "200px" but got "100px"
+PASS step-end easing with input progress greater than 1 
+FAIL step-end easing with input progress greater than 2 assert_equals: expected "200px" but got "100px"
+PASS step-start easing with input progress less than 0 
+FAIL step-start easing with input progress less than -1 assert_equals: expected "-100px" but got "0px"
+FAIL step-end easing with input progress less than 0 assert_equals: expected "-100px" but got "0px"
+FAIL cubic-bezier easing with input progress greater than 1 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress greater than 1 and where the tangent on the upper boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 and where the tangent on the lower boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-inherit-color-bug-expected.png
index 22873820..06e5271 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-inherit-color-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-inherit-color-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.png
index f194a1e..7bf1994 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-leakage-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-svg-scaling-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-svg-scaling-zoom-expected.png
index 1832dac..be0b714 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-svg-scaling-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/background-svg-scaling-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.png
index a925983..5a94fd4c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.png
index 08f83233..e0666f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/border-radius-split-background-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index b5ca6cb..f9f7479 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/selection-background-color-of-list-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/selection-background-color-of-list-style-expected.png
index cc4a614..3b610ec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/selection-background-color-of-list-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/backgrounds/selection-background-color-of-list-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/018-expected.png
index a99f36fc..ff73093 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/text-indent-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/text-indent-rtl-expected.png
index e597ae03..1b5dbb7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/text-indent-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/basic/text-indent-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/014-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/014-expected.png
index 29b98cb..ac3edc55 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/016-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/016-expected.png
index 263fb22e..ee9e80f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/025-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/025-expected.png
index dcbf5d4..da7912c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/025-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/025-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/026-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/026-expected.png
index b5479529..99717474 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/026-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/026-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/027-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/027-expected.png
index dcbf5d4..da7912c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/027-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/027-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/028-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/028-expected.png
index b5479529..99717474 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/028-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/028-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.png
index 912105a6..4bd985d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/float-avoidance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction-expected.png
index de6fb87..a4cda93 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction2-expected.png
index a5755ba..b94cba3b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/nopaint-after-layer-destruction2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.png
index 0c12e9a..7327d73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/table-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/table-relayout-expected.png
index 44321b5..acd828eb2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/table-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/table-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/width-update-after-clear-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/width-update-after-clear-expected.png
index 216b212..8f9eed1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/width-update-after-clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/width-update-after-clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/margin-collapse/empty-clear-blocks-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/margin-collapse/empty-clear-blocks-expected.png
index 1b4e84cf..d7e4c83ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/margin-collapse/empty-clear-blocks-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/margin-collapse/empty-clear-blocks-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
index 7dce5dc..09d57fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
index 0b0af53..8f1448d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-expected.png
index 9065a3c8..07a0fb1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
index 3eeb7cd..cf321d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
index f839ca77..02ff5ac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-expected.png
index 2b88070..b4a2739 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
index 5973543..4ed3618 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
index 2c474717..711e0dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/height-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/height-change-expected.png
index c9256a3..84ba7f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/relayout-on-position-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/relayout-on-position-change-expected.png
index d597d298..a46e2e48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/relayout-on-position-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/relayout-on-position-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/window-height-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/window-height-change-expected.png
index c8b2767..a44c20a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/window-height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/positioning/window-height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png
index 326df2e..58cdfd08 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-inner-bleed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-double-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-double-expected.png
index 39bfb47..0662003 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-double-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-expected.png
index 7939ae8..fdcbe588 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-constraints-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-inline-flow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-inline-flow-expected.png
index f81eba3..425b3c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-inline-flow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-inline-flow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-all-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-all-expected.png
index f31e43ee..58097c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-all-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-all-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-border-expected.png
index d13f3cb6..1dac38d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-expected.png
index e785c6e3..94ca96c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-padding-expected.png
index e7057918..3b91577c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-mask-expected.png
index 181e06d3..2fb83d2d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
index 64b7b1425..7193d5d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.png
index 9ebc121d..25524d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.png
index 6066275..7c9dd39 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-ratio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.png
index 7ac74a8..740383c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-mask-video-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-percent-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-percent-expected.png
index 43243a2..4c157b5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-percent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-percent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-split-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-split-inline-expected.png
index e0dcef8..198ae08 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-split-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-split-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
index dd51cdc..59ac19ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-radius-with-composited-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.png
index b18a277..ddaa1a07 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/border-styles-split-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/borderRadiusAllStylesAllCorners-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/borderRadiusAllStylesAllCorners-expected.png
index c785a5e..039dba9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/borderRadiusAllStylesAllCorners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/borderRadiusAllStylesAllCorners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/different-color-borders-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/different-color-borders-expected.png
index f095ee6..f9c3e69 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/different-color-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/different-color-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/outline-alpha-block-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/outline-alpha-block-expected.png
index 6675850..5f9f515 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/outline-alpha-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/outline-alpha-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-01-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-01-expected.png
index bf4de232..95dc0a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-01-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-02-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-02-expected.png
index 4073005..368f5252 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-02-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-03-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-03-expected.png
index 0b377b8..90ddeee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-03-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-04-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-04-expected.png
index 40b05eb9..d15579e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-04-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.png
index 6366cc8..c45dc458 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/borders/rtl-border-05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.png
index d09434a..c1697f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/basic-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/border-radius-big-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/border-radius-big-expected.png
index f86c100..4be55842 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/border-radius-big-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/border-radius-big-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/box-shadow-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/box-shadow-transformed-expected.png
index d9acc7f0..06b75446 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/box-shadow-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/box-shadow-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-expected.png
index 87ac2d499..b184bc5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-subpixel-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-subpixel-expected.png
index d311946..da6347e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-subpixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/inset-subpixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/spread-multiple-inset-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/spread-multiple-inset-expected.png
index a8e365c..04e2290 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/spread-multiple-inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/spread-multiple-inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/transform-fringing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/transform-fringing-expected.png
index b50eb47..95d9e7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/transform-fringing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/box-shadow/transform-fringing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-composite-expected.png
index 8526c95..f24e676 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-incremental-repaint-expected.png
index ea54f3b..ffc37f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/image-object-in-canvas-expected.png
index a02890c7..2d8c579 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.png
index eea64fb..85a2d1c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-clip-expected.png
index 304a4609..8d73f0b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.png
index 14442cf..850f785 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-combinations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.png
index 4bf08438..bab5f49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-parent-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-parent-expected.png
index 295dd0f..7895a95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-parent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-composited-parent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png
index 0d4742a..71090e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-fixed-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.png
index a91b9dd..c2b8abf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/clip/overflow-border-radius-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/009-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/009-expected.png
index 0922ed9..2dbf108ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/014-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/014-expected.png
index 440d3a48..e60a978 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/016-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/016-expected.png
index affb193..7b4c35b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/hover-style-change-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/hover-style-change-expected.png
index d2cb47a..ea66434 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/hover-style-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/hover-style-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-to-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-to-inline-expected.png
index 0840a62..a25c6908 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-to-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-to-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-with-before-expected.png
index 42c0d10..83cd1dd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-group-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-with-before-expected.png
index 42c0d10..83cd1dd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-row-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-with-before-expected.png
index 42c0d10..83cd1dd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css-generated-content/table-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/001-expected.png
index c695cb2..381163c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/acid2-pixel-expected.png
index 640c1fa..e2836b18 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.png
index edf9b1a..dfbe0a1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/background-shorthand-invalid-url-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/css3-modsel-22-expected.png
index 50e83a7d..4bc19cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/find-next-layer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/find-next-layer-expected.png
index 3377397..0340af4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/find-next-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/find-next-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/first-letter-detach-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/first-letter-detach-expected.png
index 5b4fd9fd..41ebb78b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/first-letter-detach-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/first-letter-detach-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-continuations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-continuations-expected.png
index ae5da56..78e335a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-continuations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-continuations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-detached-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-detached-expected.png
index b0d8184..99b15ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-detached-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-detached-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-multiline-writingmode-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-multiline-writingmode-vertical-expected.png
index e93588b..66e969a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-multiline-writingmode-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/focus-ring-multiline-writingmode-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/h1-in-section-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/h1-in-section-elements-expected.png
index 843ab4a..12a1c5e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/h1-in-section-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/h1-in-section-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/hover-subselector-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/hover-subselector-expected.png
index 437482f..ed5d4ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/hover-subselector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/hover-subselector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/ignore-empty-focus-ring-rects-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/ignore-empty-focus-ring-rects-expected.png
index 0c99e65..1dcb8177 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/ignore-empty-focus-ring-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/ignore-empty-focus-ring-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-default-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-default-expected.png
index 3b7a456..b92fd75c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-default-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-default-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
index 3998533..f5186bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
index 3998533..f5186bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-expected.png
index 6a53e5d0..eced3ea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/image-orientation/image-orientation-from-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/nested-rounded-corners-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/nested-rounded-corners-expected.png
index 2339ac1..205b74c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/nested-rounded-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/nested-rounded-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-empty-rects-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-empty-rects-expected.png
index adec3ccb..f300965 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-empty-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-empty-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-location-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-location-expected.png
index 59a6038..8b17892 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-location-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/outline-auto-location-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-expected.png
index 1688641..f8abb1e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-expected.png
index 74d05c22..b470b50 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-iframe-expected.png
index b02a128..5aefb3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/resize-corner-tracking-transformed-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/rtl-ordering-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/rtl-ordering-expected.png
index 57c2373..1c860a82 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/rtl-ordering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/rtl-ordering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/shadow-multiple-expected.png
index 2347688..45169b0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/transformed-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/transformed-mask-expected.png
index c365b5e..8be088f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/transformed-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/transformed-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css/universal-hover-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css/universal-hover-quirk-expected.png
index 73fe3b26..c6dac1ac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css/universal-hover-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css/universal-hover-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
index e07daec..f358b8c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
index cf57233b..57036e8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-non-draggable-link-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-non-draggable-link-expected.png
index 3f618cd..7c077df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-non-draggable-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dnd/link-dragging-non-draggable-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/001-expected.png
index b8cc3e8..d666d0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/002-expected.png
index 6949626..972c90e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/003-expected.png
index 3b9273f1..c93050c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/004-expected.png
index b8cc3e8..d666d0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/doctypes/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/34176-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/34176-expected.png
index 7493f91..0f6b718 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/52776-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/52776-expected.png
index 2d8a7c5..d7acffa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/52776-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/52776-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLElement/bdo-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLElement/bdo-expected.png
index 8e95073..9443deac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLElement/bdo-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLElement/bdo-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLInputElement/input-slider-update-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLInputElement/input-slider-update-expected.png
index e6fe8ed4..0362fc9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLInputElement/input-slider-update-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLInputElement/input-slider-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
index e77d966b..cc58c34d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
index b2a0f13..a1a19fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png
index 0a69a50..d22d96db3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-optimums-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
index 1daa71e..3743842 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
index 7599e1a..47a8cd0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/colSpan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/colSpan-expected.png
index ca01093..e987f4c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/colSpan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/colSpan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.png
index 9083f868..f7fc883 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/HTMLTableElement/createCaption-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/focus-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/focus-contenteditable-expected.png
index 90dca8e..09856129 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/focus-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/focus-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/row-inner-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/row-inner-text-expected.png
index f23e12d3..9f390f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dom/row-inner-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dom/row-inner-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/012-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/012-expected.png
index e780902..8c5ef4fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/012-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/012-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/015-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/015-expected.png
index 0b4065f..8ae1c22 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/selection-highlight-adjust-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/selection-highlight-adjust-expected.png
index 57c2601..bc3bc8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/selection-highlight-adjust-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/selection-highlight-adjust-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png
index d0799c58..13b7d02 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/invalid-UTF-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.png
index 5493c511..c00a2f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-big-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.png
index 5493c511..c00a2f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/encoding/utf-16-little-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/events/autoscroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/events/autoscroll-expected.png
index d41241d1..45c220f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/events/autoscroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/events/autoscroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/events/context-no-deselect-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/events/context-no-deselect-expected.png
index 07f8a78..2f08c7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/events/context-no-deselect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/events/context-no-deselect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/events/reveal-link-when-focused-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/events/reveal-link-when-focused-expected.png
index 9dca37c..ebc20de5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/events/reveal-link-when-focused-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/events/reveal-link-when-focused-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/001-expected.png
index b8591ba92..d2e76f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-default-title-expected.png
index 30c65d93..7f93e675 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-default-title-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-default-title-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-style-color-expected.png
index b42f93f..96e7a763 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button/button-inner-block-reuse-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button/button-inner-block-reuse-expected.png
index 37c7822..f566b05 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button/button-inner-block-reuse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/button/button-inner-block-reuse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index f87a77f..55c00d55 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index 0402c17..d144d62a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index 774c192..ed0aa99 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index a716aac..64fe145 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index a99e49d..b8d7cf5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index 07cca46..1714f8b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index 06dc79d7..763d988b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
index a7b85553..a90c4df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
index 1b031005..2473790 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-expected.png
index 8287cde2..16e2a32e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index 47bb722c..15ba4f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-expected.png
index 27b65a3..5425738 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index c7f6cc88..a926412 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/checkbox/checkbox-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/checkbox/checkbox-appearance-basic-expected.png
index c35ccd6c..5e4ab85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/checkbox/checkbox-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/checkbox/checkbox-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-expected.png
index bd700c3c..22cdd2f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index 0a77545..03c974aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
index 52067de..b6f9481 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
index 2495919b..5f523ace 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-one-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
index f34d853..338d126 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/color-suggestion-picker-two-row-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.png
index 5ff391f..3db0b64 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-expected.png
index 122f1c76..f1fb3e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png
index bf00dda..b583971 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-datalist-zoomed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-padding-with-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-padding-with-datalist-expected.png
index 4db74dc..01451f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-padding-with-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datalist/input-appearance-range-with-padding-with-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-basic-expected.png
index 123283a6..1ce1180 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-pseudo-elements-expected.png
index 06500523..aeb98fe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/date/date-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
index 0153a67..312b8e9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/fieldset/fieldset-align-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/fieldset/fieldset-align-expected.png
index 2f9c84e..bb20c64 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/fieldset/fieldset-align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/fieldset/fieldset-align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.png
index de6e4ca..6c4edb2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/floating-textfield-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/image-border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/image-border-expected.png
index 2bb858c2..409a940 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/image-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/image-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.png
index fb0a0395..27a960d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-appearance-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-first-letter-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-first-letter-expected.png
index 7d9b369..398be13 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-first-letter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-first-letter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-value-expected.png
index ff99bf2..285e09f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-basic-expected.png
index dbb61d4c..9697802e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-pseudo-elements-expected.png
index 04055fba..29a7c4f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-datalist-expected.png
index d792e600..67a8faa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-rtl-expected.png
index b01565f..d321c7f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/number/number-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png
index 5254e24..2944635 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/placeholder-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/plaintext-mode-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/plaintext-mode-2-expected.png
index 61765855..9c5cf0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/plaintext-mode-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/plaintext-mode-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/radio/radio-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/radio/radio-appearance-basic-expected.png
index b4ec6017..7ec212d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/radio/radio-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/radio/radio-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.png
index e9016a5..b98cf1d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/input-appearance-range-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.png
index fbd18524..8291ca20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/range-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.png
index a7a98a8..84e9d3b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.png
index da7a2520..3546746 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/slider-thumb-shared-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/thumbslider-no-parent-slider-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/thumbslider-no-parent-slider-expected.png
index bb08630..04fe7791 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/thumbslider-no-parent-slider-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/range/thumbslider-no-parent-slider-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-appearance-basic-expected.png
index d032fd8..62ef10a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-cancel-button-style-sharing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-cancel-button-style-sharing-expected.png
index c9d5cf0..07f16d3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-cancel-button-style-sharing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-cancel-button-style-sharing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-rtl-expected.png
index 024099a..8df5145 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-vertical-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-vertical-alignment-expected.png
index a67cf83..4d47aec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-vertical-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/search/search-vertical-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/basic-selects-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/basic-selects-expected.png
index f493e7e..bc3cc16 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/basic-selects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/basic-selects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-none-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-none-expected.png
index 2203dd6e..0b66b1f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-none-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-none-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-rtl-expected.png
index 1a4191b..5e52617 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-clip-expected.png
index a13c7ea..15bca05 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-no-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-no-overflow-expected.png
index 455ff6c..790cd594 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-no-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-no-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-option-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-option-wrap-expected.png
index b7a7d18..e3c5b54 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-option-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-option-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-restrict-line-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-restrict-line-height-expected.png
index 2044a7f2..849a795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-restrict-line-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-restrict-line-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-separator-painting-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-separator-painting-expected.png
index 01de045..2e02747 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-separator-painting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-separator-painting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-style-color-expected.png
index 9410eae3..8382196 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/menulist-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-autofilled-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-autofilled-expected.png
index 584ed83..d3b60c71 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-autofilled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-autofilled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-background-none-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-background-none-expected.png
index ebdbc84..479595c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-background-none-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-background-none-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-baseline-expected.png
index 86c3d5c..e1d5a87 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-dirty-parent-pref-widths-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-dirty-parent-pref-widths-expected.png
index d722270c..e2afda90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-dirty-parent-pref-widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-dirty-parent-pref-widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-listbox-multiple-no-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
index 07c946f..9157745 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-listbox-multiple-no-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-style-expected.png
index 74c5c2935..5e23bf5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-visual-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-visual-hebrew-expected.png
index 60e3b649..5fa1f1c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-visual-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/select/select-visual-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/submit/submit-appearance-basic-expected.png
index 483c596..d698a56d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/submit/submit-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/submit/submit-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index 250fa0f..5a3075f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
index 887dad8..c50bf71 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
index 1aa9ab9..952bc8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
index aa01f67e..0d8c41a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index 2e079f23..4c9fc4e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index f7ba72e..5824a300 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
index 536d744..6ff3347d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index 3c20e8e..00fead13 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index aea16b1..09a0e05a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index b6f05f0..49376bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
index 2604032..fd6084e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 9ec1e36..ea0cf84 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
index 8e31411..9dccb76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
index 61b3557..658693dc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index bc8503b3..13950ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
index e0f7060..a8408ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
index 78b8c83..0d9bfdf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/tabbing-input-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/tabbing-input-iframe-expected.png
index f373f33..c453abe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/tabbing-input-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/tabbing-input-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-focus-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-focus-expected.png
index 60dd6b293..1b83963 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-focus-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-focus-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-selection-expected.png
index 914120b4..d31e4bdd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-appearance-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-double-click-selection-gap-bug-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-double-click-selection-gap-bug-expected.png
index 1369594a..6925024 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-double-click-selection-gap-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-double-click-selection-gap-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-paint-order-expected.png
index a9dbd83..f50155a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-1-expected.png
index 4e1f6981..5f9d441 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-3-expected.png
index 3d1dc87..9bfd1b8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-placeholder-visibility-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-tab-shows-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-tab-shows-caret-expected.png
index d4a584f9..65cda1d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-tab-shows-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-tab-shows-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-click-inside-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-click-inside-expected.png
index 25a30c959..e04f594 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-click-inside-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-click-inside-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-double-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-double-click-expected.png
index 4b94fc9b..1eb11a3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-double-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-double-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-drag-down-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-drag-down-expected.png
index 6c78e35..acde15cc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-drag-down-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-drag-down-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-option-delete-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-option-delete-expected.png
index 5074228..de6a7b9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-option-delete-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-option-delete-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-self-emptying-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-self-emptying-click-expected.png
index 2bb14df..1b780415 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-self-emptying-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/input-text-self-emptying-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-basic-expected.png
index 487a8df..6950fc1b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-datalist-expected.png
index b9fb196..4cb4b372 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/text-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-focus-ring-expected.png
index 525fc6ea..b2254628 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-outline-expected.png
index 55e8205..c7ad0a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-overflow-expected.png
index 1e06ae8..7b3bec3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/text/textfield-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
index 9356e3c..87e413b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
index f5deea0e..24f37dc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
index ce4754b..c908ae3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-placeholder-visibility-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.png
index ce693df..ff28463 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
index 7a3d3b5..4da398db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.png
index 8f4714c..38c7e17 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/textarea/textarea-scrolled-type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-basic-expected.png
index 1a51ca0..9cab6b9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-pseudo-elements-expected.png
index f325472..a920baa8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/time/time-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/visual-hebrew-text-field-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/visual-hebrew-text-field-expected.png
index 8636a49..1abff5e9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/visual-hebrew-text-field-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/visual-hebrew-text-field-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-basic-expected.png
index 8c199b81..0eba7a9f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-pseudo-elements-expected.png
index 4fa3d3e..af936a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/forms/week/week-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/frames/onlyCommentInIFrame-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/frames/onlyCommentInIFrame-expected.png
index af71a50..b32f21f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/frames/onlyCommentInIFrame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/frames/onlyCommentInIFrame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png
index 8acdf01..e99f901 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/hidpi/focus-rings-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-2-expected.png
index 07bc1c0..425ccf4e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-expected.png
index 07bc1c0..425ccf4e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/25277-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-expected.png
index e2f06f7..8e9eb38 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-2-expected.png
index f32fb28..641a7f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-expected.png
index b47f7a9..d0b4630 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/continuation-outlines-with-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/emptyInlinesWithinLists-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/emptyInlinesWithinLists-expected.png
index db3b6bf..2e58089 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/emptyInlinesWithinLists-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/emptyInlinesWithinLists-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-borders-with-bidi-override-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-borders-with-bidi-override-expected.png
index 3d70acca8..f213d6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-borders-with-bidi-override-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-borders-with-bidi-override-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-expected.png
index 31ac4da2..1716a904 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-long-image-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-long-image-expected.png
index dccca9c6..7b6b6b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-long-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-long-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-x-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-x-expected.png
index 68d8bb5..b4c13134 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-x-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-x-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-y-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-y-expected.png
index 8df6b00..da4bb89 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-y-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-box-background-repeat-y-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.png
index e415a34..9fc7f46b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/inline/inline-continuation-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.png
index 24ff9fb..59d4aa4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/invalid/table-inside-stray-table-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/opacity-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/opacity-outline-expected.png
index 8ae3124f..2c5f1a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/layers/opacity-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/layers/opacity-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-expected.png
index 7a6f095..86380aad 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png
index b952ab9f..6738f58 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/001-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-expected.png
index 70c15c99..9f01552 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png
index a1f3c1da..2cc021a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/002-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-expected.png
index a4dd4ae3..9d192f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png
index d940348..e23adb71 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/003-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/004-expected.png
index 3859399..730fe95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-expected.png
index b60deb3c..ab9acaa0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-vertical-expected.png
index 9350707..621de43 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/005-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-expected.png
index cb37d4a..4e729bdba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png
index 2fb627b..63a9350c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/007-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-expected.png
index b94e9d2..1f83bc2f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png
index 7323d26..de95f5c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/008-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/big-list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/big-list-marker-expected.png
index e96a34fb..69e4c88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/big-list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/big-list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/dynamic-marker-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/dynamic-marker-crash-expected.png
index b8d1708..af30f9c3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/dynamic-marker-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/dynamic-marker-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/inlineBoxWrapperNullCheck-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/inlineBoxWrapperNullCheck-expected.png
index 3d9ef71..a5c1f4f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/inlineBoxWrapperNullCheck-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/inlineBoxWrapperNullCheck-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-before-empty-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-before-empty-inline-expected.png
index 11b2d01..b3d33dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-before-empty-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-before-empty-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-image-error-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-image-error-expected.png
index 09233270..5583720 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-image-error-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/marker-image-error-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/markers-in-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/markers-in-selection-expected.png
index 33099803..18eda8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/markers-in-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/markers-in-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-display-types-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-display-types-expected.png
index 74b207c..915e531 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-display-types-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-display-types-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-start-parsing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-start-parsing-expected.png
index 265d1f4..dbe14e9a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-start-parsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/ol-start-parsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/olstart-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/olstart-expected.png
index aa6b0f7d..760e7f85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/olstart-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/olstart-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/scrolled-marker-paint-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/scrolled-marker-paint-expected.png
index 97fd694..1817258c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/lists/scrolled-marker-paint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/lists/scrolled-marker-paint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/masking/clip-path-inset-large-radii-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/masking/clip-path-inset-large-radii-expected.png
index 6c86f03..2c7bc8d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/masking/clip-path-inset-large-radii-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/masking/clip-path-inset-large-radii-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/border-radius-clipped-layer-second-column-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/border-radius-clipped-layer-second-column-expected.png
index 31bec2c..1fafd7aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/border-radius-clipped-layer-second-column-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/border-radius-clipped-layer-second-column-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
index e03bb295..1e71d99 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/multicol/multicol-with-child-renderLayer-for-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/border-radius-clipping-expected.png
index 847ff6c0..543b7c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/image-selection-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/image-selection-highlight-expected.png
index c51ca34..224b797 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/image-selection-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/image-selection-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-focus-ring-expected.png
index 672fba86..4dcbf347 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-expected.png
index 030da56..ce4235d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-inline-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
index b8b5d18..0d55f689 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png
index 27d9f7d..b1ceb374 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-rtl-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-text-hit-testing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-text-hit-testing-expected.png
index d6d160a..873bb53 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-text-hit-testing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-text-hit-testing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png
index 39b96cd8..2377fb50 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-update-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-with-local-background-attachment-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-with-local-background-attachment-expected.png
index 87723131..c68d1d47 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-with-local-background-attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/reflections/opacity-reflection-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/reflections/opacity-reflection-transform-expected.png
index 17e380ef..08f8942 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/reflections/opacity-reflection-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/reflections/opacity-reflection-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.png
index 8c8b56db..abe19a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/inline-box-wrapper-handover-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/inline-box-wrapper-handover-expected.png
index dcdf1a22..28143030 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/inline-box-wrapper-handover-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/inline-box-wrapper-handover-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/selection-rect-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/selection-rect-transform-expected.png
index 9eaad225..0ffda5d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/selection-rect-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/replaced/selection-rect-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/032-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/032-expected.png
index 5306a4e..a51ba5b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/032-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/032-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/166-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/166-expected.png
index ba2a407..9ac3601 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/selectors/166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/spatial-navigation/snav-multiple-select-focusring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
index 6948332..7cb96261 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/spatial-navigation/snav-multiple-select-focusring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/003-expected.png
index b0b02b2c..0b6676f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/007-expected.png
index 9be01e35..20021bea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/018-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/018-expected.png
index 32bb8418..f345b26 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/020-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/020-expected.png
index 93a9671..1b01d6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/020-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/020-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/029-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/029-expected.png
index cdca6177..9f22075 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/029-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/029-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/030-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/030-expected.png
index 0aef8584..384f12a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/030-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/030-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/035-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/035-expected.png
index cd08a6a4..edcb7c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/035-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/035-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-expected.png
index 55f53dee..62bf052 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-vertical-expected.png
index 5fe1ffb..c8b8c97 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/038-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/039-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/039-expected.png
index 0e6db6f..9f03291a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-expected.png
index 8e11a7ef..1267c829 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-vertical-expected.png
index 5afcfbb5..11f8aac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/040-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/041-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/041-expected.png
index 45a151b6..3f800556 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/041-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/041-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/add-before-anonymous-child-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/add-before-anonymous-child-expected.png
index 37e3b7c..d17ddbe0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/add-before-anonymous-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/add-before-anonymous-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-collapsed-border-expected.png
index 773131a..4c04ec48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-expected.png
index 773131a..4c04ec48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-collapsed-border-expected.png
index 4fa6b1b2..5edc19f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-expected.png
index c759170..02876735 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
index def2c9a..83cd1c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
index c5e1856..3829dbc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-expected.png
index 2179bd4..9eb44e6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
index 46f5980d..913ac523 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/click-near-anonymous-table-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/click-near-anonymous-table-expected.png
index 9c414ae..58981a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/click-near-anonymous-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/click-near-anonymous-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/early-table-layout-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/early-table-layout-expected.png
index 6d8243b9..40476908 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/early-table-layout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/early-table-layout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/edge-offsets-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/edge-offsets-expected.png
index 08c3c00..bf82b4ee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/edge-offsets-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/edge-offsets-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/row-height-recalc-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/row-height-recalc-expected.png
index d75ba76..7744ab6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/row-height-recalc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/row-height-recalc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-expected.png
index 5a7975b..9741c6d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-vertical-expected.png
index f1e3f4b..59ac38b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rowspan-paint-order-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rtl-cell-display-none-assert-expected.png
index b8895e1..3836f243d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/rtl-cell-display-none-assert-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/rtl-cell-display-none-assert-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/spanOverlapRepaint-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/spanOverlapRepaint-expected.png
index 97069e9..1f54639 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/spanOverlapRepaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/spanOverlapRepaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/text-field-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/text-field-baseline-expected.png
index 4cc006e..861cd34 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/text-field-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/text-field-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/table/unbreakable-images-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/table/unbreakable-images-quirk-expected.png
index 9b83f69..1addbd19 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/table/unbreakable-images-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/table/unbreakable-images-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text-autosizing/list-item-above-dbcat-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text-autosizing/list-item-above-dbcat-expected.png
index 429a4e4d..70a4a12 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text-autosizing/list-item-above-dbcat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text-autosizing/list-item-above-dbcat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-kerning-and-ligatures-expected.png
index 7288cbf..db7a9a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png
index 87d85ff..34baeda9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-pointtooffset-calls-cg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-pointtooffset-calls-cg-expected.png
index 839e5fe..3a43949b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-pointtooffset-calls-cg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-pointtooffset-calls-cg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-rtl-override-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-rtl-override-selection-expected.png
index 39e17fd3..9fa0281 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-rtl-override-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-rtl-override-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-small-caps-punctuation-size-expected.png
index 5a6097b..b26589c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-spacing-features-expected.png
index c183d2c..999c3cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/001-expected.png
index c77e35e..6dcee389 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/006-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/006-expected.png
index dc219a6d..5a61aa5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/007-expected.png
index 32c0b0f..1704885 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/015-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/015-expected.png
index 3c1cccb..28b7efa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/basic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/capitalize-empty-generated-string-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/capitalize-empty-generated-string-expected.png
index 5e2a106..eafcd90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/capitalize-empty-generated-string-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/capitalize-empty-generated-string-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-disabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-disabled-expected.png
index a0c2b1f8..90a26a8d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-disabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-disabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-expected.png
index e7267af6..ea7107e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-rtl-expected.png
index d4053af0..0efb577 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/caps-lock-indicator-enabled-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/cg-vs-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/cg-vs-atsui-expected.png
index 07c5c690..27593a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/cg-vs-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/cg-vs-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/color-emoji-expected.png
index 9eaf6306..6759624 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png
index dd9d985..6843723 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/complex-synthetic-bold-space-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/delete-hard-break-character-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/delete-hard-break-character-expected.png
index 3d02dfa..5ddfd973 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/delete-hard-break-character-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/delete-hard-break-character-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
index b3ae515..51b72d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
index 520beeac..e66f9d2b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
index 2d58012..991fe49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-ltr-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
index 39a9297..1c48d5d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/in-rendered-text-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/in-rendered-text-rtl-expected.png
index 440387b..817902d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/in-rendered-text-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/in-rendered-text-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-CSS-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-CSS-expected.png
index 28ac4ede..3d4cb4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-CSS-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-CSS-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.png
index f6c34ee4..583b18b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-HTML-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
index 600dd40..747a9ab1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-european-terminators-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-european-terminators-expected.png
index bee04439..6c537d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-european-terminators-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-european-terminators-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
index 95361f8..0cf9f2ce6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-innertext-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-innertext-expected.png
index fbe80e8..02c57a25 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-innertext-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/bidi-innertext-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/hebrew-vowels-expected.png
index d3b394a..ecb56bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/mixed-directionality-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/mixed-directionality-selection-expected.png
index ed5432f..e25bd78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/mixed-directionality-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/mixed-directionality-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-caret-expected.png
index 4afabf4c..6d8241e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-white-space-pre-wrap-expected.png
index d95b42a..b206446 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/text-spliced-font-expected.png
index 4babb2ab..beffbb7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.png
index 1234fad..b22cfe6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/international/vertical-text-glyph-test-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/midword-break-hang-expected.png
index 741dc6c..6a8f046 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/should-use-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/should-use-atsui-expected.png
index 810bbf5..483cb0bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/should-use-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/should-use-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/webfont-synthetic-bold-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/webfont-synthetic-bold-expected.png
index 47623d2..603fb7a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/webfont-synthetic-bold-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/webfont-synthetic-bold-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-overflow-selection-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
index 9a8daf6..d3857213 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
index 77760b3..6c290d8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
index fde7a873..3b6f035 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/text/whitespace/select-new-line-with-line-break-normal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/block-level-images-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/block-level-images-expected.png
index bc59779..d059e34 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/block-level-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/block-level-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
index 376a255..f834ab2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-lr-expected.png
index e7d1803..dbc96a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-rl-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-rl-expected.png
index b601663a..d34e3d32 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-rl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-styles-vertical-rl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-vertical-lr-expected.png
index 130696e6..0a7e91f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-1-expected.png
index 77d41283..54ba9ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-2-expected.png
index 77d41283..54ba9ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-1-expected.png
index 77d41283..54ba9ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-2-expected.png
index 77d41283..54ba9ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-details-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-and-click-expected.png
index 785d9903..832e4d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-expected.png
index 91e4a3fb..e875da1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-and-click-expected.png
index a1ab4cf..0e5aad0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-expected.png
index ce679829..62390d9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-10-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-and-click-expected.png
index 0e47b8f..fe44b56 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-expected.png
index 91e4a3fb..e875da1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-and-click-expected.png
index 906d5c59..fb6e36e1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-expected.png
index 7998a9a..e1f546d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-and-click-expected.png
index a92aa317..a0456be 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-expected.png
index f0427ec..1a0a6a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-and-click-expected.png
index b7905c54..338b183 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-expected.png
index 91e4a3fb..e875da1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-and-click-expected.png
index a1ab4cf..0e5aad0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-expected.png
index d6966d2..2ceeabf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-and-click-expected.png
index a1ab4cf..0e5aad0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-expected.png
index ed667697..c7b894a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-7-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-and-click-expected.png
index 5e25c1b..2ea4f3ec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-expected.png
index 67b2811..33d73bb9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-and-click-expected.png
index 8dca50b..d7b2bd66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-expected.png
index 74f35a6..4489fece 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-1-expected.png
index a4977f1..0239e5cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-2-expected.png
index a4977f1..0239e5cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-add-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-marker-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-marker-style-expected.png
index a40fe40..c3166de 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-marker-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-marker-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-1-expected.png
index b43a5f89..7e35fc2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-2-expected.png
index 54af006e..b9890935 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-nested-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary1-expected.png
index a5aaf26..aa6ab35d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary2-expected.png
index cc66a6d..91a490d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary3-expected.png
index a5aaf26..aa6ab35d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary4-expected.png
index c9e39a3a..45d986a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-no-summary4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open-javascript-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open-javascript-expected.png
index 72dfff9a5..c986058 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open-javascript-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open-javascript-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open1-expected.png
index f0427ec..1a0a6a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open2-expected.png
index bc9ecac..a3a49f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open3-expected.png
index f0427ec..1a0a6a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open4-expected.png
index bc9ecac..a3a49f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open5-expected.png
index f0427ec..1a0a6a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open6-expected.png
index 01987e9..019b6d1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-open6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-position-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-position-expected.png
index 89b8ea4e..7304a24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-1-expected.png
index bc4e531..256f52fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-2-expected.png
index bc4e531..256f52fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-and-click-expected.png
index db82e9d..ebb57244 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-expected.png
index a5aaf26..aa6ab35d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-and-click-expected.png
index b63b138..bbcf49b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-expected.png
index 467dfc1..31c517e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-and-click-expected.png
index f1f5bc58..5f3f11b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-expected.png
index bdd8a13..4def701 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-and-click-expected.png
index b5b9525d..20a3908 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-expected.png
index cc66a6d..91a490d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-and-click-expected.png
index aba79232..69a68f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-expected.png
index 31f7b174..9dbb1cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-and-click-expected.png
index a91417d..9302f00 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-expected.png
index 49920b28..ea520cd7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-1-expected.png
index 8ed8421..1206ef0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-2-expected.png
index f05a926..083c3e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-remove-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-summary-child-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-summary-child-expected.png
index 4d76bb60..643d15a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-summary-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-summary-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-text-expected.png
index 4f6ea08..f61d25719 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-replace-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-center-expected.png
index 7ee4ffb..50f1cc7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-left-expected.png
index cd0a169..3c84de3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-right-expected.png
index 550fbcd..ef5630a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-align-right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-expected.png b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-expected.png
index 86e7251b..4d7f668 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/html/details_summary/details-writing-mode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/acid2-pixel-expected.png
index 640c1fa..e2836b18 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
index 0d30e56..559d14cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
index 4146d92..94f75519 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
index 3092bbb3..57519a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
index d5dcdc6..2a2afd61 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
index b9753f7..301a77b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
index 0ecde7c..66bc0de0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
index 45ff8db..261fc003 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
index 43229f9..561125b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
index 76721d0..4e8d1e72 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
index e841f50..02771a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
index 03b3b6e..f6f7dbf4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
index a945ad9..29e8ab07 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
index 4e20e700..b94074f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
index f7a9f09e..2c14a91 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
index bad12ed..09dca235 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
index 3bb88fc..7dabc88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
index a0f1b55..625dc0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
index 89247cb..5dbf1dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
index 34a7062d..24d66db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
index e29f22b86..c7c1e38 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
index 1050082..50d6a83f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
index 6443c64..8e30fb39 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
index d4b6f85..019142c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-fade-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-fade-expected.png
index d1a0b4f..4f13c7f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-fade-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-fade-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-radius-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-radius-expected.png
index 40b5f055..4eae2f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-image-shape-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-image-shape-expected.png
index a296671..2fbe8695 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-image-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-image-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-mask-image-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-mask-image-svg-expected.png
index 1ab5cc4..edc5f47e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-mask-image-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-mask-image-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-svg-foreign-object-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-svg-foreign-object-expected.png
index ccb0d94b..47d989a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-svg-foreign-object-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/color-profile-svg-foreign-object-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-diff-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-diff-expected.png
index 7ca14c9..2aaa87e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-diff-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-diff-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-expected.png
index 6aee240..6072b1f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/cross-fade-svg-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-css-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-css-expected.png
index bee27eb..827708f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-expected.png
index 600045ec..351cdf8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-image-document-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-image-document-expected.png
index 1491f25..d5449e79 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-image-document-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/exif-orientation-image-document-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-circle-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-circle-focus-ring-expected.png
index cc96168..0d4b58e6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-circle-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-circle-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-expected.png
index 9c516426..7a7e756 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-expected.png
index e0993c7b..7259f6d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map-expected.png
index 888d15c1..ba4f625 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-not-inherited-from-map-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-not-inherited-from-map-expected.png
index 78fb5d7..f90bf7e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-not-inherited-from-map-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-outline-color-not-inherited-from-map-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-zoom-expected.png
index 739144c..0479ea4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-focus-ring-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-circle-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-circle-focus-ring-expected.png
index 8d4d3b0..522f540 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-circle-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-circle-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-polygon-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-polygon-focus-ring-expected.png
index 4963218..6b32bd2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-polygon-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/images/imagemap-overflowing-polygon-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/4776765-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/4776765-expected.png
index a3f23b8..a1cd523 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/4776765-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/4776765-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/box-inline-resize-expected.txt
index 31a9bed..d79b45f0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/box-inline-resize-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/box-inline-resize-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [8, 84, 32, 68],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG id='foo'",
-          "rect": [8, 84, 32, 32],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt
index 5cc04b3..1745a01 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-5699-expected.txt

@@ -13,26 +13,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 178, 36, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 148, 36, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutInline SPAN id='d'",
-          "rect": [8, 145, 4, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 145, 4, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 130, 4, 18],
           "reason": "style change"
         }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-expected.png
index 385c848..2617d24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
index d388667..4359ac3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.png
index da56c30..4f0f54f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.txt
index a229f032..f2445d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-contenteditable-content-after-expected.txt

@@ -27,16 +27,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 23, 18],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 16, 18],
-          "reason": "full"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [30, 44, 9, 18],
           "reason": "forced by layout"
@@ -62,11 +52,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 8, 18],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [8, 44, 8, 18],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-subpixel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-subpixel-expected.txt
index 05c1760..9ffaeb4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-subpixel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-subpixel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [8, 8, 225, 19],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 201, 13],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.png
index 2b8a362..cacf24b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.txt
index 69ee0c96f..28eec48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-composited-scroll-expected.txt

@@ -27,11 +27,6 @@
           "object": "LayoutTextControl INPUT id='text'",
           "rect": [-3, 997, 211, 25],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [3, 1003, 200, 13],
-          "reason": "subtree"
         }
       ]
     },

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-transformation-expected.png
index 5b436547..20dda80ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-transformation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
index 53fdc643..80759da 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

@@ -40,11 +40,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 508, 31, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [285, 500, 15, 150],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.png
index c637c0070..07cc1bb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/compositing/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/control-clip-expected.txt
index a0538478..d6eeb82 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/control-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/control-clip-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [16, 114, 184, 13],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText (anonymous)",
-          "rect": [9, 84, 52, 14],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [82, 114, 52, 13],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.png
index a4e3994..41dcc45 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt
index 0512beb..a44237b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/delete-into-nested-block-expected.txt

@@ -33,11 +33,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 119, 32, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 137, 28, 19],
           "reason": "layoutObject removal"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/details-open-repaint-expected.txt
index d47cae3..d08529a2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/details-open-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/details-open-repaint-expected.txt

@@ -12,16 +12,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutTextControl INPUT",
-          "rect": [8, 68, 131, 19],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 71, 125, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutDetailsMarker DIV id='details-marker'",
           "rect": [8, 53, 11, 11],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt
deleted file mode 100644
index a4ec2ec..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexbox/repaint-expected.txt
+++ /dev/null

@@ -1,179 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [138, 116, 654, 90],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [138, 116, 654, 90],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [138, 116, 652, 90],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [148, 116, 644, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [148, 116, 644, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [148, 116, 644, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [148, 116, 644, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [148, 116, 632, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [148, 116, 632, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [400, 116, 392, 162],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [400, 116, 392, 162],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [8, 224, 392, 54],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [400, 116, 391, 162],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [148, 116, 252, 162],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [8, 206, 140, 18],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [138, 116, 10, 108],
-          "reason": "incremental"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow DIV id='left'",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='content'",
-      "reason": "style change"
-    },
-    {
-      "object": "LayoutBlockFlow P",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'id, faucibus id quam.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='left'",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='content'",
-      "reason": "style change"
-    },
-    {
-      "object": "LayoutBlockFlow P",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-expected.png
index 83444e1..14823fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-horizontal-expected.png
index 83444e1..14823fd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-enable-continuations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-enable-continuations-expected.png
index 61e61ee..5dd5209 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-enable-continuations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-enable-continuations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-layers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-layers-expected.png
index 33f58ae..24bd464c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-ring-expected.png
index 2c040e9..578ebb2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
index c3155cb..70a274d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 30, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 30, 13],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
index dfa9b8e18..8af7937 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
index 05a2122..3fe95f78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt

@@ -17,11 +17,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutFlexibleBox DIV",
-          "rect": [10, 10, 129, 15],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='thumb'",
           "rect": [67, 10, 15, 16],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
index 698fd04..450bed4e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 37, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 37, 13],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-block-overflow-expected.png
index 30632f1e..9746f74 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-block-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-color-change-expected.txt
index 4579293..82916c6a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-color-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-color-change-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 68, 37, 18],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 68, 37, 18],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.png
index 4a7fce5..8be258d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.txt
index a5a4698..9692d0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-focus-expected.txt

@@ -17,11 +17,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [0, 34, 429, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutInline A id='link'",
           "rect": [581, -5, 224, 242],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-outline-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-outline-repaint-expected.txt
index 0b4af2de..83b3f7db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-outline-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/inline-outline-repaint-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutInline SPAN id='test'",
           "rect": [5, 163, 98, 42],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 166, 92, 36],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
index c47aa32..25c063f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 8, 29, 23],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 8, 29, 18],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
index 4a30daf..b851974e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
index c603627..46659040b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt

@@ -22,16 +22,6 @@
           "object": "LayoutTextControl INPUT id='root'",
           "rect": [0, 0, 41, 19],
           "reason": "full"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [6, 6, 35, 13],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [6, 6, 35, 13],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
index 5516cd9f..74f56fe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -23,16 +23,6 @@
         },
         {
           "object": "LayoutBlockFlow P",
-          "rect": [8, 2200, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 2050, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
           "rect": [8, 2050, 777, 100],
           "reason": "subtree"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-child-outline-expected.png
index 0063ce2e..88e00e59 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-child-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-expected.png
index 4a5d61e..a120c5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-horizontal-expected.png
index 4a5d61e..a120c5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
index 038883fd6..28bcfd6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -25,26 +25,6 @@
           "object": "LayoutInline (relative positioned) SPAN",
           "rect": [8, 120, 100, 104],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 220, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 220, 100, 100],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 200, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 200, 100, 100],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt
index 5d7f4e0..6c92ee81 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -25,11 +25,6 @@
           "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
           "rect": [14, 353, 48, 65],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [27, 353, 22, 19],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt
index ca84a18..3847f221 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -13,55 +13,10 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [14, 242, 406, 126],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 188, 406, 72],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 404, 355, 72],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 368, 355, 54],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [14, 404, 355, 36],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [14, 80, 354, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 368, 336, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [65, 368, 304, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [178, 350, 145, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [127, 350, 145, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
           "rect": [14, 353, 48, 65],
           "reason": "layoutObject removal"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-overflow-expected.txt
index 38c7234..ef437b9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-overflow-expected.txt

@@ -22,19 +22,9 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [115, 114, 37, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutInline SPAN id='t'",
           "rect": [38, 132, 36, 18],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [38, 132, 36, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-2-expected.txt
index dd02d3d..9e9575c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-2-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutImage IMG id='target'",
-          "rect": [48, 94, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutListMarker (anonymous)",
           "rect": [31, 180, 7, 18],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-expected.png
index b7733b1..e49ba353 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt
index e432ac71..5db9fa0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/make-children-non-inline-expected.txt

@@ -12,21 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 60, 784, 90],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 250, 784, 72],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 250, 113, 18],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [8, 150, 113, 18],
           "reason": "layoutObject removal"
@@ -34,87 +19,42 @@
         {
           "object": "LayoutText #text",
           "rect": [8, 132, 80, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 132, 80, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 96, 80, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 96, 80, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 268, 69, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 168, 69, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 304, 64, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 204, 64, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 114, 45, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 114, 45, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 78, 44, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 78, 44, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 60, 40, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 60, 40, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 286, 30, 18],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 186, 30, 18],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [8, 150, 10, 100],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt
index 780c1fce..e8700965 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [11, 11, 125, 13],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [146, 11, 43, 13],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 43, 13],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multicol-repaint-expected.txt
index 88ef0d86..ccc401b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multicol-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/multicol-repaint-expected.txt

@@ -18,18 +18,8 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [234, 15, 300, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [234, 15, 50, 50],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [9, 9, 13, 59],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-clip-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-clip-change-expected.txt
deleted file mode 100644
index 65ad946..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-clip-change-expected.txt
+++ /dev/null

@@ -1,41 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
-          "rect": [48, 102, 92, 23],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [48, 102, 87, 18],
-          "reason": "subtree"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
-      "reason": "subtree"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "subtree"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "subtree"
-    },
-    {
-      "object": "InlineTextBox 'Lorem Ipsum'",
-      "reason": "subtree"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
index d1394c3..be44f90f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [6, 6, 204, 58],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 8, 200, 50],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-continuations-expected.txt
index eb286040..d0c3404 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-continuations-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/outline-continuations-expected.txt

@@ -25,16 +25,6 @@
           "object": "LayoutInline SPAN id='outer'",
           "rect": [16, 146, 88, 22],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 148, 84, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 110, 84, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-scroll-body-appear-expected.txt
index eb2426cd..383968e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-scroll-body-appear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -22,31 +22,11 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 50, 784, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 16, 784, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [127, 50, 390, 18],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 348, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 50, 120, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [785, 0, 15, 585],
           "reason": "scroll"
@@ -55,11 +35,6 @@
           "object": "LayoutView #document",
           "rect": [785, 585, 15, 15],
           "reason": "scroll"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [516, 50, 5, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
index a040518..423bb7c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -20,11 +20,6 @@
           "object": "LayoutText #text",
           "rect": [18, 18, 23, 18],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 184, 23, 18],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/positioned-document-element-expected.txt
index e88635d..99003a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/positioned-document-element-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/positioned-document-element-expected.txt

@@ -13,34 +13,14 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [0, 0, 800, 50],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [8, 16, 784, 18],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [100, 100, 451, 50],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [108, 116, 435, 18],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 116, 435, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 435, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
index db86d17..e9e2ef1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -24,11 +24,6 @@
           "object": "LayoutInline (relative positioned) DIV id='block'",
           "rect": [0, 0, 374, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [1, 1, 372, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt
index 7f5f484..30fb718b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -15,26 +15,6 @@
           "object": "LayoutText #text",
           "rect": [112, 194, 181, 18],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [292, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 194, 4, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt
index 02e071e..d3fd42f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -20,26 +20,6 @@
           "object": "LayoutText #text",
           "rect": [112, 194, 181, 18],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [292, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 194, 4, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
index d4a584f9..65cda1d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
index 4ac0220..1dd6f181 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt

@@ -28,11 +28,6 @@
           "reason": "scroll"
         },
         {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [3, 65, 225, 235],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [3, 65, 58, 16],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/search-field-cancel-expected.txt
index 8c243ca..97737f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/search-field-cancel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/search-field-cancel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [12, 45, 113, 13],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [12, 45, 51, 13],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-after-remove-expected.txt
index 569e878..d081e07 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-after-remove-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-after-remove-expected.txt

@@ -15,21 +15,6 @@
           "object": "LayoutText #text",
           "rect": [39, 75, 123, 108],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [112, 165, 42, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [74, 75, 39, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [39, 75, 36, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-clear-expected.txt
index c3b8836..4d777cd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-clear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection-clear-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutText #text",
           "rect": [8, 49, 98, 118],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 49, 8, 18],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
index 37420227..137484e2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [5, 5, 47, 25],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 35, 13],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 35, 13],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/shadow-multiple-expected.png
index 9ff47fe..b1b31d8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-drag-release-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-drag-release-expected.png
index e6fe8ed4..0362fc9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-drag-release-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-drag-release-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-float-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-float-expected.png
index c2c9652..ab13890 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/slider-thumb-float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt
index d115948..771df91 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/subtree-root-skipped-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [11, 11, 28, 13],
-          "reason": "full"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='div'",
           "rect": [8, 288, 10, 20],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
index 94f93f1..d74a48a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
index d1a5c290..e659223 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
index 631b966..dcbb595 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt

@@ -8,21 +8,11 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [203, 335, 120, 42],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [203, 335, 120, 42],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [247, 89, 119, 42],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [247, 89, 119, 42],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
index 4ab8bce..36122c3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -7,51 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 62, 306, 378],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/circle-move-invalidation-expected.png
index de26791..af8b0b5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/circle-move-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt
index 858bae0a..a6f891b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/ems-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 54, 571, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 54, 571, 86],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 54, 571, 86],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt
index 9d3420f..eaf4627 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/exs-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 50, 571, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 50, 571, 82],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 50, 571, 82],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
index d57d94b..60b293e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
index be8dad28..b32b5dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
index ccf808a..44b06d261 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -17,16 +17,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 39, 784, 174],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 39, 784, 174],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 39, 784, 174],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
index a9da73b4..8bbb606d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 39, 784, 174],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 39, 784, 174],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
index 5daaef5..e22ddc5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 246, 753, 134],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 246, 753, 134],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 129, 596, 135],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 129, 596, 135],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 443, 131],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 14, 443, 131],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt
index 06c3a077..b0abbfd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-gradient-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 22, 693, 196],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 22, 693, 196],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
index 98798672..bba180b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 246, 678, 134],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 246, 678, 134],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 129, 520, 135],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 129, 520, 135],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 367, 131],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 14, 367, 131],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt
index fa0740ae..6d48b34e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 22, 618, 196],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 22, 618, 196],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
index c404694..fe483139 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -7,46 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 62, 306, 378],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
index 526bb75..1e543da0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [23, 8, 85, 24],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='target'",
           "rect": [23, 8, 85, 24],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [58, 45, 50, 27],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='source'",
           "rect": [58, 45, 50, 27],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt
index a34c93a3..43ef9a8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [103, 24, 160, 116],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [103, 24, 160, 116],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [63, 24, 160, 116],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [63, 24, 160, 116],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
index 07d6b27..3acdacd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.png
index 76ac4885..9043b085 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
index 1d7381e8..f006099 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
index 76ac4885..9043b085 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
index eb2e736..9573c19 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -9,49 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 378],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 62, 306, 378],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 62, 306, 378],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-tspan-from-text-expected.txt
index d148ea1..a58e891 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-tspan-from-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -9,39 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 62, 306, 258],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 62, 306, 258],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGTSpan tspan id='remove'",
           "rect": [10, 62, 306, 258],
           "reason": "layoutObject removal"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
index 943305aa..cc592f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 12, 48, 30],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 12, 48, 30],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
index 943305aa..cc592f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 12, 48, 30],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 12, 48, 30],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 8964978..66ae27a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -25,21 +25,6 @@
           "object": "LayoutInline A",
           "rect": [378, 987, 55, 29],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [383, 992, 45, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [427, 992, 6, 19],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [378, 992, 6, 19],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.png
index 50ae2268..6e79105 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.png
index 1c1f6e5..a2121cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.png
index a2c1dffc..8cdbb94d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt
index 22e7e04..b6a148c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tabgroup-expected.txt

@@ -32,26 +32,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRound'",
           "rect": [390, 38, 314, 80],
           "reason": "became visible"
@@ -82,26 +62,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectRound'",
           "rect": [263, 279, 301, 300],
           "reason": "became visible"
@@ -152,26 +112,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectTriangle'",
           "rect": [507, 233, 236, 159],
           "reason": "became visible"
@@ -182,66 +122,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupTriangle'",
           "rect": [7, 257, 236, 158],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGContainer g id='tabgroupTriangle__0_content'",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='contentTabGroupTriangle0'",
-          "rect": [15, 292, 211, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [31, 404, 188, 10],
           "reason": "layoutObject insertion"
@@ -297,46 +182,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRect'",
           "rect": [38, 7, 158, 236],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 292, 148, 23],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 292, 148, 23],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 292, 148, 23],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [15, 292, 148, 23],
           "reason": "layoutObject insertion"
@@ -382,11 +232,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__1'",
-          "rect": [413, 329, 60, 60],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__1'",
           "rect": [567, 233, 59, 18],
           "reason": "layoutObject insertion"
@@ -402,121 +247,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [394, 39, 54, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [394, 39, 54, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [394, 39, 54, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [511, 235, 54, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [511, 235, 54, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [511, 235, 54, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [64, 258, 53, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [64, 258, 53, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [64, 258, 53, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [64, 258, 53, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [64, 258, 53, 27],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__2'",
           "rect": [120, 256, 52, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__3'",
-          "rect": [501, 417, 51, 51],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__2'",
-          "rect": [461, 377, 51, 51],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [571, 235, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [571, 235, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [571, 235, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [454, 39, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [454, 39, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [454, 39, 50, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [370, 286, 48, 47],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [370, 286, 48, 47],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [370, 286, 48, 47],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__3'",
           "rect": [667, 233, 48, 18],
           "reason": "layoutObject insertion"
@@ -527,31 +262,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 258, 46, 27],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 258, 46, 27],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 258, 46, 27],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 258, 46, 27],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [11, 258, 46, 27],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__2'",
           "rect": [623, 233, 46, 18],
           "reason": "layoutObject insertion"
@@ -562,166 +272,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [421, 336, 45, 45],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [421, 336, 45, 45],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [421, 336, 45, 45],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [124, 258, 44, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [124, 258, 44, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [124, 258, 44, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [124, 258, 44, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [124, 258, 44, 27],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__3'",
           "rect": [170, 256, 41, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [671, 235, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [671, 235, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [671, 235, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [554, 39, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [554, 39, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [554, 39, 39, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [508, 424, 37, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [508, 424, 37, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [508, 424, 37, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [510, 39, 37, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [510, 39, 37, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [510, 39, 37, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [469, 385, 36, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [469, 385, 36, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [469, 385, 36, 35],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [628, 235, 36, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [628, 235, 36, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [628, 235, 36, 14],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [174, 258, 32, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [174, 258, 32, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [174, 258, 32, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [174, 258, 32, 27],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [174, 258, 32, 27],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRect__0'",
           "rect": [178, 6, 19, 63],
           "reason": "layoutObject insertion"
@@ -740,66 +295,6 @@
           "object": "LayoutSVGPath path id='tabgroupRect__2'",
           "rect": [178, 123, 19, 46],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 11, 14, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 11, 14, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [181, 11, 14, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 71, 14, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 71, 14, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [181, 71, 14, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 171, 14, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 171, 14, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [181, 171, 14, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 128, 14, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 128, 14, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [181, 128, 14, 36],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt
index ab088ca..b9b46f3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-mask-update-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 2, 46, 23],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [10, 2, 46, 23],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
index 1ce4c0ab..8e67475 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 0, 551, 118],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [80, 0, 551, 118],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [30, 0, 404, 60],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [30, 0, 404, 60],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt
index ac48b84..3a7bc43e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-rescale-expected.txt

@@ -22,66 +22,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 114, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 114, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 14, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 14, 194, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 13, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 113, 100, 87],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [210, 113, 100, 46],
           "reason": "subtree"
@@ -92,36 +32,16 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 114, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 114, 92, 46],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 114, 92, 46],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 14, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 14, 92, 46],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 14, 92, 46],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [210, 113, 92, 46],
           "reason": "subtree"
@@ -137,47 +57,7 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 6, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 6, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 6, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 3, 6, 2],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
-          "rect": [0, 3, 6, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [6, 3, 4, 4],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 3, 4, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [9, 3, 4, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
           "rect": [9, 3, 4, 2],
           "reason": "subtree"
         },
@@ -202,51 +82,11 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 0, 1, 1],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGText text",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [0, 0, 1, 1],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.png
index ff1beb6..3d00c7d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-viewbox-rescale-expected.txt
index ff8ec38..66ad73f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-viewbox-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -7,86 +7,16 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner2'",
           "rect": [59, 143, 95, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner1'",
           "rect": [59, 43, 95, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 2, 1],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 2, 1],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 0, 2, 1],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 0, 2, 1],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 0, 2, 1],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner1'",
           "rect": [0, 0, 2, 1],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
index d215c92..6b81625 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [208, 14, 170, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [208, 14, 170, 18],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [18, 194, 170, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [18, 194, 170, 18],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
index 98ee373..826106c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -7,31 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [200, 186, 256, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [200, 186, 256, 18],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [200, 186, 256, 18],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [20, 6, 256, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [20, 6, 256, 18],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [20, 6, 256, 18],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt
index 85d5796..a86dc77 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutSVGText text id='status'",
           "rect": [90, 116, 64, 18],
           "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [90, 116, 44, 18],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-detach-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-detach-expected.txt
index 666aa1c..252f840 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-detach-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/use-detach-expected.txt

@@ -29,16 +29,6 @@
         {
           "object": "LayoutSVGContainer use",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {
@@ -54,21 +44,6 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {
@@ -84,21 +59,6 @@
         {
           "object": "LayoutSVGText text id='use_text'",
           "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 38],
           "reason": "layoutObject removal"
         },
         {

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/window-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/window-expected.txt
deleted file mode 100644
index 6eb131e..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/window-expected.txt
+++ /dev/null

@@ -1,2054 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutSVGContainer g id='Windows'",
-          "rect": [38, 81, 760, 454],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGContainer g id='Windows'",
-          "rect": [38, 92, 760, 443],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 142, 549, 394],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='bigWindow'",
-          "rect": [38, 143, 549, 392],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'",
-          "rect": [38, 143, 549, 392],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarbigWindow'",
-          "rect": [38, 142, 549, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'",
-          "rect": [38, 143, 549, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 523, 549, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 181, 315, 238],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='nestedWindow'",
-          "rect": [77, 182, 315, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'",
-          "rect": [77, 182, 315, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
-          "rect": [77, 181, 315, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'",
-          "rect": [77, 182, 315, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 406, 315, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='navWindow'",
-          "rect": [613, 81, 185, 169],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
-          "rect": [613, 81, 185, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-          "rect": [613, 81, 185, 159],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'",
-          "rect": [613, 81, 185, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [624, 92, 174, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='navWindow'",
-          "rect": [624, 92, 174, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'",
-          "rect": [624, 92, 174, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='colourPickerWindow'",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
-          "rect": [77, 195, 174, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupcolourPickerWindow'",
-          "rect": [77, 195, 174, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [624, 238, 174, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 325, 174, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textNavWindow'",
-          "rect": [632, 102, 160, 97],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [311, 377, 159, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
-          "rect": [311, 377, 159, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [311, 507, 159, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='smallWindow'",
-          "rect": [312, 377, 158, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupsmallWindow'",
-          "rect": [312, 377, 158, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'",
-          "rect": [312, 377, 158, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [249, 343, 143, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='statusWindow'",
-          "rect": [249, 344, 143, 64],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupstatusWindow'",
-          "rect": [249, 344, 143, 64],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
-          "rect": [249, 343, 143, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'",
-          "rect": [249, 344, 143, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 327, 139, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 327, 139, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textSmallWindow'",
-          "rect": [320, 399, 135, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 183, 132, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 183, 132, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 407, 127, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 407, 127, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 475, 120, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textStatusWindow'",
-          "rect": [257, 365, 120, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='minimalWindow'",
-          "rect": [39, 476, 119, 48],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupminimalWindow'",
-          "rect": [39, 476, 119, 48],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textMinimalWindow'",
-          "rect": [43, 481, 112, 36],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [41, 525, 102, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [41, 525, 102, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [314, 509, 91, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [314, 509, 91, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [252, 345, 74, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [252, 345, 74, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [314, 379, 71, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [314, 379, 71, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 197, 67, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 197, 67, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [41, 144, 59, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [41, 144, 59, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-          "rect": [757, 94, 36, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [627, 239, 34, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [627, 239, 34, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [613, 81, 16, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [615, 99, 12, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [571, 145, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [571, 145, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [235, 197, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [235, 197, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 83, 11, 12],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 83, 11, 12],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [376, 345, 11, 12],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [769, 94, 11, 11],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [769, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [769, 94, 11, 11],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [454, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [454, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [441, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [376, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [376, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [222, 197, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'",
-          "rect": [441, 380, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [441, 380, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'",
-          "rect": [376, 346, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [376, 346, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [545, 153, 11, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [363, 354, 11, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [756, 103, 11, 2],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [756, 103, 11, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [209, 206, 11, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [617, 153, 10, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [617, 153, 10, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnestedWindow'",
-          "rect": [377, 184, 10, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [377, 184, 10, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [783, 95, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [783, 95, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [783, 95, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [783, 95, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [616, 100, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [616, 100, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [616, 84, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [616, 84, 10, 10],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [616, 84, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonbigWindow'",
-          "rect": [572, 145, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [572, 145, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonsmallWindow'",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'",
-          "rect": [350, 185, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [350, 185, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'",
-          "rect": [223, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [223, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [783, 95, 10, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [783, 95, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [616, 116, 10, 9],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [616, 116, 10, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [616, 116, 10, 9],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [572, 146, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [350, 185, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 123, 10, 3],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [350, 192, 10, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [428, 388, 10, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [757, 95, 9, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [757, 95, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [757, 95, 9, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [757, 95, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'",
-          "rect": [546, 146, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [546, 146, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [757, 95, 9, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [757, 95, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [546, 146, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [377, 185, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 29, 6, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 22, 5, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 22, 5, 9],
-          "reason": "layoutObject insertion"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='Windows'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='navWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textNavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window should'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'contain navigation tools'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Click on button'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox ''Resize Navigation Window' for a'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'random resize of this Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Note that this window also'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'features a window decoration'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Statusbar'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='bigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a big movable window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='nestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window contains other windows'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='colourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Changing a colour changes background'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Colour Picker'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='statusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textStatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a none-moveable'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'none-closeable status'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Status Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Nested middlesize Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='smallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textSmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window has a callback'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'function indicating mouse'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'movements in the statusbar'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'and alerting window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'events'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Callback function is active'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Small Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='minimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupminimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textMinimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a minimal window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'without title and status bar.'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'it is also not moveable'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupminimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Big Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='Windows'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='navWindow'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Navigation Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
index 1952ee6..bb00034 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-foreignObject-expected.png
index 1a058b8..1e50922 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table-collapsed-border-expected.txt
index d64d6549..c2d84ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table-collapsed-border-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table-collapsed-border-expected.txt

@@ -12,11 +12,6 @@
           "reason": "full"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 186, 102, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTable TABLE",
           "rect": [8, 96, 101, 76],
           "reason": "full"
@@ -32,11 +27,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 100, 93, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTableCell TD",
           "rect": [22, 316, 87, 28],
           "reason": "forced by layout"
@@ -68,36 +58,11 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 297, 77, 18],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 125, 77, 18],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 317, 51, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 145, 51, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 277, 43, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 105, 43, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 211, 34, 18],
           "reason": "layoutObject removal"
         },
@@ -115,16 +80,6 @@
           "object": "LayoutTableCell TD",
           "rect": [8, 124, 14, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 211, 4, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 125, 4, 18],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
deleted file mode 100644
index 854fbbba..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
+++ /dev/null

@@ -1,105 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 292, 106, 236],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 100, 106, 190],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 102, 106, 46],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 238],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 292, 102, 236],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 46],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 401, 46, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 162, 46, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 116, 46, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 67, 46, 18],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW1'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW2'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
deleted file mode 100644
index 38e29be..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 476],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 281, 63, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 91, 63, 18],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt
deleted file mode 100644
index 6d72cba..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/table/resize-table-row-repaint-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 193, 63, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 143, 63, 18],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.txt
index cb161c6..3fb2c8c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-match-document-change-expected.txt

@@ -17,11 +17,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [18, 128, 84, 18],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [295, 102, 15, 400],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-expected.png
index 98421ab3..d78af73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-horizontal-expected.png
index 98421ab3..d78af73 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.png
index 53ad973..5e2dcfa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.txt
index 989d7ec..374b4dd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/textarea-caret-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 135, 13],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [9, 24, 124, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/window-resize-vertical-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
index 244c8ab..f50e2d5c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/window-resize-vertical-writing-mode-expected.txt

@@ -17,11 +17,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 8, 897, 214],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [313, 0, 600, 500],
           "reason": "bounds change"
@@ -40,11 +35,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [491, 8, 414, 484],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [491, 8, 414, 484],
-          "reason": "forced by layout"
         }
       ]
     }
@@ -279,11 +269,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [-505, 8, 897, 214],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [0, 0, 400, 600],
           "reason": "bounds change"
@@ -297,11 +282,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [47, 8, 345, 584],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [47, 8, 345, 565],
-          "reason": "forced by layout"
         }
       ]
     }
@@ -371,16 +351,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [47, 8, 345, 584],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [447, 8, 345, 565],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [47, 8, 345, 565],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/circle-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/circle-with-shadow-expected.png
index d8eafe5..d51cc537 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/circle-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/circle-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
index 276c3a56..22c1fb3c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-expected.png
index 881865c..7516160 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-125-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-125-expected.png
index d248f5a..9188766 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-150-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-150-expected.png
index 5fd85964..eb9804a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-150-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-150-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-175-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-175-expected.png
index eae0784..404f3e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-175-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-175-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-200-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-200-expected.png
index 788e923..4f81ec8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-250-expected.png b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-250-expected.png
index 6f6d99ed..f0994d2e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-250-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/paint/spellmarkers/document-markers-zoom-250-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/plugins/embed-attributes-style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/plugins/embed-attributes-style-expected.png
index f5b17f2..0d81ea6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/plugins/embed-attributes-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/plugins/embed-attributes-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/absolute-position-headers-and-footers-expected.png
index 9f8ca794..fe6f0a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index 5dc3271..23a398c2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index c473e5b..cb43b0fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-expected.png
index 12212113..0ae1d7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index 678726f..59171956 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index fcee130f..8c837cc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/iframe-print-expected.png
index 7740cae..c15f760a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/mac/printing/list-item-with-empty-first-line-expected.png
index ba7a066b..da2c554 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/printing/list-item-with-empty-first-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/printing/list-item-with-empty-first-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
index 941a69b0..76a503b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
index bfe06b3..f31f0f5c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
index 1c2e46d638..66f96e10 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
index 8d1d47d2..f72dd0b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
index d01fe1c..2ca635a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
index 4edf68d..8deb5f350 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
index 07be1d9..db263b7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
index fab78c17..85d69f98 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
index 77c94e7..45cda7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
index 03963749..f72d6952 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
index 692a206..1d370a21 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
index 757a884..61bac7e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
index 98ab40a8..b544f61e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
index 01ef59b..95f52690 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
index 45804f9..e7e176c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
index d1389ad1..c5bded0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
index daf3c97..170abdd9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
index d859aff..a5cee88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
index 4ac6059..1b6842f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
index 17be018..05c2672 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
index ec741aed..3deef23 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
index 6ca3168..c03961d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
index d80b64f..677600e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
index 01c888b..7ba0cd47 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
index 9b882a9..de15750 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
index fd03f0f3..0c51a9b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
index 35a5ccae..4b7fa9c19 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
index edaa134a..d6a3acc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
index 961d57a..abe50d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
index 70a173e3..2bc98d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
index 96993247..faf1a57 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
index a54aa6d5..9a52755 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
index 0fa9c6c3..b0bbe6e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
index 301068eb..ed6a060 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
index 57489c47..80c2aac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
index d321b53c..46a7818 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
index 164ef3ce..d523a37e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
index f9cd58d1..aaf425b6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
index 980ded5..6e11829 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
index f3ec7e11..5a2cc8ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
index 6b149de2..a6c7461 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
index c93f6b08..4c3eaab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
index a8e3d54..3f684e76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
index d85db1d..4eaf9cea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
index 0daad49..fb254b32 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
index 7e593c00..d72d76a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
index 832cbf0..34301a8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
index c945e7b7..170d196e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
index 1526ab7..3a4b4eee 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
index a70ad59..7141de6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
index bb3b86f..4e6ff9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
index 338ee9d6..1dfefd31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
index 02404860..ba2bc70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
index 4c57806..bf8218ca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
index 89de076..6bf7fd8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
index 8ea61538..a272eb3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
index 7ea158a..0f3daf7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
index e9d1a42..2309453 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-path-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
index f47e6a1..1fd1b0f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
index 419240f..bb3da41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
index eda57774..3b3d97a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
index 6e7541f..2d945a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
index 3bb0acd3..ef7001e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
index f76577a..10a024c3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
index f79c9526..985f2274 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
index 017ce7c..c76e5f8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
index a6c1312b..29fac42 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
index e53ea38..915a376 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
index 213f3593..3e0f0ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
index 161b2d8..c8055d00 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
index 1e42336e..1ca62bb4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
index 87812ac7..ab3f99c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
index e8574aa..3bbeebc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
index ee88173..fd0cecca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
index 1e5e425..2685c96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
index 6221ca5..3475b0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
index bd00493e..ef4e2ae 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-09-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
index 1a352e1..2b10969 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-10-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
index db9c428..1cc17a14 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-12-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
index 619651c..afc30c2b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-14-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
index bb149c30..0194cbca 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-15-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
index 76c096f..b74f11d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
index e992daa..3f2862c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
index 5e9dfdb0..468d084f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
index bbc5cc43..f0e7c63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
index aaddaff..5f19578 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-04-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
index 6383aa0..b0d828e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
index fd1c3a6..074dffd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
index 3cd619b8..7f22de89 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
index 8af39a57..3b0969e3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
index 94b8acf..2bf02b7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
index b33dcfb..7406b4f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
index dbc0d04..148d3170 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
index 2fa93db..372bf44 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
index 621fd45..32d17037 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
index 4799726..181c3898 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
index 18944ae2..31c0c74f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
index 57fe2a01..1a612af1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
index 29a0971..b558b49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
index 5c804b60..7d162550 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
index e5b79da2..b062645 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
index d28a975..233c634 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
index ee4a511..418c2df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
index 20ab482..c7512360 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
index 5b75a28..1eaaf08 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
index 2af6ea6..cb00b67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
index fc94cda..3f5363a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
index 10a9a05..a9ddbced 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-01-b-expected.png
index 6dc9388..6e4d60a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-05-b-expected.png
index fcc9a960..104e4e1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
index 5ee70f027..52c36560 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
index 055721a..ace9922 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
index 250d0b2..73f0b35 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
index 6fabf49e..8343c31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
index 90a693e..45d6b9ab 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1a-expected.png
new file mode 100644
index 0000000..94655cfa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1c-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1c-expected.png
index b9020e5..2b327c6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/animations/animateMotion-accumulate-1c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
index 5482a85..62b12c827 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-1-expected.png
index e631bb3..29e18fc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-3-expected.png
index ec984687..1457ee0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-5-expected.png
index 5050dbd5..7f61959 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
index 055b35e..dd61e91 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-deviceScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-deviceScaleFactor-expected.png
index 937c0f6..e3a3593 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-deviceScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-deviceScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-pageScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-pageScaleFactor-expected.png
index 549d7a5..178ff07 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-pageScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/image-respects-pageScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png
index 4ca378f1..016a15f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png
index 35c0585..702ed33 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/as-image/img-preserveAspectRatio-support-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/filters/feTile-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/filters/feTile-expected.png
index df931d42..0009e7e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/filters/feTile-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/filters/feTile-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.png
index 7618ce27..ea31a717 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/masking/maskRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternPreserveAspectRatioA-expected.png
index c693bc1..7f77bd19 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternPreserveAspectRatioA-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-expected.png
index 39a3265..49c6c64 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.png
index eec679d..b057f85f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/paints/patternRegions-positioned-objects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/smallFonts-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/smallFonts-expected.png
index 73a28b9b..6dae93cd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/smallFonts-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/smallFonts-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textDecoration2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textDecoration2-expected.png
index 83fce44..0aeea9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textDecoration2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textDecoration2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textGlyphOrientationHorizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textGlyphOrientationHorizontal-expected.png
index baa1439..5ef74bec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textGlyphOrientationHorizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textGlyphOrientationHorizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textProperties-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textProperties-expected.png
index 1cdb683..b6927478 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textProperties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/textProperties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/verticalText-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/verticalText-expected.png
index 06347325..f1b3b9a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/verticalText-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/batik/text/verticalText-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/canvas/canvas-pattern-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/canvas/canvas-pattern-svg-expected.png
index 06a490a..e592392 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/canvas/canvas-pattern-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/canvas/canvas-pattern-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/button-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/button-expected.png
index 0af2167..a65be4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/colourpicker-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/colourpicker-expected.png
index 93b2ca0..8185bf0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/colourpicker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/colourpicker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/combobox-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/combobox-expected.png
index 060f274c..9521bea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/combobox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/combobox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png
index 0519cafbc..efdacda 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/selectionlist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/selectionlist-expected.png
index f70c376..95fae49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/selectionlist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/selectionlist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/slider-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/slider-expected.png
index ee46c32..d79a195 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/slider-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/carto.net/slider-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.png
index 62ff500..259c6ac0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-pixelation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-text-and-shape-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-text-and-shape-expected.png
index cfef10f..532c2f7c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-text-and-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-text-and-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-with-text-clipped-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-with-text-clipped-expected.png
index 3e0184e..3125766 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-with-text-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/clip-path-with-text-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
index 44cbc92..eb4c871 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-expected.png
index e90b13f..5a99916f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
index ffa7fc2..11c323f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/clone-element-with-animated-svg-properties-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/clone-element-with-animated-svg-properties-expected.png
index f02a711..57415d87 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/clone-element-with-animated-svg-properties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/clone-element-with-animated-svg-properties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/embedding-external-svgs-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/embedding-external-svgs-expected.png
index a05df87c..6bbda6f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/embedding-external-svgs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/embedding-external-svgs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/focus-ring-expected.png
index bbe6c9de..8bff88d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png
index af36fb5..a9433d85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/foreign-object-skew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
index 04d8d11..022d1ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
index 5e69eb2e..36e0fa2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
index 604199b..2559380 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/gradient-with-1d-boundingbox-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/gradient-with-1d-boundingbox-expected.png
index a2544cc..03ed7f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/gradient-with-1d-boundingbox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/gradient-with-1d-boundingbox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/inline-svg-in-xhtml-expected.png
index 52dfaaf2..767366be 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/inline-svg-in-xhtml-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/inline-svg-in-xhtml-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/invalid-css-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/invalid-css-expected.png
index db28383..1896a99 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/invalid-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/invalid-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
index 9a53e957..bebef96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-transform-expected.png
index d6bb55d..531c3f6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-expected.png
index b22ae64..28a1094 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-transform-expected.png
index 10ff3a5..6b13575 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewBox-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewTarget-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewTarget-expected.png
index 9a53e957..bebef96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewTarget-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-viewTarget-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-zoomAndPan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-zoomAndPan-expected.png
index 9a53e957..bebef96 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-zoomAndPan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-a-03-b-zoomAndPan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-uri-01-b-expected.png
index a682e266..d11230df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/marker-orient-auto-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/marker-orient-auto-expected.png
index d56dbfea..7827b95 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/marker-orient-auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/marker-orient-auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/masking-clipping-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/masking-clipping-hidpi-expected.png
index 51d8028..2724ab5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/masking-clipping-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/masking-clipping-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-expected.png
index a4d3a99..1565a3a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-standalone-expected.png
index a4d3a99..1565a3a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-container-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-expected.png
index 0a1b6748..6d550809 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-standalone-expected.png
index 0a1b6748..6d550809 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/mouse-move-on-svg-root-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-expected.png
index d6031c7..6f69cdc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-no-width-height-expected.png
index 4146d92..94f75519 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/object-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-incorrect-tiling-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-incorrect-tiling-expected.png
index 9d4d117..a29f3e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-incorrect-tiling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-incorrect-tiling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-expected.png
index c35b4ff..48d93c6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-gaps-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-gaps-expected.png
index 50b65f0..616082fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-gaps-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/pattern-rotate-gaps-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/preserve-aspect-ratio-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/preserve-aspect-ratio-syntax-expected.png
index 6351da7b..5035b7c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/preserve-aspect-ratio-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/preserve-aspect-ratio-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/second-inline-text-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/second-inline-text-expected.png
index a4897d8..5fead76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/second-inline-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/second-inline-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shape-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shape-rendering-expected.png
index eed7db6..95f7d3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shape-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shape-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shapes-supporting-markers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shapes-supporting-markers-expected.png
index dde97d3..5a054c0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shapes-supporting-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/shapes-supporting-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/stroke-width-large-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/stroke-width-large-expected.png
index a4c8e0e..94675f0fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/stroke-width-large-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/stroke-width-large-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-float-border-padding-expected.png
index 22a9c28..437a3fc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png
index 826684104..217243d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/text-match-highlight-expected.png
index 94b9d4e..0a321c31 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/transformed-outlines-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/transformed-outlines-expected.png
index dcf414dd..63d0770 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/transformed-outlines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/transformed-outlines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-container-in-target-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-container-in-target-expected.png
index ce893d8..c64db48 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-container-in-target-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-container-in-target-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-target-container-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-target-container-expected.png
index fa08c94..98ec159 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-target-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-modify-target-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-containing-use-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-containing-use-expected.png
index c55be057..88544205 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-containing-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-containing-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-expected.png
index d467926..c035241 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png
index d5d78e6..ede0b72 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-use-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-use-expected.png
index d467926..c035241 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-on-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-transform-expected.png
index 83153fe..9736e67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/use-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/viewbox-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/viewbox-syntax-expected.png
index 4ac9157d..c0f9c24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/custom/viewbox-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/custom/viewbox-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/dom/SVGLocatable-getCTM-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
index 60956c3..c66ceb5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/dom/css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/dom/css-transforms-expected.png
index a9bf8e51..35a25a6a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/dom/css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/dom/css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
index 57d8a3b..e054d28 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
index cbb69f0..778568c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
index 57d8a3b..e054d28 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
index cbb69f0..778568c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/error/017-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/error/017-expected.png
index 3426831..75aeece 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/error/017-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/error/017-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/003-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/003-expected.png
index fd00929..08881177 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png
index 65ff2ec..c94a668 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png
index dd4fd38d..de97a7e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png
index 65ff2ec..c94a668 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/mixed/011-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/001-expected.png
index 3e1b221..94ddc88d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/002-expected.png
index cede7b6..ca8fbeef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/005-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/005-expected.png
index d05eb05..2fe132e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/006-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/006-expected.png
index 4e03052..3d0a6ef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/007-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/007-expected.png
index f3fa3102..cde0750 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/perf/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
index 013bd1c..e5835c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/002-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
index 8e6cbd3..2a37475 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/in-html/circle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/in-html/circle-expected.png
index 17aa47d..53445a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/in-html/circle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/in-html/circle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/ligature-queries-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/ligature-queries-expected.png
index d12daa3..16cbc37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/ligature-queries-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/ligature-queries-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/small-fonts-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/small-fonts-3-expected.png
index 1cfe36d..9b48407 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/small-fonts-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/small-fonts-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-decorations-in-scaled-pattern-expected.png
index 95fffe2..3731470 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-decorations-in-scaled-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-decorations-in-scaled-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-fill-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-fill-opacity-expected.png
index 25b8f772..3a36db3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-fill-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-fill-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-01-b-expected.png
index 3b84fd95..360a42a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-05-b-expected.png
index 2066dfb..4876e79 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-deco-01-b-expected.png
index 3bba914..971ecde4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-path-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-path-01-b-expected.png
index b045bc1b..eb309d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-path-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-path-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-06-t-expected.png
index 921f8b2a..8695456 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-07-t-expected.png
index 460afc7..db95b2c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/text/text-selection-text-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-clip-path-expected.png
index cf58589..71b782d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-expected.png
index 10ee9ef4..2e7d10a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/svg-css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
index 9b44be9..144ceaef 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
index db474b4..3d30852 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.png
index bd0c2d99..8854798 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/transforms/text-with-pattern-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/wicd/test-scalable-background-image1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/wicd/test-scalable-background-image1-expected.png
index 8980b99b..cccccb8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/wicd/test-scalable-background-image1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/wicd/test-scalable-background-image1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png
index 1c715677..dc34385d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-background-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
index 8eac44b..110af49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png
index 086108c..63948fe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.png
index 05bf008..7c02d431 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
index 42ce0ff..6c815d0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-mask-with-percentages-expected.png
index 06b57c4..a037049 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-mask-with-percentages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.png
index fac8d3e..0134d38 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
index d81ad70..fdb37e3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
index d81ad70..fdb37e3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
index c58a04b..ce32847 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
index 0401af4..2be19f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
index 5ab9aead00..c0127e8b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.png
index 5806340..b1f243d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-svg-float-border-padding-expected.png
index 4c59c7fb..e753df4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/svg/zoom/text/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-1-expected.png
index 8f0ddcf9..4378422d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-2-expected.png
index cdbd44d..0f64476 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/layering/paint-test-layering-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10009-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10009-expected.png
index af1fc37..bfde4e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10036-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10036-expected.png
index c4dfdea..1d8aa00 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10036-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10036-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10039-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10039-expected.png
index 19e67bca..23ada1f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug10039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1055-1-expected.png
index 720a244e..6d9b217 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1055-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1055-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1067-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1067-2-expected.png
index 6e95661..dfd9a46 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1067-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1067-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug106816-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug106816-expected.png
index 7fdb9ba..cff21acf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug106816-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug106816-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug109043-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug109043-expected.png
index ecb79a3..8bd29c10 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug109043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug109043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-1-expected.png
index 6e2ad3f..c7f4f66a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-3-expected.png
index 394830f..b195eb3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug113235-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384q-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384q-expected.png
index ea4a764..06752bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384q-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384q-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384s-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384s-expected.png
index edf1199..089d9c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug11384s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1188-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1188-expected.png
index b584799..d945c22b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug119786-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug119786-expected.png
index 6895561..df3f863 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug119786-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug119786-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.png
index 20c4323..913832a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1224-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12384-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12384-expected.png
index 8a48005..f0f0ff1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12384-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12384-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1261-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1261-expected.png
index 49597451..88d3c445 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1261-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1261-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12908-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12908-1-expected.png
index 2e213c4..38329ea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12908-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12908-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12910-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12910-expected.png
index 60deea2..d536924c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12910-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug12910-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1302-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1302-expected.png
index 445a4bf..63ba50d4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1302-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1302-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug13118-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug13118-expected.png
index 249be9d4..6929a2e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug13118-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug13118-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug133756-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug133756-2-expected.png
index 8b0f618..46bee52 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug133756-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug133756-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug139524-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug139524-4-expected.png
index 4f9292a8..c1d897e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug139524-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug139524-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14323-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14323-expected.png
index 5eea428..1f2c2416c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14323-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14323-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1474-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1474-expected.png
index 87854048..b113e07 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1474-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1474-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.png
index 973363d5..9a96549 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug14929-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.png
index 9626dbdb..45b25a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug16252-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17168-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17168-expected.png
index 6185a553..e55f3e94 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17168-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17168-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17548-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17548-expected.png
index 9cc385a..317d1738 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17548-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17548-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17587-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17587-expected.png
index 5260f71a..adeb0a20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17587-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug17587-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1800-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1800-expected.png
index f09a07d..d44929e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1800-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1800-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802-expected.png
index ebaf9f46..99c9716 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802s-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802s-expected.png
index ebaf9f46..99c9716 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1802s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1809-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1809-expected.png
index af1fc37..bfde4e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1809-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1809-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1828-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1828-expected.png
index 69b7e6f..901bb9d5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1828-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug1828-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18359-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18359-expected.png
index 494bbbd6..7bd0345 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18359-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18359-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18558-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18558-expected.png
index 09730ee..3fdcb70 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18558-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18558-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18955-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18955-expected.png
index f90f230..b5ea39a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18955-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug18955-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug19599-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug19599-expected.png
index 49e0b09..755a7d9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug19599-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug19599-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2065-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2065-expected.png
index 2261108b0..ba3c3000 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2065-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2065-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug20804-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug20804-expected.png
index c02a2c6..a494e94 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug20804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug20804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21299-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21299-expected.png
index e0adeb3..f90751e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21299-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21299-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21918-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21918-expected.png
index d2ff223..07b2c11 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21918-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug21918-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug220536-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug220536-expected.png
index ff08cba..34a3014 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug220536-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug220536-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug221784-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug221784-1-expected.png
index 2638829..3de5141 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug221784-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug221784-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2-expected.png
index acbe35b..996d4734 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2a-expected.png
index acbe35b..996d4734 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-2a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3-expected.png
index 9c2c69c..55d115b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3a-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3a-expected.png
index 9c2c69c..55d115b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug22246-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2267-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2267-expected.png
index 9bed117..0e17f17 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2267-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2267-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2296-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2296-expected.png
index 3200432..0acd8c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2296-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2296-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug23235-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug23235-expected.png
index dd0eb6d2..ca30612b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug23235-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug23235-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24503-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24503-expected.png
index 005f86f..940cb1d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24503-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24503-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24627-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24627-expected.png
index 95bcf3f64..1fd77177 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24627-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24627-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24661-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24661-expected.png
index 4fd76272..99f89ec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24661-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24661-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2479-3-expected.png
index 7f28df9..325e09d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2479-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2479-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24880-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24880-expected.png
index dba74a6..de127116 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24880-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug24880-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug25004-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug25004-expected.png
index af1fc37..bfde4e5e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug25004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug25004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.png
index 0727636..0795e0e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2516-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2585-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2585-expected.png
index 4768f82..ed97af3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2585-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2585-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2684-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2684-expected.png
index c586d8fd..8648a51b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2684-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2684-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27038-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27038-2-expected.png
index 97eae43..b90e655 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27038-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27038-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2757-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2757-expected.png
index 6df1507..2491a63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2757-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2757-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2773-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2773-expected.png
index c586d8fd..8648a51b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2773-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2773-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27993-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27993-1-expected.png
index 564ea69..0635f4c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27993-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug27993-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2886-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2886-expected.png
index f2132df8..99dc81b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2886-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug2886-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug28928-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug28928-expected.png
index 05d99e5..9be97bc9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug28928-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug28928-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29058-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29058-1-expected.png
index bb0d484..9d360d8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29058-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29058-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29157-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29157-expected.png
index 9b72e55..e08a2a1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29157-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug29157-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30273-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30273-expected.png
index c2e8685b..0638cd91 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30273-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30273-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-1-expected.png
index 52e28dfd..bf531f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-2-expected.png
index 52e28dfd..bf531f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30332-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30418-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30418-expected.png
index 6f9f61b5..ba20260 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30418-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30418-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30692-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30692-expected.png
index 69519e2b..723437da 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30692-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug30692-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3191-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3191-expected.png
index 3e96756..fa3c274 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3191-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3191-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-2-expected.png
index 942920f3..a3918803 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-5-expected.png
index ebb2a6d..7882c9d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32205-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3260-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3260-expected.png
index 9cd0dd46d..c24ea786 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3260-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3260-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3263-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3263-expected.png
index aab60ee..efcf032 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3263-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3263-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32841-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32841-expected.png
index d05a4c7f..4ddb374 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32841-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug32841-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3309-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3309-2-expected.png
index 3d41ad8b..02d6fd0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3309-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3309-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug33137-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug33137-expected.png
index 3042ac1..abb1704 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug33137-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug33137-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug34176-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug34176-expected.png
index 4dafcc0..d71644b9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3454-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3454-expected.png
index 56cfdcc..30a8b66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3454-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3454-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug35662-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug35662-expected.png
index 930dfe3a..68d5970 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug35662-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug35662-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3718-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3718-expected.png
index fed37346..9cec7a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3718-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3718-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug39209-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug39209-expected.png
index 4d5055c..e41f46d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug39209-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug39209-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.png
index bb7f3a7..a0dc55c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42187-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42187-expected.png
index c5b98d88..4e0f137d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42187-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42187-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42443-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42443-expected.png
index 4f26b259..205d446a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42443-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug42443-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4284-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4284-expected.png
index 9df8a1d..8a86a2b5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4284-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4284-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4385-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4385-expected.png
index 76e0e8a..e9117326 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4385-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4385-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.png
index a63dc18..9d251a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug43854-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.png
index b1ccfdb..1801958 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4427-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4429-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4429-expected.png
index 51fa728..960233a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4429-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4429-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44505-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44505-expected.png
index add1937..e23513f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44505-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44505-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44523-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44523-expected.png
index 0472e8c0..c0422e42 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug44523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4501-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4501-expected.png
index e3625b09..32c429c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4501-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4501-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4520-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4520-expected.png
index 337ba24..c70db85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4520-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4520-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4523-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4523-expected.png
index a17aa5e..7646e424 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug45486-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug45486-expected.png
index 7d12263..8d6f560 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug45486-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug45486-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4576-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4576-expected.png
index c015db5..8e0edb7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4576-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug4576-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-1-expected.png
index 74517fc4..0f9b773 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-2-expected.png
index 74517fc4..0f9b773 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-3-expected.png
index 1d6d3a8..a1e602f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-5-expected.png
index 51dbb30..584ac90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-expected.png
index 51dbb30..584ac90 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46268-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46924-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46924-expected.png
index 0cdc635e..f22a99b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46924-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46924-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46944-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46944-expected.png
index e0ff6a1..3b50e67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46944-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug46944-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug47432-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug47432-expected.png
index 9b2cccbf..ef920114 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug47432-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug47432-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-1-expected.png
index 61d9d35..41a9a402 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-2-expected.png
index d46c474..33852df 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug48028-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51037-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51037-expected.png
index b5e3141..c7e38c02 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51037-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51037-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51140-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51140-expected.png
index b606389..0dd0ddc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51140-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug51140-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5188-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5188-expected.png
index ae50b65..94424c4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-1-expected.png
index eb457487..0accfda7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-2-expected.png
index 412fc67..f75adb8a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug53690-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug54450-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug54450-expected.png
index 16f8264..6784d3df58 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug54450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug54450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug55694-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug55694-expected.png
index 3efd6cd..2e94052 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug55694-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug55694-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56201-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56201-expected.png
index db897a7..33e4864f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56201-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56201-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.png
index 53eb67b6c..0b77035 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug56563-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57300-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57300-expected.png
index 3a4d9eea..1580a6e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57300-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57300-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57378-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57378-expected.png
index 4725c6d2..1dcf839 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57378-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug57378-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.png
index e4ff7674..ad73a6c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5797-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5799-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5799-expected.png
index cbe90c1..af6ed8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5799-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5799-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.png
index 4da8f02..04615f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5838-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5838-expected.png
index 2b3a6bc..b4e6987 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5838-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug5838-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug58402-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug58402-1-expected.png
index 1091d1e73..6b98109d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug58402-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug58402-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug59354-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug59354-expected.png
index 4a64b34..a5e8a71 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug59354-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug59354-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60013-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60013-expected.png
index 46b1d7d8..eb6f364 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60013-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60013-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60749-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60749-expected.png
index 134301e..0c046792 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60749-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60749-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60804-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60804-expected.png
index a636ff76..8a56ae9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60807-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60807-expected.png
index a636ff76..8a56ae9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60807-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60807-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60992-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60992-expected.png
index b0d9e58..6f59d37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60992-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug60992-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6184-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6184-expected.png
index daa351c3..3aa8c6d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6184-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6184-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6304-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6304-expected.png
index ee52004..a1165d7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6304-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6304-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug647-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug647-expected.png
index 94ea09eb..f4640a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6674-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6674-expected.png
index c56d551..7a71d582 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6674-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug6674-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug68998-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug68998-expected.png
index 40dfedf..021b5975 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug68998-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug68998-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-1-expected.png
index 1a4bd1e..4e8c059 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-2-expected.png
index 2115b65..6bd1d53 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug69382-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-1-expected.png
index 9e58cf2..80c7244 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-2-expected.png
index 665c59b..b826ce3b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7112-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7121-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7121-1-expected.png
index a392e78..c764389 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7121-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7121-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug727-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug727-expected.png
index 229db6c..fb98cc5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug727-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug727-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7342-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7342-expected.png
index e10d93b0..1468154f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7342-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7342-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7471-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7471-expected.png
index e44d2a9..b126ac9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7471-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7471-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7714-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7714-expected.png
index 3ced7306..94520b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7714-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug7714-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug81934-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug81934-expected.png
index 4423ec10..69f38d92 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug81934-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug81934-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-1-expected.png
index 63cca03..cd1a0bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug82946-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8381-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8381-expected.png
index fddd3d21..bcc7ecf8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8381-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8381-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug86708-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug86708-expected.png
index dd2d45a5..ef117ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug86708-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug86708-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8950-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8950-expected.png
index c9e80db..1a22366 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8950-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug8950-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-1-expected.png
index 24d9bc96..893c4263 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-2-expected.png
index 87428ea9..0facc7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9123-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug92647-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug92647-2-expected.png
index f8511767..55015920 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug92647-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug92647-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9271-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9271-1-expected.png
index de01935..7e672bdf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9271-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9271-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug965-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug965-expected.png
index fb227ca..79b4e9ec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug965-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug965-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9879-1-expected.png
index 1ba6f028..6093160 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/bloomberg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/bloomberg-expected.png
index c92842c6..d30f0a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/bloomberg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/bloomberg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/borders-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/borders-expected.png
index d24a7b7..c9f5fa63 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_span-expected.png
index 7939aa47..cc91ed41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_auto-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_auto-expected.png
index 4b836dd..0e4916c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFix-expected.png
index 36c4292..27739298 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
index aab3cd83..1a55a4a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoPer-expected.png
index 4749107..57b8c8f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fix-expected.png
index a82e295..e4edaf5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fixPer-expected.png
index 47f97b02..b4b7f8c3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_per-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_per-expected.png
index afe7c48..70a0f10 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_auto_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_auto-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_auto-expected.png
index 4283b9f..9e010bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoFix-expected.png
index 5fc5c115..ffa49623 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoPer-expected.png
index c6b70a7..f0c25cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fix-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fix-expected.png
index 488629f..4dc36fc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fixPer-expected.png
index 17abd4a3..c5330746 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_per-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_per-expected.png
index db3c0dd1..b4475f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/col_widths_fix_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/margins-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/margins-expected.png
index 8828325..b23a51b2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/margins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/margins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/misc-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/misc-expected.png
index bcfb66cd..d8647a62 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/misc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/misc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.png
index 9470ff4..4c87b494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/nested1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/one_row-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/one_row-expected.png
index 121cfb7c..8b00c83d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/one_row-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/one_row-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/row_span-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/row_span-expected.png
index 18d35a1..e7dae85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/row_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/row_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_frame-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_frame-expected.png
index d9141a39..876b9c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_frame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_frame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_widths-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_widths-expected.png
index b4429b1..86acfba2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/core/table_widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendCol2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendCol2-expected.png
index 29e4bd1..5ac6aa8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendRowsExpand1-expected.png
index 6f54534..2deb816 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendTbodyExpand1-expected.png
index 667b80ba..9ee438b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/appendTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsRebuild1-expected.png
index 7e953b95..f05e44f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink1-expected.png
index 688ba1b6..36c66ee4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink2-expected.png
index aa4a6a88..67ed99a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCellsShrink2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol1-expected.png
index 32d0947..b7ba253 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol2-expected.png
index 2334900..b4f82c9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol3-expected.png
index b26d43e..f77789ba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteCol3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup1-expected.png
index bcea199..13b7277 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup2-expected.png
index 3500a17..4c94549c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteColGroup2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsRebuild1-expected.png
index 89f8a9a..ec7d576 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsShrink1-expected.png
index 89f8a9a..ec7d576 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteRowsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyExpand1-expected.png
index 3a3da82..5a3995d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
index 6f72edd..617e914 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand1-expected.png
index bd3ac26..170570e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand2-expected.png
index b3bb82a..91f6f49 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsExpand2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild1-expected.png
index 552d6ff..12b7f871 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild2-expected.png
index 788aa4c..d21eac6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCellsRebuild2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups1-expected.png
index bc690fdc..900e5f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups2-expected.png
index 68c54409..169dfdd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertColGroups2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols1-expected.png
index bc690fdc..900e5f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols2-expected.png
index bc690fdc..900e5f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols3-expected.png
index 68c54409..169dfdd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols4-expected.png
index bc690fdc..900e5f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols5-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols5-expected.png
index bc690fdc..900e5f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertCols5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsExpand1-expected.png
index 9476fb5..c1e4849 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsRebuild1-expected.png
index fc8047e..1a70064 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/insertRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/tableDom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/tableDom-expected.png
index c1b1e48..58e6a13 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/tableDom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/dom/tableDom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.png
index f196458..e97060d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/col_span-expected.png
index 8c0b83b1..c470566b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_center-expected.png
index 3e68226..96e8baa1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_justify-expected.png
index cae87746..ed3bf66 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_left-expected.png
index be380aa..27503591 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_right-expected.png
index 13e028c..25f6a4d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_span-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_span-expected.png
index 2d3ff50..cec976c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_pct-expected.png
index fec0e979..529d1cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_px-expected.png
index a3b0f91..9b5117f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_border-expected.png
index eca2e8d..d38feac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_box-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_box-expected.png
index eca2e8d..d38feac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_frame_box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_overflow_hidden_td-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
index 387d65a..f4071d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_center-expected.png
index bc44d39..bde4e92 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_left-expected.png
index 295716f..fa41d02 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_right-expected.png
index ecbef2b..519edb9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/table_row_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
index 347ef5e..22ea7268 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
index 347ef5e..22ea7268 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black-expected.png
index aafe82b..f85399a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
index aafe82b..f85399a0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
index 6fdc9c0..b11ec15 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
index 6fdc9c0..b11ec15 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
index 2d2c597..08b5d210 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
index 2d2c597..08b5d210 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
index 13422337..d99a804 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
index 13422337..d99a804 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green-expected.png
index c61d898..b2b24a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
index c61d898..b2b24a4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
index 28d720a..e7345bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
index 28d720a..e7345bd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
index dc1e9cd..7e86150 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
index dc1e9cd..7e86150 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
index d722d43e..9544320 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
index d722d43e..9544320 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
index add4b9b..604ece3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
index add4b9b..604ece3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
index 1d8f982d..cf65720 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
index 1d8f982d..cf65720 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red-expected.png
index 8d421ea..c60de04 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
index 8d421ea..c60de04 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
index be1bee5..d165c6a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
index be1bee5..d165c6a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
index 1d8d513c..8fee5214 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
index 1d8d513c..8fee5214 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white-expected.png
index 76a1f075..63efa6ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
index 76a1f075..63efa6ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
index c446e3d..035ff32 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
index c446e3d..035ff32 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_1-expected.png
index 0a63ac9..9058f8a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_2-expected.png
index ebd459dc..7b28950 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_3-expected.png
index 932f859..a05bb41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_border_3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_bot-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_bot-expected.png
index 7df8227..2144646 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_bot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_bot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_top-expected.png
index b77bd3a..6f5306f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding-expected.png
index 6429ba1..f0aa79aa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding_pct-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
index cc81840..1a6ee83 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_id-expected.png
index d02e8c26c..2d0cf24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_row_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
index e29291b..6f0d19e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_center-expected.png
index 6e084db..b76ee3c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_left-expected.png
index 7cb0768..c7acaed2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_right-expected.png
index 151732d..f3eed7ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_colspan-expected.png
index 94e8e20..c5fd677 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_height-expected.png
index 904cfcc..5585159 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_nowrap-expected.png
index 09fb6cb..fcc29648 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_rowspan-expected.png
index f114b4ae..b09057b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_width-expected.png
index 2237959..80ad035 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_center-expected.png
index 88157cc6..bf79a6c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_left-expected.png
index ec5ae61..8a466249 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_right-expected.png
index d17e888..2857e9f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_colspan-expected.png
index 1ec5c746..fac7c3dc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_height-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_height-expected.png
index fd1d952..85856be 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_rowspan-expected.png
index 38094171..b1d1dba 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_width-expected.png
index 2587408..7796fa2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tables_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_center-expected.png
index 2f25118..ef03781 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_char-expected.png
index 2d15b19b..d451795 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_justify-expected.png
index 3ba7083..c0b63bc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_left-expected.png
index 4c76e017..5f42e32 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_right-expected.png
index e7f03e7..eb3204a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_char-expected.png
index eb561be5..011fadf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_baseline-expected.png
index 505d14e7..4cfe0599 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_bottom-expected.png
index 3c4dfa7..24295db6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_middle-expected.png
index c5ed22f..3724391 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_top-expected.png
index 1431c36..95604316 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_center-expected.png
index 1206f64..34520066 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_char-expected.png
index 4efe6fe..cb6ff42a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_justify-expected.png
index cfef9d7..dcc8f000 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_left-expected.png
index bd89af36..5353122 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_right-expected.png
index f353693..6d8f073 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_char-expected.png
index d598a95..7785426b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
index 6555588e..927f3a6c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
index d5b3fbb7..94545919 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_middle-expected.png
index 534373b..eb9c19d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_top-expected.png
index eed65d48..20c4f73d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_center-expected.png
index 9073a658..888f66f5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_char-expected.png
index 4428b92..389dd33 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_justify-expected.png
index b2aff51..db968e5a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_left-expected.png
index 069777c5..9284305 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_right-expected.png
index 267955f2..ba491d3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_char-expected.png
index a288faf..a7fd57e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_baseline-expected.png
index 5f2e957..7d14c74 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_bottom-expected.png
index 34ae8be..ff79ada9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_middle-expected.png
index be78f98..89057c7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_top-expected.png
index a8f07459..bb0b4b1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
index 340038ba..39001a60 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black-expected.png
index 5a46fbb..e3164e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
index 5a46fbb..e3164e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
index 9093373..ebef4019 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
index 9093373..ebef4019 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
index e796ccfc..6615818 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
index e796ccfc..6615818 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
index 3c18382..fa0d8a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
index 3c18382..fa0d8a9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green-expected.png
index e24c614..6396442f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
index e24c614..6396442f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
index 21dd292..9517023 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
index 21dd292..9517023 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
index 40c0324..0a413f21 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
index 40c0324..0a413f21 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
index bf20d7af..9c994eaa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
index bf20d7af..9c994eaa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
index 21743562..7ae09153 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
index 21743562..7ae09153 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
index b253183..de52d752 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
index b253183..de52d752 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red-expected.png
index d8698fe..467ca2a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
index d8698fe..467ca2a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
index c0b5d271..c308737 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
index c0b5d271..c308737 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
index 90283ab8..a8567494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
index 90283ab8..a8567494 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white-expected.png
index 9ae80db..4f83cac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
index 9ae80db..4f83cac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
index c525bed..3d88a8b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
index c525bed..3d88a8b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_bottom-expected.png
index e7776d4..3d34770 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_top-expected.png
index 71a664b..cc9088e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_class-expected.png
index a1a2d73..e0f7f20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_id-expected.png
index a1a2d73..e0f7f20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_style-expected.png
index a1a2d73..e0f7f20 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_caption_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_center-expected.png
index 07d7d35..901371b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_char-expected.png
index 76a8b10..2ac4a37 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_left-expected.png
index c9815a7..158d8797 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_right-expected.png
index 53cc83f..8383c7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_col_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_center-expected.png
index 07d7d35..901371b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_char-expected.png
index 01edea02..b743f6a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_left-expected.png
index c9815a7..158d8797 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_right-expected.png
index 53cc83f..8383c7b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_center-expected.png
index 0bd6d01..511a720 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.png
index 32d121f..89bca14 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.png
index bdb6c00c..5c114f7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
index 6d5eaf73..89fe643d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
index 6d5eaf73..89fe643d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border-expected.png
index 04c4fb4..5f15dfd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border_px-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border_px-expected.png
index 105bf3a7..cbbe7f2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_border_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing-expected.png
index 8cd33d7d..2841e57 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
index 4c5849f4..4015963e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_pct-expected.png
index 4dca58e..18302d8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_px-expected.png
index ab45e4e4..36b372f9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_table_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_center-expected.png
index c790892..517930c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_char-expected.png
index 15284ba3..9347209 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png
index e22d15b..f529bd7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_left-expected.png
index 51ed6f0..fd7677d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_right-expected.png
index 2cc3274e..6ae01dc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_class-expected.png
index eb720b1..eece3944 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_id-expected.png
index eb720b1..eece3944 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_style-expected.png
index eb720b1..eece3944 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
index 50f224cf..7e6c9ea5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
index 8632d70..85416caf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
index 214a5133..2251819 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_top-expected.png
index 508b3e8..f7554d05c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_center-expected.png
index a3e4afc..4840d4f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_char-expected.png
index b222415b..ff03c0d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_left-expected.png
index dbf8043..415cfc67 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_right-expected.png
index 934c1d2e..cb9fefa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
index 0414bcf..fed419b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
index 0414bcf..fed419b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_class-expected.png
index ee2b8598..fd6f9f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_colspan-expected.png
index 617b5a9..5b8cf80 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_id-expected.png
index ee2b8598..fd6f9f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.png
index 26205fee..645a67e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_rowspan-expected.png
index a90a13fb..5733dbd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_style-expected.png
index ee2b8598..fd6f9f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_width-expected.png
index 3a01f1d..28f0fc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_center-expected.png
index a054c2b..588619b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_char-expected.png
index 3ea4177..8c7581b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
index 6bcd6b3..d83e1c1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_left-expected.png
index 62b635d..d39823a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_right-expected.png
index c28a081..a26f3788 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_class-expected.png
index b814aae4..1a0364cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_id-expected.png
index b814aae4..1a0364cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_style-expected.png
index b814aae4..1a0364cf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
index afeb8be..33f4cbb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
index fcefcdb..f8c2058fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
index fe47230..77f623f4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
index dfab13a3..8fc42885 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_center-expected.png
index ec54aa1..8d1ff0b4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_char-expected.png
index 80468d0..d27ce9e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_left-expected.png
index 991d1df..dc78dd8a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_right-expected.png
index afa8ad0..c912f84 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
index d3913f91..eb474a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
index d3913f91..eb474a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_class-expected.png
index 0826410bc..2a1f691 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_colspan-expected.png
index 87c89e3..ee078e4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_id-expected.png
index 0826410bc..2a1f691 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.png
index 713b745..257fe0a3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_rowspan-expected.png
index a030826..5337d58 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_style-expected.png
index 0826410bc..2a1f691 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_width-expected.png
index d86a3c12..4eebffa 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_center-expected.png
index ff7b09d..efec7e18 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_char-expected.png
index 66d436bb0..c790b30 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png
index c08fae9..5be6c5ff 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_left-expected.png
index f922e3f..a8c0c3c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_right-expected.png
index c4d511a..bbdbbac 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_class-expected.png
index d643a003..ec6ad78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_id-expected.png
index d643a003..ec6ad78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_style-expected.png
index d643a003..ec6ad78 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
index 1437f99..3cc8278 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
index 1570e64..cb644f1 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_middle-expected.png
index bee600f..61362d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_top-expected.png
index b7b78799..814f0a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_center-expected.png
index e32dda6..4742974 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_char-expected.png
index b222415b..ff03c0d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_left-expected.png
index 6c218e9..3deef619 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_right-expected.png
index cc534194..5e23486 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
index 0414bcf..fed419b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
index 0414bcf..fed419b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_class-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_class-expected.png
index 2d9104a..57e01ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_id-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_id-expected.png
index 2d9104a..57e01ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_style-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_style-expected.png
index 2d9104a..57e01ce 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/marvin/x_tr_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.png
index f196458..e97060d2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/cellspacing-expected.png
index 5d2dc9e..aedc210 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/nestedTables-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/nestedTables-expected.png
index ec4dfab6..782d724 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/nestedTables-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/nestedTables-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test3-expected.png
index b9171c2..02e2d6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test6-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test6-expected.png
index 0e5bd2b2..3d3b6c5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/test6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
index 13cdd16..0edb31b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.png
index f90d4d2..2ad1279 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/other/wa_table_tr_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/97619-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/97619-expected.png
index 403373f..dafdaa0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/97619-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/97619-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1010-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1010-expected.png
index a3dc834..aa51105 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.png
index 8ef166f..1982d0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug10216-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1128-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1128-expected.png
index 381db84..fc3fd5b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1128-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1128-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1164-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1164-expected.png
index 5078c09..0fb91e7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1164-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1164-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug11945-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug11945-expected.png
index b032584b..124ce8e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug11945-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug11945-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1262-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1262-expected.png
index d2a5c75..20620fe 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1262-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1262-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
index a41c957..f3a73cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1647-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1647-expected.png
index bcc4cc2..c02b7a3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug18770-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug18770-expected.png
index 1e649c93..4e45e3d6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug18770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug18770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug21518-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug21518-expected.png
index d676d33..fa03730 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug21518-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug21518-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png
index 3a8669f..6ca528e06 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug220653-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug22122-expected.png
index 8fe0886..51bbdb4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug22122-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug22122-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug23847-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug23847-expected.png
index bbc67351..360227f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug23847-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug23847-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
index dba74a6..de127116 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
index 564ea69..0635f4c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
index a2f71d25..df75c88 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug3105-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug3105-expected.png
index 3a92346..28711bf 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug3105-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug3105-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
index 0a139ee..1f53ca7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug42043-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug42043-expected.png
index d248b1d..6f03c3e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug42043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug42043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug4294-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug4294-expected.png
index 3a93fda..1272b3f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug4294-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug4294-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
index 81a7733..cd93bea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug51000-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug51000-expected.png
index 8aea596..dccca85 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug51000-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug51000-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
index 74e83646..70f68db 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
index 6c9d2b4d..286ce3fea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
index 6c9d2b4d..286ce3fea 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug65372-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug65372-expected.png
index ca358709..5311102 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug65372-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug65372-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
index 7d336de..a01e450 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7113-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7113-expected.png
index d79d7265..4bb1539 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7113-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7113-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug72393-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug72393-expected.png
index 7ace76b..44caa77 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug72393-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug72393-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7243-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7243-expected.png
index cc683ed..e646952 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7243-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug7243-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug73629-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug73629-expected.png
index d43584f..da3ccd3 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug73629-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug73629-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
index 3eb039e..bdeccf9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug8499-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug8499-expected.png
index ec5c29a..708ec57 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug8499-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug8499-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
index b42526bb..311fb3f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
index 1ba6f028..6093160 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/backgrounds-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/backgrounds-expected.png
index 9772ccc2..86efb8e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/backgrounds-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/backgrounds-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/col_span2-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/col_span2-expected.png
index a43321c..6aa45add 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/col_span2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/col_span2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/cols1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/cols1-expected.png
index 81fbe60..47cb7e9 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/cols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/cols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/columns-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/columns-expected.png
index cc971e0..43f79dfd 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/columns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/columns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.png
index 66621f17..ffd6b24 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/core/conflicts-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCells1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCells1-expected.png
index d3190bb..5145cf8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCells1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCells1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
index 49429cac..eee7e39 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCol1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCol1-expected.png
index 29e4bd1..5ac6aa8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
index 37a08d7c..3986b41 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
index 8a4a7df..9aa002a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
index 8a4a7df..9aa002a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index 643731e..a62c20d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
index 213bc0a..f79a813 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
index da4e4d77..576c426 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
index 5dc172f..cedb528 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
index 87057a3..8dd7127 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
index 49037e1..f45315d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
index b561bb0..33125822 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
index 71eac32a..c3ee4a33 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
index f454aa58..bebcaa8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
index 7198f7f..7637c6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
index 7198f7f..7637c6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
index 0ec4705..1158211 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
index 576b68d..af1c8d3d 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
index 1652418..ce31112 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
index db3e469..df6a90c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
index 0810869..081d006 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
index fb4da3f..714261bf53 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.png
index f1efd0b..80485e6b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/empty_cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.png b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.png
index e0810c3..6980e83b 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/compound-transforms-vs-containers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/compound-transforms-vs-containers-expected.png
index 799aec9..17964d65 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/compound-transforms-vs-containers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/compound-transforms-vs-containers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/hindi-rotated-expected.png
index 70ae9e2e..242acb3c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/zoom-menulist-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/zoom-menulist-expected.png
index 6c6c99b3..8b14635 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/zoom-menulist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/2d/zoom-menulist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/diamond-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/diamond-expected.png
index 26ddbc4..d17f2e0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/diamond-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/diamond-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/matrix-01-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/matrix-01-expected.png
deleted file mode 100644
index 88d647e..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/matrix-01-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/shadows-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/shadows-expected.png
index 1c394da..d5d82059 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/skew-with-unitless-zero-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/skew-with-unitless-zero-expected.png
index 04a94953..e4ee6e5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/skew-with-unitless-zero-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/skew-with-unitless-zero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/svg-vs-css-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/svg-vs-css-expected.png
index 9575f00d..e4dffb4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/svg-vs-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/svg-vs-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-caret-expected.png
index af2f399..b614b671 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-focused-text-input-expected.png b/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-focused-text-input-expected.png
index 2355c54..03b51e2a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-focused-text-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/transforms/transformed-focused-text-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/4776765-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/4776765-expected.png
new file mode 100644
index 0000000..a1cd523
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/4776765-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/block-no-inflow-children-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt
new file mode 100644
index 0000000..31a9bed
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt

@@ -0,0 +1,73 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [40, 103, 113, 29],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [40, 103, 113, 29],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [8, 103, 113, 29],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 103, 113, 29],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 84, 32, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='foo'",
+          "rect": [8, 84, 32, 32],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='foo'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow H2",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'Chromium'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-3509-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt
new file mode 100644
index 0000000..5cc04b3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 130, 784, 66],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 178, 36, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 148, 36, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='d'",
+          "rect": [8, 145, 4, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 145, 4, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 130, 4, 18],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='d'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-6278-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-6473-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/bugzilla-7235-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
new file mode 100644
index 0000000..2617d24
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
new file mode 100644
index 0000000..4359ac3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-contenteditable-content-after-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-contenteditable-content-after-expected.png
new file mode 100644
index 0000000..4f0f54f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-contenteditable-content-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png
new file mode 100644
index 0000000..cacf24b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-composited-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
new file mode 100644
index 0000000..20dda80ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/change-text-content-and-background-color-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/clip-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/clip-with-layout-delta-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
new file mode 100644
index 0000000..41dcc45
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt
new file mode 100644
index 0000000..d47cae3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt

@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='details-content'",
+          "rect": [8, 68, 784, 19],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTextControl INPUT",
+          "rect": [8, 68, 131, 19],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 71, 125, 13],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutDetailsMarker DIV id='details-marker'",
+          "rect": [8, 53, 11, 11],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutDetailsMarker DIV id='details-marker'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='details-content'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTextControl INPUT",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
new file mode 100644
index 0000000..14823fd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
new file mode 100644
index 0000000..14823fd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-enable-continuations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-enable-continuations-expected.png
new file mode 100644
index 0000000..5dd5209
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-enable-continuations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-layers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-layers-expected.png
new file mode 100644
index 0000000..24bd464c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-ring-expected.png
new file mode 100644
index 0000000..578ebb2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/gradients-em-stops-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
new file mode 100644
index 0000000..9746f74
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt
new file mode 100644
index 0000000..4579293
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 68, 37, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 68, 37, 18],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.png
new file mode 100644
index 0000000..8be258d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt
new file mode 100644
index 0000000..a5a4698
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt

@@ -0,0 +1,76 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 34, 800, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [0, 0, 800, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 34, 429, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A id='link'",
+          "rect": [581, -5, 224, 242],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 40, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A id='link'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Home'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'crbug.com/424078: ensure inline elements get their outline painted'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
new file mode 100644
index 0000000..c47aa32
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 8, 29, 23],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 29, 18],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Text'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-caret-before-text-node-update-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
index 4a30daf..b851974e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidate-caret-before-text-node-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
new file mode 100644
index 0000000..5516cd9f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -0,0 +1,161 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 2350],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2045, 774, 109],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2045, 774, 109],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2195, 653, 109],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2195, 653, 109],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
new file mode 100644
index 0000000..88e00e59
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
new file mode 100644
index 0000000..a120c5e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
new file mode 100644
index 0000000..a120c5e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-relative-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset2-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset2-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset3-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/layout-state-scrolloffset3-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..038883fd6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -0,0 +1,103 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 40, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 220, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 200, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN",
+          "rect": [8, 120, 100, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 220, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 220, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 200, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 200, 100, 100],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'x'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt
new file mode 100644
index 0000000..5d7f4e0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -0,0 +1,124 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 242, 406, 126],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 368, 304, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [178, 350, 145, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 353, 48, 65],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [27, 353, 22, 19],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the hedgehog'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'way wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'that it was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'foo'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt
new file mode 100644
index 0000000..ca84a18
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -0,0 +1,296 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 74, 418, 498],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 242, 406, 126],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 188, 406, 72],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 404, 355, 72],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 368, 355, 54],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 404, 355, 36],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 80, 354, 108],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 368, 336, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 368, 304, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [178, 350, 145, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [127, 350, 145, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 353, 48, 65],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 188, 40, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The chief difficulty Alice found at first was in'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'managing her\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'flamingo: she succeeded in getting its'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'body tucked away,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'comfortably enough, under her'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'arm, with its legs hanging down,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'but generally, just as'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she had got its neck nicely straightened\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'out, and was'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'going to give the hedgehog a blow with its head, it'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'would'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' twist itself round and look up in her face, with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'such a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'puzzled expression that she could not help bursting out'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'laughing: and when she had got its head down, and was going'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'to\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the hedgehog'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'way wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'that it was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'for'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'turns,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'quarrelling all the while, and fighting for the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hedgehogs; and in\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'a very short time '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the Queen'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' was in a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'furious passion, and went\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'stamping about, and'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'her head!\u2019'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'about once in a minute.\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-in-scrolled-clipped-block-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt
new file mode 100644
index 0000000..38c7234
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 200, 90],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 198, 54],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [115, 84, 37, 48],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [115, 114, 37, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [38, 132, 36, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [38, 132, 36, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Cras faucibus. Nunc'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'adipiscing, enim in scelerisque'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'convallis,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'augue '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'purus'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' eleifend'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'lacus, at sagittis eros leo'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pulvinar velit. Integer'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sollicitudin nisi ut urna blandit'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'convallis.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/lines-with-layout-delta-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt
new file mode 100644
index 0000000..dd02d3d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutListItem LI",
+          "rect": [48, 94, 744, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='target'",
+          "rect": [48, 94, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [31, 180, 7, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [31, 130, 7, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutListItem LI",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutListMarker (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='target'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
new file mode 100644
index 0000000..e49ba353
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt
new file mode 100644
index 0000000..e432ac71
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt

@@ -0,0 +1,353 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 60, 784, 262],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 60, 784, 90],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 250, 784, 72],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 250, 113, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 150, 113, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 132, 80, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 132, 80, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 96, 80, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 96, 80, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 268, 69, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 168, 69, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 304, 64, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 204, 64, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 45, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 45, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 44, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 44, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 60, 40, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 60, 40, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 286, 30, 18],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 186, 30, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [8, 150, 10, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Word,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'words,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'more words.'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'I could'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'write a book'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'about all the stuff'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'that comes'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'the break.'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt
new file mode 100644
index 0000000..780c1fce
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [146, 11, 125, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 125, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [146, 11, 43, 13],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 11, 43, 13],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt
new file mode 100644
index 0000000..88ef0d86
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt

@@ -0,0 +1,84 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutMultiColumnFlowThread (anonymous)",
+          "rect": [9, 9, 400, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='a'",
+          "rect": [234, 9, 300, 59],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 300, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 50, 50],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 9, 13, 59],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutMultiColumnFlowThread (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'XXXXXX'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
new file mode 100644
index 0000000..d1394c3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [6, 6, 204, 58],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 8, 200, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt
new file mode 100644
index 0000000..eb286040
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt

@@ -0,0 +1,101 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 148, 200, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 110, 200, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 108, 88, 60],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 146, 88, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 148, 84, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 110, 84, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-delete-line-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/overflow-delete-line-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt
new file mode 100644
index 0000000..eb2426cd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -0,0 +1,134 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [2008, 2092],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 2008, 2092],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 585, 785, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 16, 784, 2068],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 50, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [127, 50, 390, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 348, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 50, 120, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 0, 15, 585],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 585, 15, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [516, 50, 5, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This is the test for '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
new file mode 100644
index 0000000..a040518
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [8, 184, 784, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [18, 18, 284, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 18, 23, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 184, 23, 18],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'abc'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject removal"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt
new file mode 100644
index 0000000..e88635d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt

@@ -0,0 +1,79 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 800, 600],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [0, 0, 800, 50],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [100, 100, 451, 50],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [108, 116, 435, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 116, 435, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 435, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Tests that the entire viewport is painted with a floated html element.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
new file mode 100644
index 0000000..db86d17
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 784, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    },
+    {
+      "name": "LayoutInline (relative positioned) DIV id='block'",
+      "position": [68, 7],
+      "bounds": [374, 20],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline (relative positioned) DIV id='block'",
+          "rect": [0, 0, 374, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [1, 1, 372, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) DIV id='block'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'When this layer moves it shouldn't generate a repaint rect.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt
new file mode 100644
index 0000000..7f5f484
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 194, 181, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [292, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 194, 4, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt
new file mode 100644
index 0000000..02e071e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -0,0 +1,82 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [112, 108, 181, 104],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 194, 181, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [292, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 194, 4, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
new file mode 100644
index 0000000..65cda1d2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/renderer-destruction-by-invalidateSelection-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt
new file mode 100644
index 0000000..8c243ca
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [12, 45, 113, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [12, 45, 51, 13],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'some text'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt
new file mode 100644
index 0000000..569e878
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt

@@ -0,0 +1,80 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='test'",
+          "rect": [38, 74, 152, 110],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 75, 123, 108],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 165, 42, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [74, 75, 39, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 75, 36, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='removeme'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='test'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hello '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'world'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt
new file mode 100644
index 0000000..c3b8836
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='firstLine'",
+          "rect": [8, 8, 100, 200],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 208, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='root'",
+          "rect": [8, 208, 100, 100],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 49, 98, 118],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 49, 8, 18],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow HTML",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='firstLine'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "selection"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "location change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
new file mode 100644
index 0000000..b1b31d8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-drag-release-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-drag-release-expected.png
new file mode 100644
index 0000000..0362fc9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-drag-release-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-float-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-float-expected.png
new file mode 100644
index 0000000..ab13890
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/slider-thumb-float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt
new file mode 100644
index 0000000..d115948
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 125, 13],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 11, 28, 13],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div'",
+          "rect": [8, 288, 10, 20],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..d74a48a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
new file mode 100644
index 0000000..e659223
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
new file mode 100644
index 0000000..4ab8bce
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -0,0 +1,145 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 62, 306, 378],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'SS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
new file mode 100644
index 0000000..af8b0b5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt
new file mode 100644
index 0000000..858bae0a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 54, 571, 86],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 54, 571, 86],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt
new file mode 100644
index 0000000..9d3420f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 50, 571, 82],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 50, 571, 82],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
new file mode 100644
index 0000000..60b293e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
new file mode 100644
index 0000000..b32b5dd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
new file mode 100644
index 0000000..ccf808a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -0,0 +1,98 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 39, 784, 174],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 39, 784, 174],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 39, 784, 174],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 39, 784, 174],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 39, 784, 174],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 39, 784, 174],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
new file mode 100644
index 0000000..a9da73b4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 39, 784, 174],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 39, 784, 174],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 39, 784, 174],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
new file mode 100644
index 0000000..5daaef5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

@@ -0,0 +1,122 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [0, 14, 753, 366],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 246, 753, 134],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 246, 753, 134],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 129, 596, 135],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 129, 596, 135],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 443, 131],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 14, 443, 131],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGResourceLinearGradient linearGradient id='fillLinearGradient'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGResourceLinearGradient linearGradient id='strokeLinearGradient'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on fill'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on stroke'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on fill/stroke'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt
new file mode 100644
index 0000000..fa0740ae
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [33, 22, 618, 196],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [33, 22, 618, 196],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [16, 25, 18, 25],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [8, 12, 17, 26],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on fill'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourcePattern pattern id='dynPattern'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
new file mode 100644
index 0000000..c404694
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -0,0 +1,132 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 62, 306, 378],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
new file mode 100644
index 0000000..526bb75
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [23, 8, 85, 24],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='target'",
+          "rect": [23, 8, 85, 24],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [58, 45, 50, 27],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='source'",
+          "rect": [58, 45, 50, 27],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='target'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'A'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' B C'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGText text id='source'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'X Y Z'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt
new file mode 100644
index 0000000..a34c93a3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [103, 24, 160, 116],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [103, 24, 160, 116],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [63, 24, 160, 116],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [63, 24, 160, 116],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Foo'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..3acdacd3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
new file mode 100644
index 0000000..9043b085
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
new file mode 100644
index 0000000..f006099
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
new file mode 100644
index 0000000..9043b085
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
new file mode 100644
index 0000000..eb2e736
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -0,0 +1,129 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 378],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 62, 306, 378],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 62, 306, 378],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt
new file mode 100644
index 0000000..d148ea1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -0,0 +1,120 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 62, 306, 258],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 62, 306, 258],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='remove'",
+          "rect": [10, 62, 306, 258],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [10, 62, 306, 258],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='remove'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
new file mode 100644
index 0000000..943305aa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 12, 48, 30],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 12, 48, 30],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 12, 48, 30],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
new file mode 100644
index 0000000..943305aa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 12, 48, 30],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 12, 48, 30],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 12, 48, 30],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
new file mode 100644
index 0000000..8964978
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -0,0 +1,106 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1026, 1016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [24, 991, 737, 21],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [177, 992, 202, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [432, 992, 176, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A",
+          "rect": [378, 987, 55, 29],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [383, 992, 45, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [427, 992, 6, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [378, 992, 6, 19],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pservers-pattern-01-b \u2190'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'index'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u2192 script-handle-01-b'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
new file mode 100644
index 0000000..6e79105
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
new file mode 100644
index 0000000..a2121cb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
new file mode 100644
index 0000000..8cdbb94d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt
new file mode 100644
index 0000000..ab088ca
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 2, 46, 23],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 2, 46, 23],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='text1'",
+          "rect": [10, 2, 46, 23],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 32, 43, 23],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text2'",
+          "rect": [10, 32, 43, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 32, 43, 18],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text1'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='text2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
new file mode 100644
index 0000000..1ce4c0ab
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [80, 0, 551, 118],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [80, 0, 551, 118],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [30, 0, 404, 60],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [30, 0, 404, 60],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='bounce'",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'Repaint me!'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt
new file mode 100644
index 0000000..ac48b84
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt

@@ -0,0 +1,424 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='text2g'",
+          "rect": [0, 63, 402, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 13, 402, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 113, 402, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 114, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 114, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 14, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 14, 194, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 13, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 113, 100, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 113, 100, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 13, 100, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 114, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 14, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 113, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 13, 92, 46],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 3, 13, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 6, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 6, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 6, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 3, 6, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 3, 6, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [6, 3, 4, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [9, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [9, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='text1g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text2g'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text3g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
new file mode 100644
index 0000000..3d00c7d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt
new file mode 100644
index 0000000..ff8ec38
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -0,0 +1,176 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner2'",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner1'",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 2, 1],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 2, 1],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 0, 2, 1],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 0, 2, 1],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 0, 2, 1],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner1'",
+          "rect": [0, 0, 2, 1],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner1'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
new file mode 100644
index 0000000..d215c92
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [808, 620],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [208, 14, 170, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [208, 14, 170, 18],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [18, 194, 170, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [18, 194, 170, 18],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='ttt'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Passes, if text is at 200x20'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
new file mode 100644
index 0000000..98ee373
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [200, 186, 256, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [200, 186, 256, 18],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [200, 186, 256, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [20, 6, 256, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [20, 6, 256, 18],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [20, 6, 256, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='ts'",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This text should be at visible at 200,200'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt
new file mode 100644
index 0000000..85d5796
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 116, 64, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='status'",
+          "rect": [90, 116, 64, 18],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 116, 44, 18],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='status'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Passed'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
new file mode 100644
index 0000000..bb00034
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
new file mode 100644
index 0000000..1e50922
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt
new file mode 100644
index 0000000..d64d6549
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt

@@ -0,0 +1,311 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 182, 110, 76],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 186, 102, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 96, 101, 76],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTable TABLE id='t'",
+          "rect": [8, 10, 97, 76],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableCell TD id='d2'",
+          "rect": [22, 210, 96, 20],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 100, 93, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 316, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 268, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 144, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 96, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d3'",
+          "rect": [22, 296, 87, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d'",
+          "rect": [22, 124, 87, 20],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 297, 77, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 125, 77, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 317, 51, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 145, 51, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 277, 43, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 105, 43, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 211, 34, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [79, 268, 30, 76],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 210, 14, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 124, 14, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 211, 4, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 125, 4, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d2'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD id='d3'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'ipsum dolor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt
new file mode 100644
index 0000000..cb161c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='to-be-changed'",
+          "rect": [18, 128, 269, 36],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 128, 256, 36],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 128, 84, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [295, 102, 15, 400],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='to-be-changed'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'After change'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
new file mode 100644
index 0000000..d78af73
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
new file mode 100644
index 0000000..d78af73
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
new file mode 100644
index 0000000..5e2dcfa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/transform-layout-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/paint/invalidation/transform-layout-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
new file mode 100644
index 0000000..244c8ab
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt

@@ -0,0 +1,427 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [913, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 897, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 897, 214],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [313, 0, 600, 500],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 600, 500],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [313, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [491, 8, 414, 484],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [491, 8, 414, 484],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [913, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [200, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [208, 8, 897, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 897, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [208, 8, 897, 214],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 897, 214],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [513, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [513, 235, 400, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "bounds change"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [400, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [-513, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [-505, 8, 897, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [-505, 8, 897, 214],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 400, 600],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 235, 400, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [47, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [47, 8, 345, 565],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [400, 0, 400, 600],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [447, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [47, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [447, 8, 345, 565],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [47, 8, 345, 565],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
index 8347a59..cacd8efc 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
index ea54f3b..acd10837 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
index 22ddd03d..3355fa4 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
index eea64fb..85a2d1c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
index 8debcc7..7b3b9a7 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/imagemap-overflowing-polygon-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index 3957d38..d8fdd0c 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
index eea64fb..85a2d1c8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index 1df2487..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
index e2df93d8..47ca47e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
index f8537de8..e8b2ead8 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
index 0b6a76c35..6506a6f 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
index 5c79f85..8c6cf76 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
index 060bfe9..a1d21a6 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
index 496f182..233ef91e 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index 0cc11fd5..4db229a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index a7fa0738..3ace6cb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/spv2/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/spv2/fast/block/basic/018-expected.png
index a99f36fc..ff73093 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/spv2/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/spv2/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt
index 8f41eb4..0580c53 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt

@@ -5358,6 +5358,7 @@
     method getRangeAt
     method modify
     method removeAllRanges
+    method removeRange
     method selectAllChildren
     method setBaseAndExtent
     method setPosition

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
index 9f8ca794..fe6f0a5 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index 5dc3271..23a398c2 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index c473e5b..cb43b0fb 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
index 12212113..0ae1d7a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index 678726f..59171956 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index fcee130f..8c837cc0 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/iframe-print-expected.png
index 7740cae..c15f760a 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
index ba7a066b..da2c554 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
index 8809638..4b0011a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
index d4917a0..962348d2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
index 0838645..bc8295bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
index 7919374..0557019 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
index 77d1ef7..2da7656 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-added-filters-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-added-filters-expected.png
index b41a5289..3e3f7ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-added-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-removed-filters-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-removed-filters-expected.png
index d53ae3a..649c977 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-removed-filters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/masks/mask-with-removed-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index b70c5bd..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png
index e519cdd..21b4662 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-small-content-rect-expected.png
index 0fd4166..d45c9d628 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/nested-border-radius-clipping-expected.png
index f0bc0a9..3ddac74 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scaled-mask-expected.png
index 4c414225..70fdedc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/tiled-mask-expected.png
index ad69204..0b7d99a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed-expected.png
index b6c3e3e..2bb6f72 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed2-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed2-expected.png
index bd24173..2853888 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-transformed2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/reflection-in-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/reflection-in-composited-expected.png
index 6ea8dc18..f33c8c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/reflection-in-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/reflection-in-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/comments-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/comments-expected.png
index f013a2c3..af27a2d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/comments-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/comments-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/containment-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/containment-expected.png
index 1413802c..1ee332d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/containment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/containment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/contextual_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/contextual_selectors-expected.png
index c3babdd..6aac586 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/contextual_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/contextual_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/grouping-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/grouping-expected.png
index a4e3bc5..ee0bc316 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/grouping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/grouping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/id_as_selector-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/id_as_selector-expected.png
index 41ef1c4..637c1fff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/id_as_selector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/id_as_selector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/basic/inheritance-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/basic/inheritance-expected.png
index a37cb641..67b0208 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/basic/inheritance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/basic/inheritance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border-expected.png
index 9ddb4f6b..cbd754f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom-expected.png
index dc42704..e59688f9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_inline-expected.png
index 5f2e912..2d1220b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width-expected.png
index a0058d45..cc93f01a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width_inline-expected.png
index 59216a8..5e13763f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_bottom_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color-expected.png
index 2afb973..ca073fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color_inline-expected.png
index 01e5c302d..f15a8c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_color_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_inline-expected.png
index 93da0c4..c4961a8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left-expected.png
index 4de402d..b512e887 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_inline-expected.png
index 105046b..b8da38b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width-expected.png
index 5c03bbca..b184ca2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width_inline-expected.png
index 5a9df61..9cc955ec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_left_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right-expected.png
index 93351f8..94d9321 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_inline-expected.png
index 6525ab6..dbe2e42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width-expected.png
index b82cd04..73a52009 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width_inline-expected.png
index cc89a0b..fb31dd0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_right_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style-expected.png
index 6269e3c..3cec260 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style_inline-expected.png
index c02e10a..aee40ae9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_style_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top-expected.png
index ec4ddc0b..02affd39 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_inline-expected.png
index b9f33d3e..0e0c9b7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width-expected.png
index 6d64771..20ad8b23 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width_inline-expected.png
index c96a91476..df64f0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_top_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width-expected.png
index cc2a1ac..eade57f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width_inline-expected.png
index f99d89a6..b444f7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/border_width_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear-expected.png
index 93159dc4..07d48dc5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear_float-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear_float-expected.png
index 1d3f943..ca4736e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear_float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/clear_float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float-expected.png
index b6bb9a9..52aa807f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_elements_in_series-expected.png
index 120170e..d294b9c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_margin-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_margin-expected.png
index db57949..00a2326 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_on_text_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_on_text_elements-expected.png
index c08e1b1..421be40 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_on_text_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/float_on_text_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/height-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/height-expected.png
index 4ffa191..9fea440 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin-expected.png
index 676e65eb..dab3f4ad 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom-expected.png
index 8508c64..b3ba23b4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom_inline-expected.png
index c0699cd6..8b123c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_inline-expected.png
index 8533834..1f9480d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left-expected.png
index fde3bb0..b0e1d76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left_inline-expected.png
index 5da29da7..8928107 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right-expected.png
index 934ad026..3327297 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right_inline-expected.png
index c574e4e..ab5b0bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top-expected.png
index 028edf8..206a4c1b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top_inline-expected.png
index 6436276..62556ec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/margin_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding-expected.png
index b931c54..f8d5b22 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom-expected.png
index 1ee1580a..21333f6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom_inline-expected.png
index 400ef60..a7e10d21 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_bottom_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_inline-expected.png
index 99ff21b..6a303c4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left-expected.png
index 78409db8..830f3e3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left_inline-expected.png
index 6849a14..eb0fec4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_left_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right-expected.png
index 5c27c2f..0dc08d9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right_inline-expected.png
index a88c9b76..8c7c7b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_right_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top-expected.png
index 140a4b0692..3a50080c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top_inline-expected.png
index 8198222..d8ed89c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_top_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/width-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/width-expected.png
index 2614fe9..5624a91 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/cascade/cascade_order-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/cascade/cascade_order-expected.png
index bf4318f4..5257087b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/cascade/cascade_order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/cascade/cascade_order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/cascade/important-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/cascade/important-expected.png
index d204177..48f177eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/cascade/important-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/cascade/important-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/display-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/display-expected.png
index 3575d97f..de4bed9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/display-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style-expected.png
index a4fe6993..f8792d36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_image-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_image-expected.png
index 135ebe90..8d24376 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_position-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_position-expected.png
index 9fe2eb0..3dd97fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_type-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_type-expected.png
index b0757d7d..7e980b6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_type-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/list_style_type-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/classification/white_space-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/classification/white_space-expected.png
index e0c1e31..a4f7864 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/classification/white_space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/classification/white_space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background-expected.png
index 31efdc1..af8cd30 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_attachment-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_attachment-expected.png
index 7403f98..5b87222 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_color-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_color-expected.png
index e95800c..77c4137 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_image-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_image-expected.png
index cb6777cc..6e2e6a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_position-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_position-expected.png
index 8a400e8..164f232 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_repeat-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_repeat-expected.png
index 9b2dc16..6f8a147 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/background_repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/color-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/color-expected.png
index 22fa2f2..6cb8fea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/color_and_background/color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.png
index 599ea61b..3e291344 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_family-expected.png
index 096942ef..df7a9eeb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_size-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_size-expected.png
index 781a1c4..c5c27a11 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_style-expected.png
index 4b597c0..67607d0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_variant-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_variant-expected.png
index e4288dd..8259d90 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_variant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_variant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_weight-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_weight-expected.png
index 00be792..1713ab5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_weight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/font_properties/font_weight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/canvas-expected.png
index 61c9fff..f45ca68ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/floating_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/floating_elements-expected.png
index 93bf954..b362cca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/floating_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/floating_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.png
index f76bd6b..fcc5dac 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/height_of_lines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/inline_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/inline_elements-expected.png
index e75ceaf1..df42b0b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/inline_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/inline_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/replaced_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/replaced_elements-expected.png
index 31a94d9..0b14171c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/replaced_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/replaced_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.png
index 7b1b8bc..5f0db6f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/anchor-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/anchor-expected.png
index 5e624601..c68c3bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/anchor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/anchor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstletter-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstletter-expected.png
index 7baadd2..b139471 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstletter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstletter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstline-expected.png
index 361fe3cb..f138896 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/multiple_pseudo_elements-expected.png
index 672199d..555aca0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/pseudo_elements_in_selectors-expected.png
index 60c4a416..6573d31 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/pseudo_elements_in_selectors-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/letter_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/letter_spacing-expected.png
index fc3d3b3..7297f95 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/letter_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/letter_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/line_height-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/line_height-expected.png
index 07158200..8ba08af 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/line_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/line_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_align-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_align-expected.png
index 35408f4..4ab317b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_decoration-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_decoration-expected.png
index 853df6f..d7c38e4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_decoration-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_decoration-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_indent-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_indent-expected.png
index f75758f..2ddab1e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_indent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_indent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_transform-expected.png
index ddde169..60379740 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.png
index f73dc31..90ea340 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/word_spacing-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/word_spacing-expected.png
index ffec4ac3..d094f7c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/word_spacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/word_spacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/units/color_units-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/units/color_units-expected.png
index 9f4afcc..20839bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/units/color_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/units/color_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/units/length_units-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/units/length_units-expected.png
index a9a0020d..ad87541 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/units/length_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/units/length_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/units/percentage_units-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/units/percentage_units-expected.png
index 942774e..d9df69d1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/units/percentage_units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/units/percentage_units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/units/urls-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/units/urls-expected.png
index c12d4c0c..942684f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css1/units/urls-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/units/urls-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/margin-applies-to-010-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/margin-applies-to-010-expected.png
index 072f80d0d..9ee46bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/margin-applies-to-010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/margin-applies-to-010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-elements-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-elements-001-expected.png
index 617fa9f..3adf3dd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-elements-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-elements-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
index 3601a73..d5bf1a81 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/20110323/replaced-intrinsic-ratio-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
index 4d09c5c..78810380 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0402-c71-fwd-parsing-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0505-c16-descendant-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0505-c16-descendant-01-e-expected.png
index a39238d..e1cf4ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0505-c16-descendant-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0505-c16-descendant-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t050803-c14-classes-00-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t050803-c14-classes-00-e-expected.png
index 928d212..1e78e8f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t050803-c14-classes-00-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t050803-c14-classes-00-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0509-c15-ids-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0509-c15-ids-01-e-expected.png
index 82bf916e..31baa296 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0509-c15-ids-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0509-c15-ids-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5517-brdr-s-00-c-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5517-brdr-s-00-c-expected.png
index dd4740d8..3cca8f3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5517-brdr-s-00-c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5517-brdr-s-00-c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5518-brdr-t-01-e-expected.png
index 04a3ff7..673be3ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5518-brdr-t-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5518-brdr-t-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5519-brdr-r-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5519-brdr-r-02-e-expected.png
index 2a2309c6..ad1b9c5d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5519-brdr-r-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5519-brdr-r-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5520-brdr-b-01-e-expected.png
index 45885c6..842b726 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5520-brdr-b-01-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5520-brdr-b-01-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5521-brdr-l-02-e-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5521-brdr-l-02-e-expected.png
index 24a8b421..a67e286 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5521-brdr-l-02-e-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5521-brdr-l-02-e-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5522-brdr-00-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5522-brdr-00-b-expected.png
index 08305898..6609eebd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5522-brdr-00-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0805-c5522-brdr-00-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c563-list-type-00-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c563-list-type-00-b-expected.png
index 9c67d05..76075c9f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c563-list-type-00-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c563-list-type-00-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c564-list-img-00-b-g-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c564-list-img-00-b-g-expected.png
index 9788c2e..ad5b222 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c564-list-img-00-b-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1205-c564-list-img-00-b-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-03-d-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-03-d-expected.png
index 2eb949c0..ee59b610 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-03-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-03-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-93-d-expected.png
index 6984ac6f..9cc50d3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-93-d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t170602-bdr-conflct-w-93-d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
index c7af6b5e..9092ab2f3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-image-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-image-svg-expected.png
index 3929703..7a57d88 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-image-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-image-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/css3-modsel-33-expected.png
index 537527b3..3fdc589 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png
index 527318d3..71098077 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png
index 527318d3..71098077 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/flexbox/button-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/flexbox/button-expected.png
index d0146fc..4c2506d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/flexbox/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/flexbox/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/masking/clip-path-inset-corners-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/clip-path-inset-corners-expected.png
index 7bf5d58..85014a76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/clip-path-inset-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/clip-path-inset-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-luminance-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-luminance-svg-expected.png
index c3b1ad75..71ff6727d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-luminance-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-luminance-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-content-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-content-expected.png
index 17f9e3e..2703986 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-1-expected.png
index 60c587f..8467171 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-13-expected.png
index cd1bf96..5218c15 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-15-expected.png
index 760f608..48773ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-22-expected.png
index 86aaa13e5..f924071 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-23-expected.png
index f327137..1528e65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-24-expected.png
index ee2693e6..c677c6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28-expected.png
index 4d3fbdc..7c99e59 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28b-expected.png
index 8dee466..80764a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29-expected.png
index 2dced3f..3cc6808 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29b-expected.png
index 2269b071..644eff4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-32-expected.png
index e364ffd..8e32363 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-33-expected.png
index 537527b3..3fdc589 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-3a-expected.png
index 4b26791..e33e174 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-68-expected.png
index ee2693e6..c677c6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-69-expected.png
index f327137..1528e65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73-expected.png
index ffefc36..eefc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73b-expected.png
index ffefc36..eefc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74-expected.png
index 3a65d86..b0fc257c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74b-expected.png
index 3a65d86..b0fc257c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/html/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-1-expected.png
index 60c587f..8467171 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-13-expected.png
index cd1bf96..5218c15 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-15-expected.png
index 760f608..48773ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-22-expected.png
index 86aaa13e5..f924071 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-23-expected.png
index f327137..1528e65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-24-expected.png
index ee2693e6..c677c6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28-expected.png
index 4d3fbdc..7c99e59 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28b-expected.png
index 8dee466..80764a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29-expected.png
index 2dced3f..3cc6808 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29b-expected.png
index 2269b071..644eff4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3-expected.png
index bdccd1f..b165bf8b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-32-expected.png
index e364ffd..8e32363 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-33-expected.png
index 537527b3..3fdc589 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3a-expected.png
index 4b26791..e33e174 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-68-expected.png
index ee2693e6..c677c6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-69-expected.png
index f327137..1528e65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73-expected.png
index ffefc36..eefc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73b-expected.png
index ffefc36..eefc4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74-expected.png
index 3a65d86..b0fc257c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74b-expected.png
index 3a65d86..b0fc257c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xhtml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-1-expected.png
index 30d71692..f55e01bc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-13-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-13-expected.png
index 2a0e891..86240b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-13-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-13-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-15-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-15-expected.png
index a52d62b3..ddc19af 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-15-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-15-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-22-expected.png
index b99a7f1..2b9a375 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-23-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-23-expected.png
index 9dfe86ec..2fdca1e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-23-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-23-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-24-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-24-expected.png
index 95821ab1..15e53b00 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-24-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-24-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28-expected.png
index 8f7fa14..4067810 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28b-expected.png
index 026eccf..650a1047 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-28b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29-expected.png
index 4e7b092..e9fb11a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29b-expected.png
index 88d81d3..e210ef1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-29b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3-expected.png
index 866b3b9..878702f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-32-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-32-expected.png
index 4be3782a..ff5b3beeb36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-32-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-32-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-33-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-33-expected.png
index 27c370c..8eef768c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-33-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-33-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3a-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3a-expected.png
index 6991fe5..e5ba48d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-68-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-68-expected.png
index 95821ab1..15e53b00 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-68-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-68-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-69-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-69-expected.png
index 9dfe86ec..2fdca1e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-69-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-69-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73-expected.png
index 774deba..e7903b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73b-expected.png
index 774deba..e7903b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-73b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74-expected.png
index 806a90f..ec9a789 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74b-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74b-expected.png
index 806a90f..ec9a789 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/selectors3/xml/css3-modsel-74b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5099303-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5099303-expected.png
index 795ffd7..f16ab7f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5099303-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5099303-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5126166-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5126166-expected.png
index 5a9a0ff9..54c96db 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5126166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5126166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5206311-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5206311-1-expected.png
index 35f2e084..0d40801 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5206311-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5206311-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5483370-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5483370-expected.png
index 11b85b7..e7f8156c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5483370-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/5483370-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/table-cells-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/table-cells-expected.png
index bf4009d6..902ca8c40 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/deleting/table-cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/deleting/table-cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/4747450-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/4747450-expected.png
index c3aa978..71f6d9e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/4747450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/4747450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5136770-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5136770-expected.png
index 3258eea1..bb28588 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5136770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5136770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5481523-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5481523-expected.png
index 53b3c2a..e716932 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5481523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5481523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5569741-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5569741-expected.png
index 489fee4..793cf1d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5569741-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/execCommand/5569741-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4278698-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4278698-expected.png
index dcbfad38..a14c797 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4278698-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4278698-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4875189-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4875189-1-expected.png
index a05729c..c64efd6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4875189-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4875189-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4959067-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4959067-expected.png
index 3b71c84..6fc28b5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4959067-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/inserting/4959067-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/5156401-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/5156401-1-expected.png
index c77511b..f0255e54 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/5156401-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/5156401-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
index 5a37b5b..60100530 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drag-selected-image-to-contenteditable-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drop-text-without-selection-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drop-text-without-selection-expected.png
index 8d09ad8..aafa68f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drop-text-without-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/drop-text-without-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/innerText-inline-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/innerText-inline-table-expected.png
index 786f8c1..7b4654b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/innerText-inline-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/innerText-inline-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/input-field-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/input-field-1-expected.png
index d933a19..d1575ec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/input-field-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/input-field-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-list-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-list-expected.png
index 7bc0cb0..683ab78 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-list-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/pasteboard/merge-start-list-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/4402375-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/4402375-expected.png
index 0c1822a..44da3a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/4402375-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/4402375-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/6476-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/6476-expected.png
index 171592a0..c165517 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/6476-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/6476-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/click-start-of-line-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/click-start-of-line-expected.png
index cbb987d..730c3fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/click-start-of-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/click-start-of-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/drag-to-contenteditable-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/drag-to-contenteditable-iframe-expected.png
index c6fc0e1..16a79eea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/drag-to-contenteditable-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/drag-to-contenteditable-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-backward-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-backward-expected.png
index 264d19c..8778ce3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-backward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-backward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-forward-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-forward-expected.png
index 070e4cf3..231dc1a8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-forward-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/extend-inside-transforms-forward-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-4-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-4-expected.png
index 9fce227..551cd34 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-5-expected.png
index 217dca4..dcd0a49 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-8-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-8-expected.png
index fc9e421..e12ca64 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-9-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-9-expected.png
index 6d142248..4cc5cc3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/mixed-editability-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNode-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNode-expected.png
index a838a6fc..f7ec8bc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNodeContents-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNodeContents-expected.png
index 28edc4c..d7203da 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNodeContents-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/selectNodeContents-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/selection/transformed-selection-rects-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/selection/transformed-selection-rects-expected.png
index 7bddf329d..83ffc82 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/selection/transformed-selection-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/selection/transformed-selection-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-delete-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-delete-001-expected.png
index 1287247..c3b3de3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-delete-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-delete-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-after-expected.png
index 0f388bf0f..936a810 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-before-expected.png
index 61921d6..f16f880 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/list-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-after-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-after-expected.png
index 0a39ecf..27dd5be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-after-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-after-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-before-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-before-expected.png
index c2d49fe..4bc9e31a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/unsupported-content/table-type-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt b/third_party/WebKit/LayoutTests/platform/win/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt
new file mode 100644
index 0000000..f967c05
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/external/wpt/web-animations/animation-model/keyframe-effects/effect-value-transformed-distance-expected.txt

@@ -0,0 +1,41 @@
+This is a testharness.js-based test.
+PASS A step-start function on a keyframe affects the resulting style 
+PASS A steps(1, start) function on a keyframe affects the resulting style 
+PASS A steps(2, start) function on a keyframe affects the resulting style 
+PASS A step-end function on a keyframe affects the resulting style 
+PASS A steps(1) function on a keyframe affects the resulting style 
+PASS A steps(1, end) function on a keyframe affects the resulting style 
+PASS A steps(2, end) function on a keyframe affects the resulting style 
+PASS A linear function on a keyframe affects the resulting style 
+FAIL A ease function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 109.47963055884654 at 1100ms expected 109.47963055884654 +/- 0.01 but got 109.313
+PASS A ease-in function on a keyframe affects the resulting style 
+FAIL A ease-in-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 101.97224534417684 at 1100ms expected 101.97224534417684 +/- 0.01 but got 101.953
+FAIL A ease-out function on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 116.05721544376388 at 1100ms expected 116.05721544376388 +/- 0.01 but got 116.078
+FAIL A easing function which produces values greater than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 171.60874310990272 at 1100ms expected 171.60874310990272 +/- 0.01 but got 172.219
+FAIL A easing function which produces values less than 1 on a keyframe affects the resulting style assert_approx_equals: The width should be approximately 77.13128857063907 at 1100ms expected 77.13128857063907 +/- 0.01 but got 76.9531
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-start function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, start) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, start) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 0ms expected "50.3438px" but got "50px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a step-end function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1) function does not alter the result 
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(1, end) function does not alter the result 
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a steps(2, end) function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 500ms expected "50.3438px" but got "50px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a linear function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "25.0938px" but got "25px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "41.875px" but got "41.8594px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "8.95313px" but got "9.32813px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-in-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "12.9375px" but got "12.875px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a ease-out function does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "38.0469px" but got "37.9688px"
+FAIL Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values greater than 1 does not alter the result assert_equals: The 'width' of the animated elements should be equal at 250ms expected "100px" but got "102.406px"
+PASS Linear-equivalent cubic-bezier keyframe easing applied to an effect with a easing function which produces values less than 1 does not alter the result 
+FAIL step-start easing with input progress greater than 1 assert_equals: expected "200px" but got "100px"
+PASS step-end easing with input progress greater than 1 
+FAIL step-end easing with input progress greater than 2 assert_equals: expected "200px" but got "100px"
+PASS step-start easing with input progress less than 0 
+FAIL step-start easing with input progress less than -1 assert_equals: expected "-100px" but got "0px"
+FAIL step-end easing with input progress less than 0 assert_equals: expected "-100px" but got "0px"
+FAIL cubic-bezier easing with input progress greater than 1 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress greater than 1 and where the tangent on the upper boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+FAIL cubic-bezier easing with input progress less than 0 and where the tangent on the lower boundary is infinity Failed to execute 'getComputedStyle' on 'Window': parameter 1 is not of type 'Element'.
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-inherit-color-bug-expected.png
index 30e79c6..4ad62e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-inherit-color-bug-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-inherit-color-bug-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-leakage-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-leakage-transforms-expected.png
index 7a4c3ac..eecf0f5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-leakage-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-leakage-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-svg-scaling-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-svg-scaling-zoom-expected.png
index 3aed0d4..839325d0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-svg-scaling-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/background-svg-scaling-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-expected.png
index 0e38834..937f415 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-image-expected.png
index f8d3802..45269922 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/border-radius-split-background-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
index c03f6ecc..802933a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/repeat/negative-offset-repeat-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/selection-background-color-of-list-style-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/selection-background-color-of-list-style-expected.png
index 103aa45..21098cb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/selection-background-color-of-list-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/backgrounds/selection-background-color-of-list-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/018-expected.png
index 66169bd8..b5166ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/text-indent-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/text-indent-rtl-expected.png
index 39bbd934..15663d6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/text-indent-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/basic/text-indent-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/014-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/014-expected.png
index 1238d67..9842fb6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/016-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/016-expected.png
index f3ab7e2..0e09a54 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/025-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/025-expected.png
index f6817f0..0eb8be0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/025-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/025-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/026-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/026-expected.png
index 0bf640a1..4fbb7a8e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/026-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/026-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/027-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/027-expected.png
index f6817f0..0eb8be0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/027-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/027-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/028-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/028-expected.png
index 0bf640a1..4fbb7a8e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/028-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/028-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/float-avoidance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/float-avoidance-expected.png
index 4792a965..810b6f87 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/float-avoidance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/float-avoidance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction-expected.png
index e644bb1..a529a38 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction2-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction2-expected.png
index f73fc83..ecc8d07 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/nopaint-after-layer-destruction2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/shrink-to-avoid-float-complexity-expected.png
index d50cd557..0ab4a91 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/shrink-to-avoid-float-complexity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/shrink-to-avoid-float-complexity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/table-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/table-relayout-expected.png
index 0ec24154..e667740 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/table-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/table-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/width-update-after-clear-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/width-update-after-clear-expected.png
index 6b5e1a6..c809acb2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/width-update-after-clear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/width-update-after-clear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/empty-clear-blocks-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/empty-clear-blocks-expected.png
index 76a1bc06..fe2c453 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/empty-clear-blocks-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/empty-clear-blocks-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
index 79949b2..a4cf774 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
index e58a824a..9642042 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-expected.png
index b7d88cd..fe64b48f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
index 90a49c1..dc00b54 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
index 2372e2b2..7773b22f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-expected.png
index 08a08b0e..c01199f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-ltr-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
index b7f85e0..3a9dc05 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-ltr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
index 6d124c1..71941e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/absolute-in-inline-short-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/height-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/height-change-expected.png
index 24a2365..81adc5ac 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relayout-on-position-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relayout-on-position-change-expected.png
index ee5e5246..f555a52 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relayout-on-position-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relayout-on-position-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/window-height-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/window-height-change-expected.png
index d41e7be..31ce5fb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/window-height-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/window-height-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png
index f749a19..5ab0f52 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-inner-bleed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-double-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-double-expected.png
index e07d032..4221cb5c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-double-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-double-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-expected.png
index 3058d440..42e6fb7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-constraints-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-inline-flow-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-inline-flow-expected.png
index e531275..b49addbe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-inline-flow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-inline-flow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-all-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-all-expected.png
index 4684a8a..cc8c0ea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-all-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-all-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-border-expected.png
index d0e9ef5..639371a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-expected.png
index a3f4417..279d668 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-padding-expected.png
index a7b9ada..24ba998f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-mask-expected.png
index 68a92dd..e9b470d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
index bd4c28b..faaca6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-canvas-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png
index 2c2391f..a850f93 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png
index 76c6fd8..ac4933a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-ratio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png
index 1882713..2b7e455 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-mask-video-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-percent-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-percent-expected.png
index 92354eb..e34abf2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-percent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-percent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-split-inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-split-inline-expected.png
index 3b87044d..4eb5e7c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-split-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-split-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-with-composited-child-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-with-composited-child-expected.png
index 566c0b5c..2793d36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-with-composited-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-radius-with-composited-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-styles-split-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-styles-split-expected.png
index e4e209ce..8f0b057 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-styles-split-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/border-styles-split-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/borderRadiusAllStylesAllCorners-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/borderRadiusAllStylesAllCorners-expected.png
index 721b2df..9f61ecb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/borderRadiusAllStylesAllCorners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/borderRadiusAllStylesAllCorners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/different-color-borders-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/different-color-borders-expected.png
index 62f47a0..27a430b0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/different-color-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/different-color-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/outline-alpha-block-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/outline-alpha-block-expected.png
index c93f7ef..d70a664b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/outline-alpha-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/outline-alpha-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-01-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-01-expected.png
index 3b66a58..2c85156 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-01-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-02-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-02-expected.png
index d8be7da..c889de03 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-02-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-02-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-03-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-03-expected.png
index a801730..d5a934d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-03-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-03-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-04-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-04-expected.png
index e54a593..bfca3f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-04-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-04-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-05-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-05-expected.png
index b6f00ae..7424c3d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-05-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/borders/rtl-border-05-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/basic-shadows-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/basic-shadows-expected.png
index bddf115..a846705 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/basic-shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/basic-shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/border-radius-big-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/border-radius-big-expected.png
index d8dd959d..1d160407 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/border-radius-big-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/border-radius-big-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/box-shadow-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/box-shadow-transformed-expected.png
index 6a3a07e2..8c5622b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/box-shadow-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/box-shadow-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-expected.png
index 6d52aff27..550ca8cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-subpixel-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-subpixel-expected.png
index 82e7732..c45040a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-subpixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/inset-subpixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/spread-multiple-inset-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/spread-multiple-inset-expected.png
index ec1ce85..8899d9b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/spread-multiple-inset-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/spread-multiple-inset-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/transform-fringing-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/transform-fringing-expected.png
index 461a8362..001e632f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/transform-fringing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/box-shadow/transform-fringing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-composite-expected.png
index cf7aab7..d748a86 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-incremental-repaint-expected.png
index ecbefce..8c25edba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/image-object-in-canvas-expected.png
index 68d82cd..8d9af8a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 5dc8657..1a43857d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-clip-expected.png
index 9147a8fe..3c5ff33 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-combinations-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-combinations-expected.png
index 36c9300..b89159e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-combinations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-combinations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-expected.png
index 3c48d1f..d74e087 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-parent-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-parent-expected.png
index c290d76..55fcc5f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-parent-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-parent-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-fixed-position-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-fixed-position-expected.png
index e8199543..ac2a9c9f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-fixed-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-fixed-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-transformed-expected.png
index 3ab6529d..96815c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/009-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/009-expected.png
index d4f7356d..8dcd182 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/014-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/014-expected.png
index 615f4729..0014417 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/014-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/014-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/016-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/016-expected.png
index 0734732..76e7ea5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/016-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/016-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/hover-style-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/hover-style-change-expected.png
index 25a90373..b8ed2a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/hover-style-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/hover-style-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-to-inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-to-inline-expected.png
index 45c566f2..3c93e5b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-to-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-to-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-with-before-expected.png
index 9f5efe5..cb28972 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-group-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-with-before-expected.png
index 9f5efe5..cb28972 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-row-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-with-before-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-with-before-expected.png
index 9f5efe5..cb28972 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-with-before-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css-generated-content/table-with-before-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/001-expected.png
index 6e1e875..990d6ad 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/acid2-pixel-expected.png
index a8df3bda3..5211b7b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/background-shorthand-invalid-url-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/background-shorthand-invalid-url-expected.png
index d10b68b..a9d4719 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/background-shorthand-invalid-url-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/background-shorthand-invalid-url-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/css3-modsel-22-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/css3-modsel-22-expected.png
index 86aaa13e5..f924071 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/css3-modsel-22-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/css3-modsel-22-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/find-next-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/find-next-layer-expected.png
index d84dc31f..55698229 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/find-next-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/find-next-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/first-letter-detach-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/first-letter-detach-expected.png
index 9f1769f..bfaf92f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/first-letter-detach-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/first-letter-detach-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/h1-in-section-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/h1-in-section-elements-expected.png
index 98e002c9..e584a3297 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/h1-in-section-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/h1-in-section-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/hover-subselector-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/hover-subselector-expected.png
index f2ed560b..32e4d6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/hover-subselector-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/hover-subselector-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-default-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-default-expected.png
index 109d856..5ddee3b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-default-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-default-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
index 3f3aedc..ff4d07b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
index 3f3aedc..ff4d07b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-expected.png
index 1df85dbb..72401b0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/image-orientation/image-orientation-from-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/nested-rounded-corners-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/nested-rounded-corners-expected.png
index 0cd8154..5af1aa1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/nested-rounded-corners-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/nested-rounded-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.png
index cc3d222..1483019 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-expected.png
index 79dfa12..1db7840 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-iframe-expected.png
index 176c75a5..04e19c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/resize-corner-tracking-transformed-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/rtl-ordering-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/rtl-ordering-expected.png
index 16d66f9..955af6f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/rtl-ordering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/rtl-ordering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/shadow-multiple-expected.png
index 6b0e230..b468d043 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/transformed-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/transformed-mask-expected.png
index d03bf7c..12d2c4f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/transformed-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/transformed-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css/universal-hover-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css/universal-hover-quirk-expected.png
index bc67c1e..086655e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css/universal-hover-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css/universal-hover-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
index b1010944..09acb14 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/css3-text/css3-text-decoration/text-decoration-style-inherit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
index b4c0546..2caf615 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-draggable-div-with-dragged-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-non-draggable-link-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-non-draggable-link-expected.png
index 5e7054dd..5427845 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-non-draggable-link-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dnd/link-dragging-non-draggable-link-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/001-expected.png
index b0c0e19..257ff52e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/002-expected.png
index f673b85..ef6cd17 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/003-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/003-expected.png
index 0f5d8509..ee1e61d6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/004-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/004-expected.png
index b0c0e19..257ff52e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/doctypes/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/34176-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/34176-expected.png
index f750cff..9e4f75e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLElement/bdo-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLElement/bdo-expected.png
index 2a4096c..9221560 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLElement/bdo-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLElement/bdo-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
index ae22663..0beae43d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLLinkElement/pending-stylesheet-count-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
index 47b67f26..02d028b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-optimums-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-optimums-expected.png
index bbbc99b..00b458a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-optimums-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-optimums-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
index f2dd2831..95a75b5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-bar-value-pseudo-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
index 3e37a18..53f9a64 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableColElement/resize-table-using-col-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/colSpan-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/colSpan-expected.png
index 418c6722..ce6777f9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/colSpan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/colSpan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/createCaption-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/createCaption-expected.png
index 75ac446..25e1fb9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/createCaption-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/HTMLTableElement/createCaption-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dom/row-inner-text-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dom/row-inner-text-expected.png
index 7401214..55197aea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dom/row-inner-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dom/row-inner-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/012-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/012-expected.png
index fc81c0d..87e9d65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/012-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/012-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/015-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/015-expected.png
index 371a050..8b23e1c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/selection-highlight-adjust-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/selection-highlight-adjust-expected.png
index 5f9de2e..ccce7a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/selection-highlight-adjust-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/selection-highlight-adjust-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/invalid-UTF-8-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/invalid-UTF-8-expected.png
index 361c5819..1c81721 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/invalid-UTF-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/invalid-UTF-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-big-endian-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-big-endian-expected.png
index ceaea894..c0b3685 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-big-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-big-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-little-endian-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-little-endian-expected.png
index ceaea894..c0b3685 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-little-endian-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/encoding/utf-16-little-endian-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/001-expected.png
index 155e26d7..2a28f497 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-default-title-expected.png
index a842e24..4abe243f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-default-title-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-default-title-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-style-color-expected.png
index 17938a1..75a8345a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button/button-inner-block-reuse-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button/button-inner-block-reuse-expected.png
index 5c42983..6af95e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/button/button-inner-block-reuse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button/button-inner-block-reuse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index 3a54ed89..f2ddce8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index 25004b8..9cdd207 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index cfe18a93..1331838 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index e592f920..a8c19ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index 3cb2a65..8ba80a30 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
index 7ef03a1..21c4bcc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-ru-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index 4a01ef1..b6f6ad1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
index 12c5828..1646f5c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
index 5609f191..b4a4fca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-expected.png
index d5aff82..ecb3b3c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index 8867267..5f2aed1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-expected.png
index e8825b9..9f8c9fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index 5a6fded0..42b1c27 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/checkbox/checkbox-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/checkbox/checkbox-appearance-basic-expected.png
index d57c299..ba99daa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/checkbox/checkbox-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/checkbox/checkbox-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
index 663dd06..e90a207 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/color/color-suggestion-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/datalist/input-appearance-range-with-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/datalist/input-appearance-range-with-transform-expected.png
index ed7a7af..e51a39f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/datalist/input-appearance-range-with-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/datalist/input-appearance-range-with-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-basic-expected.png
index 82cd4d14..8b7298b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-pseudo-elements-expected.png
index 9577e245..1af21e5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/date/date-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
index e05df5b..5228827 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/fieldset/fieldset-align-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/fieldset/fieldset-align-expected.png
index 914b5065..5a7acc3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/fieldset/fieldset-align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/fieldset/fieldset-align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/floating-textfield-relayout-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/floating-textfield-relayout-expected.png
index a85790d..d5a62de1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/floating-textfield-relayout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/floating-textfield-relayout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/image-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/image-border-expected.png
index 629c638a..cc6665a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/image-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/image-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-first-letter-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-first-letter-expected.png
index 9708d44..bfc961e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-first-letter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-first-letter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-value-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-value-expected.png
index 4b3f8be..ea4bc3d8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-value-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/input-value-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-basic-expected.png
index 7b4e9b72..0dc112e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-pseudo-elements-expected.png
index 95bad63..e33ddaec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/number/number-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/number/number-appearance-datalist-expected.png
index 7208ab22..ea635a7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/number/number-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/number/number-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/placeholder-position-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/placeholder-position-expected.png
index b872834..4caa0ea0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/placeholder-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/placeholder-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/radio/radio-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/radio/radio-appearance-basic-expected.png
index 388a2001..ba5296d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/radio/radio-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/radio/radio-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-appearance-basic-expected.png
index 559174e..d50bbe4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-vertical-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-vertical-alignment-expected.png
index 51d4cab2..f5420b6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-vertical-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/search/search-vertical-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
index 5574224..17bcff6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
index 549fc666..397f411 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
new file mode 100644
index 0000000..9649c0d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/basic-selects-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/basic-selects-expected.png
index 60bb7b08..f97c7b5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/basic-selects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/basic-selects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/menulist-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/menulist-appearance-basic-expected.png
index 7af7eb23..be2390d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/menulist-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/menulist-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-baseline-expected.png
index 7039d85..7280602 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-dirty-parent-pref-widths-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-dirty-parent-pref-widths-expected.png
index ca8edaf..4a0b7f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-dirty-parent-pref-widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-dirty-parent-pref-widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-visual-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-visual-hebrew-expected.png
index 62e41e7..8c9020c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-visual-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/select/select-visual-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/submit/submit-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/submit/submit-appearance-basic-expected.png
index 6148952..05c9fa3a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/submit/submit-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/submit/submit-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
index d5a19148..960e91d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
index 82ce15a..f9ad1195 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
index 08b9147..ed8452cb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/date-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
index e96e30ca..93c71bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
index c1b8494..5e06ed3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
index 0e89eec..603ca7eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
index 2a916fc..0d36287 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/datetimelocal-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index 175096b..d88eee4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index d87c437..5035faf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index 53c70f1..2fa01d4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
index c365b304..041a3f2c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
index 5cd7ecf..aa18eaa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-locale-hebrew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
index 6af925a..1610cc88 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
index 42f69439..d8f3aeee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/time-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
index 33e1173..e47a476b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
index b077e6f..2a611cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
index f3a43f9..92c13e68 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/suggestion-picker/week-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text-style-color-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text-style-color-expected.png
index 1cee1e0..89a9a65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text-style-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text-style-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-bkcolor-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-bkcolor-expected.png
index d2ad3ee..7d89fa63 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-bkcolor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-bkcolor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-disabled-color-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-disabled-color-expected.png
index ccd8cb1b..78aae24f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-disabled-color-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-disabled-color-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-placeholder-paint-order-expected.png
index 7fffd502..1ed989ce 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-basic-expected.png
index b1ba062..c4ad189d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-datalist-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-datalist-expected.png
index 9bfd6883..66d0a0f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-datalist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/text-appearance-datalist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/textarea/textarea-placeholder-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
index 0f3df222..59c02a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/textarea/textarea-placeholder-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-basic-expected.png
index b26efea3..11da100 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-pseudo-elements-expected.png
index 45418d6..81690e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/time/time-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/visual-hebrew-text-field-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/visual-hebrew-text-field-expected.png
index 3acda3df..14a8344 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/visual-hebrew-text-field-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/visual-hebrew-text-field-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-basic-expected.png
index 31d68552..db89207b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-pseudo-elements-expected.png
index 2f059e9f..fde41aa2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/week/week-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/frames/onlyCommentInIFrame-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/frames/onlyCommentInIFrame-expected.png
index 2d4e30c7..9c4a338 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/frames/onlyCommentInIFrame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/frames/onlyCommentInIFrame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/focus-rings-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/focus-rings-expected.png
index 837ac39..0bbf160 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/focus-rings-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/focus-rings-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/emptyInlinesWithinLists-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/emptyInlinesWithinLists-expected.png
index 0d9fbcda..2210af2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/emptyInlinesWithinLists-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/emptyInlinesWithinLists-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-borders-with-bidi-override-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-borders-with-bidi-override-expected.png
index d5ed944c..630c15f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-borders-with-bidi-override-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-borders-with-bidi-override-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-expected.png
index c5aaaf0..b1aa4bc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-long-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-long-image-expected.png
index a5e7c53..c1da37e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-long-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-long-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-x-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-x-expected.png
index 12d191f..0a195c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-x-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-x-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-y-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-y-expected.png
index 1f165bf..f18accc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-y-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-box-background-repeat-y-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-continuation-borders-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-continuation-borders-expected.png
index e79b503..9688528 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-continuation-borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/inline/inline-continuation-borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/invalid/table-inside-stray-table-content-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/invalid/table-inside-stray-table-content-expected.png
index 979cf4c0..c69bc76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/invalid/table-inside-stray-table-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/invalid/table-inside-stray-table-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/layers/opacity-outline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/layers/opacity-outline-expected.png
index 7ba482f..27064d7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/layers/opacity-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/layers/opacity-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-expected.png
index 7f1505e..559a1f55 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-vertical-expected.png
index 94a6587..e7f28be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/001-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-expected.png
index 09af4ef..936bb0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-vertical-expected.png
index d83752b..2773b25 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/002-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-expected.png
index 449f9b98..47a3e13 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-vertical-expected.png
index a3d510c..41645c9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/003-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/004-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/004-expected.png
index d44080f7..78335b31 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-expected.png
index 8f4f784..0df73e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-vertical-expected.png
index 9235cafae..e14ac39 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/005-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-expected.png
index 9c403ff..0c0a40f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-vertical-expected.png
index f11adf72..ffd613c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/007-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-expected.png
index 55cd8878..f17379b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-vertical-expected.png
index 0841d57..0e660bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/008-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/big-list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/big-list-marker-expected.png
index 25ff4eab..1e144a8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/big-list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/big-list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/dynamic-marker-crash-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/dynamic-marker-crash-expected.png
index be935d6d..0c778b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/dynamic-marker-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/dynamic-marker-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/inlineBoxWrapperNullCheck-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/inlineBoxWrapperNullCheck-expected.png
index 08bf64d..216dc42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/inlineBoxWrapperNullCheck-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/inlineBoxWrapperNullCheck-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-before-empty-inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-before-empty-inline-expected.png
index 6f10b40..d619dd2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-before-empty-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-before-empty-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-image-error-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-image-error-expected.png
index ae48db2d..b5c3ba7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-image-error-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/marker-image-error-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/markers-in-selection-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/markers-in-selection-expected.png
index 1601370a..71f23551 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/markers-in-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/markers-in-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-display-types-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-display-types-expected.png
index 566ae2f8..c9f7a4b4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-display-types-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-display-types-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-start-parsing-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-start-parsing-expected.png
index a08a199..a071348 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-start-parsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/ol-start-parsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/olstart-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/olstart-expected.png
index ab1e14b..302f603 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/olstart-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/olstart-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/lists/scrolled-marker-paint-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/scrolled-marker-paint-expected.png
index fd5c618..b2aa9af2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/lists/scrolled-marker-paint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/lists/scrolled-marker-paint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/masking/clip-path-inset-large-radii-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/masking/clip-path-inset-large-radii-expected.png
index b36e14b..baebd8bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/masking/clip-path-inset-large-radii-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/masking/clip-path-inset-large-radii-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/multicol/border-radius-clipped-layer-second-column-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/multicol/border-radius-clipped-layer-second-column-expected.png
index 4480077..50694fea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/multicol/border-radius-clipped-layer-second-column-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/multicol/border-radius-clipped-layer-second-column-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/border-radius-clipping-expected.png
index 86f452f..8108d2b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/image-selection-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/image-selection-highlight-expected.png
index 05bf318..1dda00f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/image-selection-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/image-selection-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-expected.png
index 3b10b43..ac05f48 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-inline-scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
index 263026a..a408ae0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-inline-scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-vertical-expected.png
index 43ecbf5a..8228e42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-rtl-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-text-hit-testing-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-text-hit-testing-expected.png
index e7a9bfb..1d41c8d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-text-hit-testing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-text-hit-testing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-update-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-update-transform-expected.png
index ff10a13..cdf294c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-update-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-update-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-with-local-background-attachment-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-with-local-background-attachment-expected.png
index 21ae962..7092ff5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-with-local-background-attachment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/overflow/overflow-with-local-background-attachment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/reflections/opacity-reflection-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/reflections/opacity-reflection-transform-expected.png
index 67d3ee1..b1749813 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/reflections/opacity-reflection-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/reflections/opacity-reflection-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.png
index a31297c..94b0875 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/border-radius-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/inline-box-wrapper-handover-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/inline-box-wrapper-handover-expected.png
index 06244b0..c9e046c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/inline-box-wrapper-handover-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/inline-box-wrapper-handover-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/selection-rect-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/selection-rect-transform-expected.png
index 15257c9..3cb8e7dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/replaced/selection-rect-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/replaced/selection-rect-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/selectors/032-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/selectors/032-expected.png
index 5ed9e88a..38f79afe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/selectors/032-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/selectors/032-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/selectors/166-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/selectors/166-expected.png
index 94d9993..01936e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/selectors/166-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/selectors/166-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/003-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/003-expected.png
index 66ceb80da..abf108d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/007-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/007-expected.png
index 1308b89..0f1fb30b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/018-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/018-expected.png
index bd5b75d..2a23d69 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/020-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/020-expected.png
index 8c0f1ac..61d3e67 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/020-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/020-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/029-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/029-expected.png
index b4dd71df..543a779 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/029-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/029-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/030-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/030-expected.png
index 74914631..1d662728 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/030-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/030-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/035-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/035-expected.png
index 313c87a..5b1db47 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/035-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/035-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/038-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/038-expected.png
index 4e9dd049..0d2e46e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/038-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/038-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/038-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/038-vertical-expected.png
index 981cf3c..d7dd06c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/038-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/038-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/039-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/039-expected.png
index 71c3c4b7..ab053ea7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/040-expected.png
index 0761d76..25d9d31 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/040-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/040-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/040-vertical-expected.png
index 269ca69..92201bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/040-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/040-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/041-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/041-expected.png
index d1c5744c..46c4b469 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/041-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/041-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/add-before-anonymous-child-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/add-before-anonymous-child-expected.png
index 70101ff..33149c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/add-before-anonymous-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/add-before-anonymous-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-collapsed-border-expected.png
index 341a7f7..661d611a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-expected.png
index 341a7f7..661d611a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
index bbfd9c9..9be3bfc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
index ac4cf19..864978e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-expected.png
index a717d928..f7fc75c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
index 71ba0738..c005b28 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/click-near-anonymous-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/click-near-anonymous-table-expected.png
index aa2fb7b..c70c995 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/click-near-anonymous-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/click-near-anonymous-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/early-table-layout-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/early-table-layout-expected.png
index a2f5598..311d12d9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/early-table-layout-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/early-table-layout-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/edge-offsets-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/edge-offsets-expected.png
index 27392d25..c430963 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/edge-offsets-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/edge-offsets-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/row-height-recalc-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/row-height-recalc-expected.png
index d4e6655..fcf24c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/row-height-recalc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/row-height-recalc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-expected.png
index b0df39df..04a1f16 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-vertical-expected.png
index 5e7bacd..c91effab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/rowspan-paint-order-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/rtl-cell-display-none-assert-expected.png
index 8526d79e..9e9ade4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/rtl-cell-display-none-assert-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/rtl-cell-display-none-assert-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/spanOverlapRepaint-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/spanOverlapRepaint-expected.png
index 395391c..4c8c7d10 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/spanOverlapRepaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/spanOverlapRepaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/text-field-baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/text-field-baseline-expected.png
index 10d4d122..0b3ff77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/text-field-baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/text-field-baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/unbreakable-images-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/unbreakable-images-quirk-expected.png
index 9a7d92b..1903a776 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/unbreakable-images-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/unbreakable-images-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text-autosizing/list-item-above-dbcat-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text-autosizing/list-item-above-dbcat-expected.png
index 47bc85fe..c81b9f39f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text-autosizing/list-item-above-dbcat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text-autosizing/list-item-above-dbcat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-kerning-and-ligatures-expected.png
index 0e2e7a9..2b33591 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-multiple-renderers-expected.png
index 362c10d..23ab4cd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-negative-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-negative-spacing-features-expected.png
index ebf4288..a0b99bba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-negative-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-negative-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-pointtooffset-calls-cg-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-pointtooffset-calls-cg-expected.png
index cd61cc89..d0a65f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-pointtooffset-calls-cg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-pointtooffset-calls-cg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-rtl-override-selection-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-rtl-override-selection-expected.png
index 4bdf37f..b1b3fc2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-rtl-override-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-rtl-override-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-small-caps-punctuation-size-expected.png
index ca17994..30e47ba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-spacing-features-expected.png
index 348b897..087c2843 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/001-expected.png
index 75e241e..ac8eedc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/006-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/006-expected.png
index 5445b4f7..67c764b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/007-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/007-expected.png
index d57133cf..35213ff8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/015-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/015-expected.png
index 9e486c73..7e1f138 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/015-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/basic/015-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/capitalize-empty-generated-string-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/capitalize-empty-generated-string-expected.png
index fbc5dea..a149b56 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/capitalize-empty-generated-string-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/capitalize-empty-generated-string-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/cg-vs-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/cg-vs-atsui-expected.png
index 1f7349ae..cf5eac2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/cg-vs-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/cg-vs-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/color-emoji-expected.png
index 48823fb..3dfcfa39 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/emoticons-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/emoticons-expected.png
index b08c37ff..9e6cd42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/emoticons-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/emoticons-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/in-rendered-text-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/in-rendered-text-rtl-expected.png
index 34b5478..f93f327 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/in-rendered-text-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/in-rendered-text-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-CSS-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-CSS-expected.png
index 7e9d3a7..75a3bb9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-CSS-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-CSS-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-HTML-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-HTML-expected.png
index 641d945e..e00e94e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-HTML-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-HTML-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
index 175bc9d..acb2943 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-LDB-2-formatting-characters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-european-terminators-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-european-terminators-expected.png
index 3cba079..260f0b56 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-european-terminators-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-european-terminators-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
index 1cd0fff..3feb0ba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-ignored-for-first-child-inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-innertext-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-innertext-expected.png
index f518e30d..96b535f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-innertext-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/bidi-innertext-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/hebrew-vowels-expected.png
index 50689dd..5629750 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-caret-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-caret-expected.png
index 23ac096..7c7d9f3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-white-space-pre-wrap-expected.png
index eca0394..bb88572 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/text-spliced-font-expected.png
index 516b48f..3f08740 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/midword-break-hang-expected.png
index 337d341..2a4a16f72 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/should-use-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/should-use-atsui-expected.png
index c5095ecc..5546081e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/should-use-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/should-use-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/webfont-synthetic-bold-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/webfont-synthetic-bold-expected.png
index f2e8737..a9476ac4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/webfont-synthetic-bold-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/webfont-synthetic-bold-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-overflow-selection-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
index f6eab15a..5fd6dd8e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-overflow-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
index b12f24e..557161e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/text/whitespace/pre-wrap-spaces-after-newline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/block-level-images-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/block-level-images-expected.png
index 7903716..214e2e5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/block-level-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/block-level-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
index 5b13ff6..630fbb37 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-lr-expected.png
index 99de3368..2f50ea8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-rl-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-rl-expected.png
index 6ef70c7..68ce431 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-rl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-styles-vertical-rl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-vertical-lr-expected.png
index eaf42f9..6cb87501 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-1-expected.png
index e12c309..c2d70f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-2-expected.png
index e12c309..c2d70f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-1-expected.png
index e12c309..c2d70f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-2-expected.png
index e12c309..c2d70f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-details-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-and-click-expected.png
index ec2d6507..7f0f5750 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-expected.png
index c1b440e..30d16e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-and-click-expected.png
index d7e5320a..7341dfe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-expected.png
index e819b25c..ec5818d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-10-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-and-click-expected.png
index 30efca9..b674a3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-expected.png
index c1b440e..30d16e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-and-click-expected.png
index b5feb62..2fab69f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-expected.png
index c385796..88f7b4a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-and-click-expected.png
index 7c9a4c7..caa645c4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-expected.png
index 06c651aa..13e63e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-and-click-expected.png
index e7a88a49..3111b2c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-expected.png
index c1b440e..30d16e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-and-click-expected.png
index d7e5320a..7341dfe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-expected.png
index b604f52..acda4eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-and-click-expected.png
index d7e5320a..7341dfe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-expected.png
index 94264df..659d805d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-7-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-and-click-expected.png
index ba9f8e8..50d3091 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-expected.png
index 6753d1b..bf6384d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-and-click-expected.png
index 905f6322..f25cf1c4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-expected.png
index 0bb4425..40d702b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-9-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-1-expected.png
index 0495a16..3a596d7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-2-expected.png
index 0495a16..3a596d7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-add-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-marker-style-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-marker-style-expected.png
index f691a79..29a569d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-marker-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-marker-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-1-expected.png
index 32d4e0a..9a93355a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-2-expected.png
index 0ea424c..1bef2bec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-nested-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary1-expected.png
index d75bc21..251ef45 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary2-expected.png
index fb38eefa..51889962 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary3-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary3-expected.png
index d75bc21..251ef45 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary4-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary4-expected.png
index c4837e0..3e51750 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-no-summary4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open-javascript-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open-javascript-expected.png
index e2bd2046..ee00bb77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open-javascript-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open-javascript-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open1-expected.png
index 06c651aa..13e63e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open2-expected.png
index 4d515d2..0823217 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open3-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open3-expected.png
index 06c651aa..13e63e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open4-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open4-expected.png
index 4d515d2..0823217 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open5-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open5-expected.png
index 06c651aa..13e63e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open6-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open6-expected.png
index 9b55b69..fa894db 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-open6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-position-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-position-expected.png
index ea18422d..bbd97a61 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-position-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-position-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-1-expected.png
index f691e4b6..f6e479b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-2-expected.png
index f691e4b6..f6e479b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-and-click-expected.png
index b739be5..797988a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-expected.png
index d75bc21..251ef45 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-and-click-expected.png
index e715be7f..989bb738 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-expected.png
index a2a1a92a..678aab4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-and-click-expected.png
index 81c88879..7edad51 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-expected.png
index d799eb7..d454c43 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-and-click-expected.png
index d09e462..ea7c0bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-expected.png
index fb38eefa..51889962 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-and-click-expected.png
index 6ef8bc0..f51cf93 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-expected.png
index e0451a1..36263e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-and-click-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-and-click-expected.png
index 58a9743..4d316c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-and-click-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-and-click-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-expected.png
index e042760a..17ce47a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-1-expected.png
index 61159bd..3ecddf62 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-2-expected.png
index fcef346..4b4a109 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-remove-summary-child-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-summary-child-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-summary-child-expected.png
index bba0e3f..f4093a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-summary-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-summary-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-text-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-text-expected.png
index 7709cdfc..ac87119 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-replace-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-center-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-center-expected.png
index 24cb5e1..338a56b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-left-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-left-expected.png
index 1a7ec06..05950a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-right-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-right-expected.png
index a78e20ac..19ae7f4b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-align-right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-expected.png b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-expected.png
index f7e83a4..6d5de50 100644
--- a/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/html/details_summary/details-writing-mode-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/acid2-pixel-expected.png b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/acid2-pixel-expected.png
index a8df3bda3..5211b7b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/acid2-pixel-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/acid2-pixel-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
index dbf82793..723252fb9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
index 7b442ac..0cec53c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
index 1b20f7b..43e4c35 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/background-color-applied-to-rounded-inline-element-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
index 77d7907..ec650f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
index 5c8e465a..6204beaf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
index a82b982..9e0bb83 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-clip-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
index 8da21a1..c30f984 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-content-edge-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
index 1465541..59be5802 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-different-width-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
index 1b1150fa..50b5456 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-not-inherited-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
index c32fb38..41db1dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-shorthand-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
index 16c8be9..0d770620 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
index 21e1588..4afe4e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
index 6af5962..337ac8f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
index 3e1c9c64..ab184794 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
index 7cbe64e3..5ba89f3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-style-005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
index 40f53b98..dd930c5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
index 630ecca..1712760 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-sum-of-radii-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
index 7037659..d2febae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-three-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
index ebead1c..85c50dd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-radius-with-two-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
index e126c94..c188970 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
index 5c6bef5..61fe7692 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
index 12dd3ed..e06c5ed 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-left-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
index 321fba4..8e02d18f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/ietestcenter/css3/bordersbackgrounds/border-top-right-radius-values-004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-fade-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-fade-expected.png
index 9a79763..16e97dde 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-fade-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-fade-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-radius-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-radius-expected.png
index d176be8..f919b42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-image-shape-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-image-shape-expected.png
index 561000e..5637e213 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-image-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-image-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-mask-image-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-mask-image-svg-expected.png
index ca15240..e5bda44 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-mask-image-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-mask-image-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-svg-foreign-object-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-svg-foreign-object-expected.png
index 0b1223f..e6d8a1d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-svg-foreign-object-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-svg-foreign-object-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-diff-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-diff-expected.png
index 15edfe64..db4a93fe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-diff-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-diff-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-expected.png
index 138ef5b..dd5c1f3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/cross-fade-svg-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-css-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-css-expected.png
index 5b3b85a..e941d296 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-expected.png
index dfb6761..66593cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-image-document-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-image-document-expected.png
index 3daad67..3ecef35 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-image-document-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/exif-orientation-image-document-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/imagemap-focus-ring-zoom-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/imagemap-focus-ring-zoom-expected.png
index a8b20e8..06cc0d6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/imagemap-focus-ring-zoom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/imagemap-focus-ring-zoom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/box-inline-resize-expected.txt
index 45526ee..11a22fba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/box-inline-resize-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/box-inline-resize-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [8, 84, 32, 67],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutImage IMG id='foo'",
-          "rect": [8, 84, 32, 32],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-5699-expected.txt
index c0fa3164..33764b7f1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-5699-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-5699-expected.txt

@@ -13,26 +13,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 178, 36, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 148, 36, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutInline SPAN id='d'",
-          "rect": [8, 145, 4, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 145, 4, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 130, 4, 17],
           "reason": "style change"
         }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-expected.png
index 335ad50..f3d0869 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
index 4c02fe9..84d28b6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-contenteditable-content-after-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-contenteditable-content-after-expected.txt
index 60739a63..b0e569c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-contenteditable-content-after-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-contenteditable-content-after-expected.txt

@@ -27,16 +27,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 23, 17],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 16, 17],
-          "reason": "full"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [30, 44, 9, 17],
           "reason": "forced by layout"
@@ -62,11 +52,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 44, 8, 17],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutTextFragment (anonymous)",
           "rect": [8, 44, 8, 17],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-subpixel-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-subpixel-expected.txt
index ea861c1f..2d1bd87 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-subpixel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-subpixel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [8, 8, 224, 22],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [10, 11, 201, 16],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-composited-scroll-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-composited-scroll-expected.txt
index 1795923f..7a99ca3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-composited-scroll-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-composited-scroll-expected.txt

@@ -27,11 +27,6 @@
           "object": "LayoutTextControl INPUT id='text'",
           "rect": [-1, 999, 207, 24],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [3, 1003, 200, 16],
-          "reason": "subtree"
         }
       ]
     },

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-transformation-expected.png
index 3e1f374..233e2ca3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-transformation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
index c38994e..4126654 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt

@@ -40,11 +40,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 508, 31, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [285, 500, 15, 150],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.png
index 61d68db..02b2133 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/compositing/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/control-clip-expected.txt
index 5378b6ba..993e1d4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/control-clip-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/control-clip-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow (anonymous)",
           "rect": [16, 113, 184, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [76, 113, 64, 16],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText (anonymous)",
-          "rect": [9, 83, 63, 16],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.png
index 3b37088..440670ba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt
index 5ae8fde..a86866f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/delete-into-nested-block-expected.txt

@@ -33,11 +33,6 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 119, 32, 18],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 137, 28, 18],
           "reason": "layoutObject removal"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/details-open-repaint-expected.txt
index cace2c4..30836dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/details-open-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/details-open-repaint-expected.txt

@@ -12,16 +12,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutTextControl INPUT",
-          "rect": [8, 68, 173, 22],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [10, 71, 169, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutDetailsMarker DIV id='details-marker'",
           "rect": [8, 53, 11, 11],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexbox/repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexbox/repaint-expected.txt
deleted file mode 100644
index 74b5ba8..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexbox/repaint-expected.txt
+++ /dev/null

@@ -1,179 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [138, 116, 654, 90],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [138, 116, 654, 90],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [138, 116, 652, 89],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [148, 116, 644, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [148, 116, 644, 108],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [148, 116, 644, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [148, 116, 644, 108],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [148, 116, 632, 107],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [148, 116, 632, 107],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='content'",
-          "rect": [400, 116, 392, 162],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [400, 116, 392, 162],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [8, 224, 392, 54],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [400, 116, 391, 161],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [148, 116, 252, 162],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [8, 206, 140, 18],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='left'",
-          "rect": [138, 116, 10, 108],
-          "reason": "incremental"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow DIV id='left'",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='content'",
-      "reason": "style change"
-    },
-    {
-      "object": "LayoutBlockFlow P",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'aliquet. Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'feugiat vehicula. Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'condimentum leo neque sed nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'id, faucibus id quam.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='left'",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutBlockFlow DIV id='content'",
-      "reason": "style change"
-    },
-    {
-      "object": "LayoutBlockFlow P",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean laoreet dolor id urna eleifend aliquet.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Nulla vel dolor ipsum. Aliquam ut turpis nisl, in vulputate sapien. Cum sociis natoque penatibus et'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'magnis dis parturient montes, nascetur ridiculus mus. Sed congue magna vitae dolor feugiat vehicula.'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'Sed volutpat, tellus vel varius vestibulum, purus quam mollis sapien, in condimentum leo neque sed'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'nulla. Nunc quis porta elit. Pellentesque erat lectus, ultricies a lobortis id, faucibus id quam.'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-expected.png
index b458fba..9eacc47 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-horizontal-expected.png
index b458fba..9eacc47 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
index f2712b7b..9259b41 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/button-reset-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 34, 16],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 34, 16],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
index 33de40d..06eec488 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/range-focus-by-mouse-then-keydown-expected.txt

@@ -17,11 +17,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutFlexibleBox DIV",
-          "rect": [10, 10, 129, 21],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow DIV id='thumb'",
           "rect": [69, 10, 11, 21],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
index 91a75a37..41dec861 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/forms/submit-focus-by-mouse-then-keydown-expected.txt

@@ -12,11 +12,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [16, 11, 41, 16],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [16, 11, 41, 16],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-block-overflow-expected.png
index f905556..a808451 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-block-overflow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-color-change-expected.txt
index 3538684f..33e61d1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-color-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-color-change-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 68, 37, 17],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 68, 37, 17],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-focus-expected.txt
index dbfe536..293df2bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-focus-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-focus-expected.txt

@@ -17,11 +17,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [0, 34, 429, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutInline A id='link'",
           "rect": [585, -1, 216, 234],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-outline-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-outline-repaint-expected.txt
index 8debaed..34af29a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-outline-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-outline-repaint-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutInline SPAN id='test'",
           "rect": [5, 163, 98, 41],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 166, 92, 35],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
index ef7306f..2069031e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [8, 8, 29, 22],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 8, 29, 17],
-          "reason": "style change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
index 1b812d7..555531d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidate-caret-in-non-composited-scrolling-container-expected.txt

@@ -22,16 +22,6 @@
           "object": "LayoutTextControl INPUT id='root'",
           "rect": [0, 0, 68, 22],
           "reason": "full"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [3, 4, 64, 16],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 4, 64, 16],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
index 0691fc8..352f2f5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -23,16 +23,6 @@
         },
         {
           "object": "LayoutBlockFlow P",
-          "rect": [8, 2200, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 2050, 777, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow P",
           "rect": [8, 2050, 777, 100],
           "reason": "subtree"
         },

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-child-outline-expected.png
index bae4ffb..c98b5433 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-child-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-expected.png
index f594deb..c770183d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-horizontal-expected.png
index f594deb..c770183d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
index 95c79a3..4066b728 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -25,26 +25,6 @@
           "object": "LayoutInline (relative positioned) SPAN",
           "rect": [8, 120, 100, 103],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 220, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 220, 100, 100],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 200, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 200, 100, 100],
-          "reason": "bounds change"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt
index bac0a30..3f48a6d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -25,11 +25,6 @@
           "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
           "rect": [14, 353, 48, 65],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [27, 353, 22, 18],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt
index 660bb793..7eb41b3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -13,55 +13,10 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [14, 242, 406, 125],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 188, 406, 71],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 404, 355, 71],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 368, 355, 53],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [14, 404, 355, 35],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [14, 80, 354, 107],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [14, 368, 336, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [65, 368, 304, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [178, 350, 146, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [127, 350, 145, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
           "rect": [14, 353, 48, 65],
           "reason": "layoutObject removal"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-overflow-expected.txt
index 2fc7c9e..18f3ff45 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-overflow-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-overflow-expected.txt

@@ -22,19 +22,9 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [115, 114, 37, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutInline SPAN id='t'",
           "rect": [38, 132, 36, 17],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [38, 132, 36, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-2-expected.txt
index 8f36077..02cdee7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-2-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-2-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutImage IMG id='target'",
-          "rect": [48, 94, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutListMarker (anonymous)",
           "rect": [31, 180, 7, 17],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-expected.png
index 85ba2b6..f7d25dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/make-children-non-inline-expected.txt
index 102900fb..3f14ef8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/make-children-non-inline-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/make-children-non-inline-expected.txt

@@ -12,21 +12,6 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 60, 784, 90],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutBlockFlow (anonymous)",
-          "rect": [8, 250, 784, 72],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 250, 113, 17],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [8, 150, 113, 17],
           "reason": "layoutObject removal"
@@ -34,87 +19,42 @@
         {
           "object": "LayoutText #text",
           "rect": [8, 132, 80, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 132, 80, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 96, 80, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 96, 80, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 268, 69, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 168, 69, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 304, 64, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 204, 64, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 114, 45, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 114, 45, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 78, 44, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 78, 44, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
           "rect": [8, 60, 40, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 60, 40, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [8, 286, 30, 17],
-          "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [8, 186, 30, 17],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='target'",
-          "rect": [8, 150, 10, 100],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt
index 91cdf1a..2c2354b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -15,16 +15,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [10, 11, 169, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [187, 11, 53, 16],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 53, 16],
-          "reason": "full"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multicol-repaint-expected.txt
index 7778c068..a5f87a2e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multicol-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/multicol-repaint-expected.txt

@@ -18,18 +18,8 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [234, 15, 300, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [234, 15, 50, 50],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [9, 10, 13, 56],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-clip-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-clip-change-expected.txt
deleted file mode 100644
index 29c6331a..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-clip-change-expected.txt
+++ /dev/null

@@ -1,41 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
-          "rect": [48, 102, 92, 23],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [48, 102, 87, 17],
-          "reason": "subtree"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutBlockFlow (positioned) A id='link' class='updated'",
-      "reason": "subtree"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "subtree"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "subtree"
-    },
-    {
-      "object": "InlineTextBox 'Lorem Ipsum'",
-      "reason": "subtree"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
index b7f09f47..d0bd8a8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutInline SPAN id='target'",
           "rect": [6, 6, 204, 57],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutImage IMG",
-          "rect": [8, 8, 200, 50],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-continuations-expected.txt
index 74351f8..48d6b4cd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-continuations-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/outline-continuations-expected.txt

@@ -25,16 +25,6 @@
           "object": "LayoutInline SPAN id='outer'",
           "rect": [16, 146, 88, 21],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 148, 84, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [18, 110, 84, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.txt
index db6caf6..d2ca176 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -22,31 +22,11 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 50, 784, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow P",
-          "rect": [8, 16, 784, 18],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [127, 50, 390, 17],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 348, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 50, 120, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [785, 0, 15, 585],
           "reason": "scroll"
@@ -55,11 +35,6 @@
           "object": "LayoutView #document",
           "rect": [785, 585, 15, 15],
           "reason": "scroll"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [516, 50, 5, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
index 71a56aabb..8401aeaf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -20,11 +20,6 @@
           "object": "LayoutText #text",
           "rect": [18, 18, 23, 17],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 184, 23, 17],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/positioned-document-element-expected.txt
index 7e950f0..2b0f3914 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/positioned-document-element-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/positioned-document-element-expected.txt

@@ -13,34 +13,14 @@
           "reason": "style change"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [0, 0, 800, 50],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [8, 16, 784, 18],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
-          "rect": [100, 100, 452, 50],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [108, 116, 436, 18],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 116, 436, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 16, 436, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
index 23df21a..313b6f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -24,11 +24,6 @@
           "object": "LayoutInline (relative positioned) DIV id='block'",
           "rect": [0, 0, 374, 19],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [1, 1, 372, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt
index 3609663b..017bce0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -15,26 +15,6 @@
           "object": "LayoutText #text",
           "rect": [112, 194, 181, 17],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [292, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 194, 4, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt
index 69adb92..b8bfae2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -20,26 +20,6 @@
           "object": "LayoutText #text",
           "rect": [112, 194, 181, 17],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [292, 108, 101, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [112, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutBlockFlow DIV",
-          "rect": [8, 108, 100, 100],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [108, 194, 4, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
index 97b23ece..c0e1ea1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/repaint-during-scroll-with-zoom-expected.txt

@@ -28,11 +28,6 @@
           "reason": "scroll"
         },
         {
-          "object": "LayoutBlockFlow HTML",
-          "rect": [3, 65, 225, 235],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [3, 65, 58, 15],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/search-field-cancel-expected.txt
index 6567c00f..19d2b595 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/search-field-cancel-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/search-field-cancel-expected.txt

@@ -10,11 +10,6 @@
           "object": "LayoutBlockFlow DIV id='inner-editor'",
           "rect": [11, 45, 156, 16],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [11, 45, 58, 16],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-after-remove-expected.txt
index 2a85b5d..0980e35 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-after-remove-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-after-remove-expected.txt

@@ -15,21 +15,6 @@
           "object": "LayoutText #text",
           "rect": [39, 75, 123, 107],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [112, 164, 42, 18],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [74, 75, 39, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [39, 75, 36, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-clear-expected.txt
index a8ac573..b655de2d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-clear-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection-clear-expected.txt

@@ -30,11 +30,6 @@
           "object": "LayoutText #text",
           "rect": [8, 49, 98, 117],
           "reason": "layoutObject removal"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [8, 49, 8, 17],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
index 407d9df..7c80c29 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/selection/selection-in-non-composited-scrolling-container-expected.txt

@@ -10,16 +10,6 @@
           "object": "LayoutTextControl INPUT id='target'",
           "rect": [7, 7, 70, 24],
           "reason": "subtree"
-        },
-        {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [10, 11, 64, 16],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 64, 16],
-          "reason": "subtree"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/shadow-multiple-expected.png
index 28768a5..1899d47 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/shadow-multiple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt
index 83930dd..e3903ce 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/subtree-root-skipped-expected.txt

@@ -12,11 +12,6 @@
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [10, 11, 35, 16],
-          "reason": "full"
-        },
-        {
           "object": "LayoutBlockFlow (positioned) DIV id='div'",
           "rect": [8, 288, 10, 20],
           "reason": "bounds change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
index 37990d0..cf9df4a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
index b65facc..0d8a678 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
index 1520256..44bc923 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt

@@ -8,21 +8,11 @@
       "backgroundColor": "#FFFFFF",
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [247, 88, 120, 43],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [247, 88, 120, 43],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [203, 334, 120, 43],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [203, 334, 120, 43],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
index c4cea3ba..86b32759 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -7,51 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 306, 374],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/circle-move-invalidation-expected.png
index 81fa33c0..cd6549d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/circle-move-invalidation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt
index a0f411b4..ecc6a80 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/ems-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 85],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 85],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 54, 571, 85],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 54, 571, 85],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 54, 571, 85],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 54, 571, 85],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt
index 331fd6d..283378e6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/exs-display-none-expected.txt

@@ -12,31 +12,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [50, 50, 571, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [50, 50, 571, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='tspan'",
-          "rect": [50, 50, 571, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text id='text'",
           "rect": [50, 50, 571, 81],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
index 221e73cc..bca3bf3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
index 3328c63b..2f2c3fc8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
index d4316ef..f850a99ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -17,16 +17,6 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 40, 784, 168],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 40, 784, 168],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 40, 784, 168],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
index dfce073c..be7a4a84 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [16, 40, 784, 168],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [16, 40, 784, 168],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
index 82f9c38..8be2609 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 247, 759, 130],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 247, 759, 130],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 130, 596, 130],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 130, 596, 130],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 15, 449, 127],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 15, 449, 127],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt
index 62c94821a..227e679 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-gradient-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 23, 699, 189],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 23, 699, 189],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
index f17e76c..347da41 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

@@ -12,31 +12,16 @@
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 247, 684, 130],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 247, 684, 130],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 130, 520, 130],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 130, 520, 130],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 15, 374, 127],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [0, 15, 374, 127],
           "reason": "layoutObject insertion"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt
index b18a386..84ae92a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [33, 23, 624, 189],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [33, 23, 624, 189],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
index b407a4d..2db8ffe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -7,46 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 306, 374],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
index 2f3b3df..23ffd702 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [23, 8, 85, 23],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='target'",
           "rect": [23, 8, 85, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [58, 45, 50, 26],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='source'",
           "rect": [58, 45, 50, 26],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt
index 9ad4f42..a3a7511 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [103, 25, 160, 114],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [103, 25, 160, 114],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [63, 25, 160, 114],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [63, 25, 160, 114],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
index 3373f8a..e4f1a4c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.png
index 17afa55..1cc938a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
index 8327cfbf..c28dc12 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
index 17afa55..1cc938a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
index 8c81ac5..0c3d210 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -9,49 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 374],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='modify'",
-          "rect": [10, 63, 306, 374],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [10, 63, 306, 374],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-tspan-from-text-expected.txt
index 54634eb..d615dcd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-tspan-from-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -9,39 +9,9 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 63, 306, 254],
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [10, 63, 306, 254],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGTSpan tspan id='remove'",
           "rect": [10, 63, 306, 254],
           "reason": "layoutObject removal"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
index 7c0a3d0..5d3586e7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 13, 48, 28],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 13, 48, 28],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
index 7c0a3d0..5d3586e7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -12,11 +12,6 @@
           "reason": "bounds change"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 13, 48, 28],
-          "reason": "style change"
-        },
-        {
           "object": "LayoutSVGText text id='t'",
           "rect": [9, 13, 48, 28],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 261c2de1..8d8a59f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -25,21 +25,6 @@
           "object": "LayoutInline A",
           "rect": [384, 1010, 47, 22],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [385, 1011, 45, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [429, 1011, 6, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [380, 1011, 6, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.png
index 45fc234..e21db78 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.png
index 62a07ab..b87d6d79 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.png
index 449247c..cebff5a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.txt
index 4ac861d..2782f28 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tabgroup-expected.txt

@@ -32,26 +32,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [390, 38, 314, 80],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRound'",
           "rect": [390, 38, 314, 80],
           "reason": "became visible"
@@ -82,26 +62,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [263, 279, 301, 300],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectRound'",
           "rect": [263, 279, 301, 300],
           "reason": "became visible"
@@ -152,26 +112,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [507, 233, 236, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRectTriangle'",
           "rect": [507, 233, 236, 159],
           "reason": "became visible"
@@ -182,66 +122,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [7, 257, 236, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupTriangle'",
           "rect": [7, 257, 236, 158],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGContainer g id='tabgroupTriangle__0_content'",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='contentTabGroupTriangle0'",
-          "rect": [15, 291, 211, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [31, 404, 188, 10],
           "reason": "layoutObject insertion"
@@ -297,46 +182,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [38, 7, 158, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGContainer g id='tabgroupRect'",
           "rect": [38, 7, 158, 236],
           "reason": "became visible"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [15, 291, 150, 25],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [15, 291, 150, 25],
           "reason": "layoutObject insertion"
@@ -387,11 +237,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__1'",
-          "rect": [415, 331, 63, 63],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRound__1'",
           "rect": [452, 38, 63, 18],
           "reason": "layoutObject insertion"
@@ -402,121 +247,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [66, 257, 57, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [511, 234, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [394, 38, 56, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__2'",
           "rect": [125, 256, 54, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [574, 234, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [457, 38, 54, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__3'",
-          "rect": [506, 422, 53, 53],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath path id='tabgroupRectRound__2'",
-          "rect": [466, 382, 51, 52],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [370, 285, 50, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__3'",
           "rect": [674, 233, 50, 18],
           "reason": "layoutObject insertion"
@@ -527,46 +262,6 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [422, 337, 49, 49],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [11, 257, 48, 29],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRectTriangle__2'",
           "rect": [630, 233, 47, 18],
           "reason": "layoutObject insertion"
@@ -577,151 +272,11 @@
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [130, 257, 44, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [130, 257, 44, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [130, 257, 44, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [130, 257, 44, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [130, 257, 44, 29],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupTriangle__3'",
           "rect": [176, 256, 42, 31],
           "reason": "layoutObject insertion"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [679, 234, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [562, 38, 40, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [513, 429, 39, 39],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [473, 389, 38, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [635, 234, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [517, 38, 38, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 257, 32, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [181, 257, 32, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 257, 32, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [181, 257, 32, 29],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [181, 257, 32, 29],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGPath path id='tabgroupRect__0'",
           "rect": [178, 6, 19, 66],
           "reason": "layoutObject insertion"
@@ -740,66 +295,6 @@
           "object": "LayoutSVGPath path id='tabgroupRect__2'",
           "rect": [178, 130, 19, 47],
           "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 11, 16, 56],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 74, 16, 54],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 179, 16, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [180, 135, 16, 38],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt
index 0eddc5da..b3da5b5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-mask-update-expected.txt

@@ -7,11 +7,6 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [10, 2, 46, 22],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutSVGRect rect",
           "rect": [10, 2, 46, 22],
           "reason": "style change"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
index 236a782..ecd4537 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 0, 551, 114],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [80, 0, 551, 114],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [30, 0, 404, 57],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text id='bounce'",
           "rect": [30, 0, 404, 57],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-rescale-expected.txt
index 2dec14c..0f0bb1d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-rescale-expected.txt

@@ -22,66 +22,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 114, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 114, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 114, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 14, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 14, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 14, 194, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 13, 100, 100],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [210, 113, 100, 87],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [210, 113, 100, 47],
           "reason": "subtree"
@@ -92,36 +32,16 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 114, 92, 45],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 114, 92, 45],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 114, 92, 45],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [310, 14, 92, 45],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [310, 14, 92, 45],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [310, 14, 92, 45],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [210, 114, 92, 45],
           "reason": "subtree"
@@ -137,51 +57,11 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [0, 3, 7, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [0, 3, 7, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [0, 3, 7, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [9, 3, 5, 2],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [9, 3, 5, 2],
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGViewportContainer svg",
-          "rect": [9, 3, 5, 2],
-          "reason": "subtree"
-        },
-        {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [6, 3, 4, 4],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutBlockFlow P",
           "rect": [6, 3, 4, 2],
           "reason": "subtree"
@@ -202,11 +82,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutSVGForeignObject foreignObject",
-          "rect": [0, 0, 1, 1],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutText #text",
           "rect": [0, 0, 1, 1],
           "reason": "subtree"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.png
index 50418a4..79b98794 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-viewbox-rescale-expected.txt
index 85288cd..a11c2da 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-viewbox-rescale-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -7,56 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 143, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 143, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner2'",
           "rect": [59, 143, 95, 23],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [59, 43, 95, 23],
-          "reason": "became visible"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [59, 43, 95, 23],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGViewportContainer svg id='inner1'",
           "rect": [59, 43, 95, 23],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
index d7e7f44..8403038 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -7,21 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [208, 14, 170, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [208, 14, 170, 17],
           "reason": "full"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [18, 194, 170, 17],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutSVGText text id='ttt'",
           "rect": [18, 194, 170, 17],
           "reason": "full"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
index 6bebf51..e66cbf1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -7,31 +7,11 @@
       "drawsContent": true,
       "paintInvalidations": [
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [200, 186, 256, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [200, 186, 256, 17],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [200, 186, 256, 17],
           "reason": "forced by layout"
         },
         {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [20, 6, 256, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan id='ts'",
-          "rect": [20, 6, 256, 17],
-          "reason": "full"
-        },
-        {
           "object": "LayoutSVGText text",
           "rect": [20, 6, 256, 17],
           "reason": "forced by layout"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt
index e1b70a29..444a860 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -15,11 +15,6 @@
           "object": "LayoutSVGText text id='status'",
           "rect": [90, 116, 64, 17],
           "reason": "full"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [90, 116, 44, 17],
-          "reason": "layoutObject insertion"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-detach-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-detach-expected.txt
index a35a3b7a..63ad26c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-detach-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/use-detach-expected.txt

@@ -29,16 +29,6 @@
         {
           "object": "LayoutSVGContainer use",
           "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use",
-          "rect": [210, 58, 44, 37],
           "reason": "layoutObject removal"
         },
         {
@@ -54,21 +44,6 @@
         {
           "object": "LayoutSVGInlineText #text",
           "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [210, 58, 44, 37],
           "reason": "layoutObject removal"
         },
         {
@@ -84,21 +59,6 @@
         {
           "object": "LayoutSVGText text id='use_text'",
           "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 37],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='use_text'",
-          "rect": [210, 58, 44, 37],
           "reason": "layoutObject removal"
         },
         {

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt
deleted file mode 100644
index b16fd08..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/window-expected.txt
+++ /dev/null

@@ -1,2054 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutSVGContainer g id='Windows'",
-          "rect": [38, 81, 760, 454],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGContainer g id='Windows'",
-          "rect": [38, 92, 760, 443],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 142, 549, 394],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='bigWindow'",
-          "rect": [38, 143, 549, 392],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'",
-          "rect": [38, 143, 549, 392],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarbigWindow'",
-          "rect": [38, 142, 549, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'",
-          "rect": [38, 143, 549, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 523, 549, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 181, 315, 238],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='nestedWindow'",
-          "rect": [77, 182, 315, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'",
-          "rect": [77, 182, 315, 236],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
-          "rect": [77, 181, 315, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'",
-          "rect": [77, 182, 315, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 406, 315, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='navWindow'",
-          "rect": [613, 81, 185, 169],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
-          "rect": [613, 81, 185, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-          "rect": [613, 81, 185, 159],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'",
-          "rect": [613, 81, 185, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [624, 92, 174, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='navWindow'",
-          "rect": [624, 92, 174, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'",
-          "rect": [624, 92, 174, 158],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='colourPickerWindow'",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 195, 174, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupcolourPickerWindow'",
-          "rect": [77, 195, 174, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
-          "rect": [77, 195, 174, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [624, 238, 174, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [77, 325, 174, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textNavWindow'",
-          "rect": [632, 101, 160, 99],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [311, 377, 159, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
-          "rect": [311, 377, 159, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [311, 507, 159, 13],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='smallWindow'",
-          "rect": [312, 377, 158, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupsmallWindow'",
-          "rect": [312, 377, 158, 143],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'",
-          "rect": [312, 377, 158, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [249, 343, 143, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='statusWindow'",
-          "rect": [249, 344, 143, 64],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupstatusWindow'",
-          "rect": [249, 344, 143, 64],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
-          "rect": [249, 343, 143, 16],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'",
-          "rect": [249, 344, 143, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textSmallWindow'",
-          "rect": [320, 398, 136, 65],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 326, 136, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 326, 136, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 182, 131, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 182, 131, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 406, 121, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 406, 121, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [38, 475, 120, 50],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='minimalWindow'",
-          "rect": [39, 476, 119, 48],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowMainGroupminimalWindow'",
-          "rect": [39, 476, 119, 48],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textStatusWindow'",
-          "rect": [257, 364, 118, 40],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGTSpan tspan",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text id='textMinimalWindow'",
-          "rect": [43, 480, 114, 38],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [41, 524, 98, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [41, 524, 98, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [314, 508, 87, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [314, 508, 87, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [252, 344, 75, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [252, 344, 75, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [314, 378, 69, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [314, 378, 69, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [80, 196, 64, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [80, 196, 64, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [41, 143, 59, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [41, 143, 59, 15],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-          "rect": [757, 94, 36, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [627, 238, 33, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [627, 238, 33, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [613, 81, 16, 159],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGInlineText #text",
-          "rect": [616, 153, 12, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGText text",
-          "rect": [616, 153, 12, 81],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [615, 99, 12, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [571, 145, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [571, 145, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [235, 197, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [235, 197, 12, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 83, 11, 12],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 83, 11, 12],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [376, 345, 11, 12],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [782, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [769, 94, 11, 11],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [769, 94, 11, 11],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [769, 94, 11, 11],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [769, 94, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [558, 145, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [454, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [454, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [441, 379, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [376, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [376, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [363, 184, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [222, 197, 11, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'",
-          "rect": [441, 380, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [441, 380, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'",
-          "rect": [376, 346, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [376, 346, 11, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [545, 153, 11, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [363, 354, 11, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [756, 103, 11, 2],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [756, 103, 11, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [209, 206, 11, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnestedWindow'",
-          "rect": [377, 184, 10, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [377, 184, 10, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [783, 95, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [783, 95, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [783, 95, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [783, 95, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-          "rect": [616, 100, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [616, 100, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-          "rect": [616, 84, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [616, 84, 10, 10],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [616, 84, 10, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonbigWindow'",
-          "rect": [572, 145, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [572, 145, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtonsmallWindow'",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [455, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [428, 380, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'",
-          "rect": [350, 185, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [350, 185, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='closeButton'",
-          "rect": [236, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'",
-          "rect": [223, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-          "rect": [223, 198, 10, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [783, 95, 10, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [783, 95, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [616, 116, 10, 9],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [616, 116, 10, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [616, 116, 10, 9],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [572, 146, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [350, 185, 10, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [616, 123, 10, 3],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [350, 192, 10, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [428, 388, 10, 2],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [757, 95, 9, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-          "rect": [757, 95, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [757, 95, 9, 10],
-          "reason": "full"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [757, 95, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'",
-          "rect": [546, 146, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [546, 146, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [364, 346, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-          "rect": [210, 198, 9, 10],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [757, 95, 9, 9],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [757, 95, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [546, 146, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [377, 185, 9, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [-1, 21, 7, 11],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGPath line",
-          "rect": [-1, 29, 6, 3],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 22, 5, 9],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutSVGRect rect",
-          "rect": [0, 22, 5, 9],
-          "reason": "layoutObject insertion"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGHiddenContainer symbol id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='Windows'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='navWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textNavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window should'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'contain navigation tools'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Click on button'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox ''Resize Navigation Window' for a'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'random resize of this Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Note that this window also'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'features a window decoration'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Statusbar'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='bigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a big movable window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='nestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window contains other windows'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='colourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Changing a colour changes background'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarcolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Colour Picker'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtoncolourPickerWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='statusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textStatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a none-moveable'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'none-closeable status'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Status Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonstatusWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Nested middlesize Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnestedWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='smallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textSmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This window has a callback'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'function indicating mouse'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'movements in the statusbar'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'and alerting window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'events'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Callback function is active'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Small Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonsmallWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='minimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowMainGroupminimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text id='textMinimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'This is a minimal window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'without title and status bar.'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGTSpan tspan",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineFlowBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'it is also not moveable'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupminimalWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='titleBarbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Big Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonbigWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer g id='Windows'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='navWindow'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='windowTitlebarGroupnavWindow'",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer g id='decoGroupnavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGRect rect id='decoGroupMinimizednavWindow'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGText text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGInlineText #text",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "InlineTextBox 'Navigation Window'",
-      "reason": "layoutObject insertion"
-    },
-    {
-      "object": "LayoutSVGContainer use id='closeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='closeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer use id='maximizeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='maximizeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGContainer use id='minimizeButtonnavWindow'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGViewportContainer svg id='minimizeButton'",
-      "reason": "full"
-    },
-    {
-      "object": "LayoutSVGRect rect",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutSVGPath line",
-      "reason": "bounds change"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
index dab8b51..debef6d9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-foreignObject-expected.png
index 124fbba..9996611 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table-collapsed-border-expected.txt
index 5eba99d..03d011fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table-collapsed-border-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table-collapsed-border-expected.txt

@@ -12,11 +12,6 @@
           "reason": "full"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 186, 102, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTable TABLE",
           "rect": [8, 96, 101, 76],
           "reason": "full"
@@ -32,11 +27,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutTableSection TBODY",
-          "rect": [12, 100, 93, 68],
-          "reason": "forced by layout"
-        },
-        {
           "object": "LayoutTableCell TD",
           "rect": [22, 316, 87, 28],
           "reason": "forced by layout"
@@ -68,36 +58,11 @@
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 297, 77, 17],
-          "reason": "layoutObject insertion"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 125, 77, 17],
           "reason": "layoutObject removal"
         },
         {
           "object": "LayoutText #text",
-          "rect": [23, 317, 51, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 145, 51, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 277, 43, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [23, 105, 43, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
           "rect": [23, 211, 34, 17],
           "reason": "layoutObject removal"
         },
@@ -115,16 +80,6 @@
           "object": "LayoutTableCell TD",
           "rect": [8, 124, 14, 20],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 211, 4, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [17, 125, 4, 17],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
deleted file mode 100644
index 5611988..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt
+++ /dev/null

@@ -1,105 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 292, 106, 236],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 100, 106, 190],
-          "reason": "incremental"
-        },
-        {
-          "object": "LayoutTableRow TR",
-          "rect": [0, 102, 106, 46],
-          "reason": "bounds change"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 238],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 292, 102, 236],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 46],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 401, 46, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 162, 46, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 116, 46, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 67, 46, 17],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "incremental"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW1'",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutTableRow TR",
-      "reason": "bounds change"
-    },
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'ROW2'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
deleted file mode 100644
index 9472a570..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-repaint-vertical-align-cell-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 52, 102, 476],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 281, 63, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 91, 63, 17],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt
deleted file mode 100644
index a1eb447..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/table/resize-table-row-repaint-expected.txt
+++ /dev/null

@@ -1,46 +0,0 @@
-{
-  "layers": [
-    {
-      "name": "LayoutView #document",
-      "bounds": [800, 600],
-      "contentsOpaque": true,
-      "drawsContent": true,
-      "paintInvalidations": [
-        {
-          "object": "LayoutTableCell TD",
-          "rect": [2, 102, 102, 200],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 193, 63, 17],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [3, 143, 63, 17],
-          "reason": "forced by layout"
-        }
-      ]
-    }
-  ],
-  "objectPaintInvalidations": [
-    {
-      "object": "LayoutTableCell TD",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "RootInlineBox",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "LayoutText #text",
-      "reason": "forced by layout"
-    },
-    {
-      "object": "InlineTextBox 'MIDDLE'",
-      "reason": "forced by layout"
-    }
-  ]
-}
-

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-match-document-change-expected.txt
index ff00f33..1f0fa652 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-match-document-change-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-match-document-change-expected.txt

@@ -17,11 +17,6 @@
           "reason": "layoutObject removal"
         },
         {
-          "object": "LayoutText #text",
-          "rect": [18, 128, 84, 17],
-          "reason": "layoutObject insertion"
-        },
-        {
           "object": "LayoutView #document",
           "rect": [295, 102, 15, 400],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-expected.png
index 3d7c29e2..19401ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-horizontal-expected.png
index 3d7c29e2..19401ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/textarea-caret-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/textarea-caret-expected.txt
index 2e02823..68ca4f0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/textarea-caret-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/textarea-caret-expected.txt

@@ -17,11 +17,6 @@
           "reason": "subtree"
         },
         {
-          "object": "LayoutBlockFlow DIV id='inner-editor'",
-          "rect": [11, 11, 175, 16],
-          "reason": "subtree"
-        },
-        {
           "object": "LayoutTextControl TEXTAREA id='editor'",
           "rect": [9, 30, 164, 15],
           "reason": "scroll"

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/window-resize-vertical-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
index 3be2d60..c1a3707 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/window-resize-vertical-writing-mode-expected.txt

@@ -40,11 +40,6 @@
           "object": "LayoutBlockFlow BODY",
           "rect": [491, 8, 414, 484],
           "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [493, 8, 411, 484],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/circle-with-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/circle-with-shadow-expected.png
index efc3343..e8ddb28 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/circle-with-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/circle-with-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
index 014de2f..dfec83a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/roundedrects/input-with-rounded-rect-and-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-125-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-125-expected.png
index 266c00b..61696c4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-150-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-150-expected.png
index 4f61f14f..d6d44745 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-150-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-150-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-175-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-175-expected.png
index 19d991b0..c36665a77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-175-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-175-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-200-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-200-expected.png
index 5521c2b..50fe1f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-250-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-250-expected.png
index c6f8d02..e4a034d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-250-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/spellmarkers/document-markers-zoom-250-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/plugins/embed-attributes-style-expected.png b/third_party/WebKit/LayoutTests/platform/win/plugins/embed-attributes-style-expected.png
index 42a3519..932715a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/plugins/embed-attributes-style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/plugins/embed-attributes-style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
index 1975e4b..d9a6577 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/coords-dom-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
index aad9957..f64bdb4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
index 62016ed2..0bccf1c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
index d1a4d9d..838a832 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-control-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
index 4b8e329..2cd3295 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-05-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
index f95c5a4..55f4f5cf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/painting-marker-06-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
index d972ab5..a413751 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
index 81e3c35..c93d853 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
index 76d3a40..11cc07c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/pservers-pattern-04-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
index a9d69b2..934aa11 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/struct-use-11-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
index 8b5ecbc..7687198 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/types-dom-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
index 3f923e3..2e769749 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
index 3317672a..2988b6d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
index 74fe081d..c7f0623 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
index 515e3c9..97d228e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
index 782c134..31710db 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
index 3740662..7bc46c4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-21-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
index 4070af0..4b352f5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-23-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
index c7d0b5c..11b3b8a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-28-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
index 16078ccb..27e75d6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-29-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
index 70f1d84..4aa89cb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-30-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
index 1e1bea6..9b97473 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-33-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
index cb14702..5e4b9b7b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-34-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
index ece7cf0..eb8e94e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-36-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
index 1448cca..8db2809e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
index 974227e..2e85999 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
index d1b3699..4f4c8d8d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-41-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
index 618e3b8..927d59a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-44-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
index 7d634df1..868587e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
index 31fbc43..a775211f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-78-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
index 5a55fb98..8d9b9c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-80-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
index 632de5e..b03912e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-81-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
index 477d63e..d5a9dec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-82-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
index 0b1ed13..94e7138 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
index 283a3c4..6082418 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
index 724c14ee..080d288 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
index 98cb9bc..28e137fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/color-prop-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
index 7858fea..864f7db 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-trans-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
index 8d1beb8..88a3e76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
index 1cf0262b..d5405354 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-units-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
index 5ec5495..9c13d73 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
index 397c4b9..75229f0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
index 6476848a..7f2de88 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/extend-namespace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
index 0718d2b..dd71b33 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
index 1117c6e..9283019 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
index fd0eb29..17e0ce7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/filters-morph-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
index b0f89d291..0e6a8951 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-cursor-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
index 3fe8e28..2d9b9de 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
index 56da7151..7d57c89 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-order-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
index 21535a5..81eb0ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/interact-zoom-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
index 6c37c4b..79161394 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
index ec7672a..50a1f4b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
index 1e9e169..e8ac012 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
index ca0b60fa..64f43bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
index fb7fad3..d66b822b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
index 65b8b80..bc97fb6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-a-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
index 438a9cd9..ad6350a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/linking-uri-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
index 17de1064..71594a2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-path-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
index 1bbab04..4ceb20d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/masking-path-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
index 85e6c218..40f94f0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
index be03ed8..3670c64 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-fill-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
index 45241f0..6f8609b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
index 062fb73..8963c51 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
index 9bee863..26383a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
index 4ceadae..b51b6ef 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
index d84e99bb..7e7b10b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
index 4f5aab14..7190876 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
index 4a93fd5..e5c3ad97 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
index 6d0b2a2..25a9b8b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/painting-stroke-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
index b646e51..e5ca64bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
index a48971ba..cfbb517f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
index 869a83d..53f51a37d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-03-f-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
index bd69af8..c051965 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
index da7c45e..bcabdecd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
index d81859b..f74fa0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
index 37ca96bf..98f10f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-08-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
index 85807c0..1bc5f6e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-08-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-09-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
index c8a6fe27..ad49f3c8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-09-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-10-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
index 82ae152..f13210933 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-10-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-12-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
index 73de185..b306404 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-12-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-14-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
index f4b8e34..4e3e751 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-14-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-15-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
index f299aed..8473a0af 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/paths-data-15-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
index 0685ef5..c08a4f17 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
index 9587a889..6272f2c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/render-elems-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
index e02cd84..23bae88 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
index de6b6c9..83d0e374 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-04-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
index 10f5948..f089801 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/script-handle-04-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
index fd0c789e..f6dc02f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
index ce3c1c9b..1c4fd06 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-circle-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
index 2bb37a0..02e86265b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
index 88dd7a4..ff8f59a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-ellipse-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
index c9aa3065..82e19b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-line-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
index 69e4f9dc..ed69ed0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polygon-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
index fdc9a30..560da08b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-polyline-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
index f6257558c..0c577a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
index e07b19d..f2a0f29a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/shapes-rect-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
index 4cf5f24..a465be17 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
index 4bcc4b5..ba08396 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
index 93d4ee5..ac8f880 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-04-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
index 571b1ae..6d5ae75 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
index aff4b2f..93639df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
index 756d5775..76fa39f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-group-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
index 3c39acf1..442ca9f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
index e5f50c2..cf1fdc68 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/struct-use-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
index 1852712d..f031994 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-02-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
index 4d5a84f..a3fa602 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-02-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-03-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
index dec4de9..a9a7767 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-css-03-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
index 3f1a8274..e406cae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/styling-inherit-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-01-b-expected.png
index fb55628b..d39e98d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-05-b-expected.png
index e7ade22..437522e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
index 5ec47078..99e19bf4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/text-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
index 777aefa..ec71ebe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1/types-basicDOM-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
index 5234ecb..1252683 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-01-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
index 40f3383..1566275 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-02-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
index c82da212..0052bf4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.2-Tiny/struct-use-recursion-03-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1a-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1a-expected.png
new file mode 100644
index 0000000..6ba834dc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1c-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1c-expected.png
index 6e93568..3b9365f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/animations/animateMotion-accumulate-1c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
index 08210c6..39059db1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-1-expected.png
index 35fea62d..0240b41 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-3-expected.png
index 05392c2..073ff49 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-5-expected.png
index dd8c0566..90c5bee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-6-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
index 00e7cd2..d89fbdaa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-background-image/svg-as-background-6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-deviceScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-deviceScaleFactor-expected.png
index b91011ef..c43155cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-deviceScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-deviceScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-pageScaleFactor-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-pageScaleFactor-expected.png
index d3f38b5..9a796af 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-pageScaleFactor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/image-respects-pageScaleFactor-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.png
index 18dadffa..949508d5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-2-expected.png
index 16bb4e646..edde34e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/as-image/img-preserveAspectRatio-support-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/filters/feTile-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/filters/feTile-expected.png
index 307b3cb..8db2572 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/filters/feTile-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/filters/feTile-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/masking/maskRegions-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/masking/maskRegions-expected.png
index df39acb9..4f21c803 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/masking/maskRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/masking/maskRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternPreserveAspectRatioA-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternPreserveAspectRatioA-expected.png
index ae7750ca..f31ccdb2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternPreserveAspectRatioA-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternPreserveAspectRatioA-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-expected.png
index eeb2f9d9..d633a61 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-positioned-objects-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-positioned-objects-expected.png
index 2a4c0cc..97a026a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-positioned-objects-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/paints/patternRegions-positioned-objects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textDecoration2-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textDecoration2-expected.png
index ee586f9..f183743 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textDecoration2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textDecoration2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textGlyphOrientationHorizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textGlyphOrientationHorizontal-expected.png
index a6e6d0b..0dee7d4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textGlyphOrientationHorizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textGlyphOrientationHorizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textProperties-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textProperties-expected.png
index 859bb30..4f7a0543 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textProperties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/textProperties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/verticalText-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/verticalText-expected.png
index 0a7b216..601509d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/verticalText-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/batik/text/verticalText-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/canvas/canvas-pattern-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/canvas/canvas-pattern-svg-expected.png
index f73c9b6..dfc6688e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/canvas/canvas-pattern-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/canvas/canvas-pattern-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/button-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/button-expected.png
index 9e87e251..4497b52 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/button-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/button-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/colourpicker-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/colourpicker-expected.png
index 0c2bd2db4..aec6f4f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/colourpicker-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/colourpicker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/combobox-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/combobox-expected.png
index ba333ebf..9da1112 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/combobox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/combobox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/scrollbar-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/scrollbar-expected.png
index f436dd2..a54b38d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/scrollbar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/scrollbar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/selectionlist-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/selectionlist-expected.png
index 1edd5e8c..7b20004 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/selectionlist-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/selectionlist-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/slider-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/slider-expected.png
index 8822e3f1..6426652e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/slider-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/carto.net/slider-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-pixelation-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-pixelation-expected.png
index ba98ac68..16d55769 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-pixelation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-pixelation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-text-and-shape-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-text-and-shape-expected.png
index 79ea81a..31499dff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-text-and-shape-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-text-and-shape-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-with-text-clipped-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-with-text-clipped-expected.png
index f823c143..5556def6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-with-text-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/clip-path-with-text-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
index 5aa97f5..bb938189 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-expected.png
index 5f3dae38..a30ab07 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
index 60eae1c..3ae13ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/clone-element-with-animated-svg-properties-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/clone-element-with-animated-svg-properties-expected.png
index ef87609..4049d1c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/clone-element-with-animated-svg-properties-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/clone-element-with-animated-svg-properties-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/embedding-external-svgs-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/embedding-external-svgs-expected.png
index e60d9fe..7c1ea191 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/embedding-external-svgs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/embedding-external-svgs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/focus-ring-expected.png
index 8227f15..0eb7f9b7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/foreign-object-skew-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/foreign-object-skew-expected.png
index a51427b..3d0f7f12 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/foreign-object-skew-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/foreign-object-skew-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
index a4b3d82..ce02fdc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
index ab44c26..e7cb08d0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-div-area-nested-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
index c264a9e..f492a36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/getscreenctm-in-scrollable-svg-area-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/gradient-with-1d-boundingbox-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/gradient-with-1d-boundingbox-expected.png
index 55d7876..d70e9a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/gradient-with-1d-boundingbox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/gradient-with-1d-boundingbox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/inline-svg-in-xhtml-expected.png
index 0c9338a..eb8a965 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/inline-svg-in-xhtml-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/inline-svg-in-xhtml-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/invalid-css-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/invalid-css-expected.png
index 03874ea..727492d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/invalid-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/invalid-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
index d79fe8e8..3837e81 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-preserveAspectRatio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-transform-expected.png
index 6823b2c..545e8a23 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-expected.png
index 9dcaf1f..461f1b98 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-transform-expected.png
index 0a5008d..7072690 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewBox-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewTarget-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewTarget-expected.png
index d79fe8e8..3837e81 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewTarget-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-viewTarget-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-zoomAndPan-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-zoomAndPan-expected.png
index d79fe8e8..3837e81 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-zoomAndPan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-a-03-b-zoomAndPan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-uri-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-uri-01-b-expected.png
index b8781767..9909f39 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-uri-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/linking-uri-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/marker-orient-auto-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/marker-orient-auto-expected.png
index c9c8e87..90f0593 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/marker-orient-auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/marker-orient-auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/masking-clipping-hidpi-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/masking-clipping-hidpi-expected.png
index 382dacc..be40ea0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/masking-clipping-hidpi-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/masking-clipping-hidpi-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-expected.png
index df2ccf7..33eef9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-standalone-expected.png
index df2ccf7..33eef9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-container-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-expected.png
index 133377ea..e2145ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-standalone-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-standalone-expected.png
index 133377ea..e2145ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-standalone-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/mouse-move-on-svg-root-standalone-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-expected.png
index 23a70665..ec63eb7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-no-width-height-expected.png
index 7b442ac..0cec53c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/object-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-incorrect-tiling-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-incorrect-tiling-expected.png
index 8d7c38f..3a79451c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-incorrect-tiling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-incorrect-tiling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-expected.png
index c248421..1bdd615b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-gaps-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-gaps-expected.png
index 38bf610..f0eb4be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-gaps-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/pattern-rotate-gaps-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/preserve-aspect-ratio-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/preserve-aspect-ratio-syntax-expected.png
index b7aad14..6f0d78e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/preserve-aspect-ratio-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/preserve-aspect-ratio-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/second-inline-text-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/second-inline-text-expected.png
index b596ef4e..d9d17b2c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/second-inline-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/second-inline-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/shape-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/shape-rendering-expected.png
index 6ac6638b..40d263c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/shape-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/shape-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/shapes-supporting-markers-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/shapes-supporting-markers-expected.png
index 1eae98e8..dcb16e99 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/shapes-supporting-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/shapes-supporting-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/stroke-width-large-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/stroke-width-large-expected.png
index 07a7ad18..17cb20f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/stroke-width-large-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/stroke-width-large-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-float-border-padding-expected.png
index 2219c2a..b89aec2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png
index 448baf82..43acade 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/svg-fonts-in-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/text-match-highlight-expected.png
index 844489d..5a43788 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/transformed-outlines-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/transformed-outlines-expected.png
index d4ffbb2..e30ced1b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/transformed-outlines-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/transformed-outlines-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-container-in-target-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-container-in-target-expected.png
index 2b582f9e..ea2818b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-container-in-target-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-container-in-target-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-target-container-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-target-container-expected.png
index 0f97879b..eb61ff3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-target-container-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-modify-target-container-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-containing-use-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-containing-use-expected.png
index ecc79b34..2c53a1c5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-containing-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-containing-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-expected.png
index c51f8e3..3c73362 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-symbol-inside-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-symbol-inside-pattern-expected.png
index c4cab3a..8fd9cd5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-symbol-inside-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-symbol-inside-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-use-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-use-expected.png
index c51f8e3..3c73362 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-use-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-on-use-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-transform-expected.png
index a94be2c..a5512ea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/use-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/custom/viewbox-syntax-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/viewbox-syntax-expected.png
index 3b95a2c..bdb8bebe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/viewbox-syntax-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/viewbox-syntax-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/dom/SVGLocatable-getCTM-svg-root-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
index 6ff89d4..598909dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/dom/SVGLocatable-getCTM-svg-root-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/dom/css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/dom/css-transforms-expected.png
index 7ce48b7..4ecb7df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/dom/css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/dom/css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
index 484ff16b..0d6e180 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
index 8f9a2a8..d946d80 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
index 484ff16b..0d6e180 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
index 8f9a2a8..d946d80 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/error/017-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/error/017-expected.png
index 2e1cc7c..81d49497 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/error/017-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/error/017-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/003-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/003-expected.png
index 0052988..4149b51 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/003-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/003-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/006-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/006-expected.png
index f83604109..d874d914 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/008-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/008-expected.png
index c9b88a5..81ea07d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/011-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/011-expected.png
index f83604109..d874d914 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/011-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/mixed/011-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/001-expected.png
index 49ea7856..adbf90de 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/002-expected.png
index 765f34d..e9d3d6d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/005-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/005-expected.png
index 8b637d91..2fa3606a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/005-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/006-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/006-expected.png
index ab74132..5184855 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/006-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/006-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/007-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/007-expected.png
index 7f0a94e1..07868ce 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/007-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/perf/007-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
index ba3f838..302417e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
index 1291cdc..7037155 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/hixie/viewbox/preserveAspectRatio/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/in-html/circle-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/in-html/circle-expected.png
index 712505a..3172855 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/in-html/circle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/in-html/circle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/ligature-queries-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/ligature-queries-expected.png
index 2b669b3..9a80985 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/ligature-queries-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/ligature-queries-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/small-fonts-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/small-fonts-3-expected.png
index ff6f212..c4e7d49c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/small-fonts-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/small-fonts-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-decorations-in-scaled-pattern-expected.png
index 3ec40f37..e74d539 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-decorations-in-scaled-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-decorations-in-scaled-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-fill-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-fill-opacity-expected.png
index d5b7860..29c0ff9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-fill-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-fill-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-01-b-expected.png
index 0d2090d..7daaee7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-05-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-05-b-expected.png
index e66d93f..54cace2b6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-05-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-align-05-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-deco-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-deco-01-b-expected.png
index d975488..2b7c5230 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-deco-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-deco-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-path-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-path-01-b-expected.png
index 715014fb..aea26ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-path-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-path-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-06-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-06-t-expected.png
index e528fdc..7f4e841 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-06-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-06-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-07-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-07-t-expected.png
index 82e4c97..e4089bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-07-t-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/text/text-selection-text-07-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-clip-path-expected.png
index 4e3f759..c53122bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-expected.png
index 17e2d7a8..5be3521 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/svg-css-transforms-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
index a5342c0..5d9c6f0c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-mask-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
index e0d0b487..1d60b8d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-with-svg-transform-expected.png
index ea68a2e..4b8e177 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-with-svg-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/transforms/text-with-pattern-with-svg-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/wicd/test-scalable-background-image1-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/wicd/test-scalable-background-image1-expected.png
index ead3ef0..0599c59 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/wicd/test-scalable-background-image1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/wicd/test-scalable-background-image1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-background-images-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-background-images-expected.png
index 9c24a8ff..c591cd7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-background-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-background-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
index e8b888c5..cde01a8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-foreignObject-expected.png
index 9d266fed..ad9181c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-foreignObject-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-hixie-mixed-008-expected.png
index 8b8aef7e..534eaf4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
index 2735a468..1d677b94 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-mask-with-percentages-expected.png
index 503b2608..f5bba72 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-mask-with-percentages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-mask-with-percentages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-float-border-padding-expected.png
index 0197d2e..4952e2b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
index 0d34586..d684a048 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
index 0d34586..d684a048 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
index e58b9bd..f0f3997 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-auto-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
index 798a302..6dd5fc66 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-override-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
index 9bd8a9b..8067e43f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-hixie-mixed-008-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-hixie-mixed-008-expected.png
index a934259c..3ba44402 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-hixie-mixed-008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-hixie-mixed-008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-svg-float-border-padding-expected.png
index 959edab..b5e17c3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-svg-float-border-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/text/zoom-svg-float-border-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-1-expected.png
index 3ed558e..2959262 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-2-expected.png
index 720e860..1bd9efa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/layering/paint-test-layering-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10009-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10009-expected.png
index 42d2410..c78c8a3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10009-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10009-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10036-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10036-expected.png
index 505128d..956acc3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10036-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10036-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10039-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10039-expected.png
index 16b75d6..2d980b3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10039-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug10039-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1055-1-expected.png
index bac048a..a9355fe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1055-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1055-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1067-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1067-2-expected.png
index 85198b0..6484ad5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1067-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1067-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug106816-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug106816-expected.png
index 7708369d..d8c0e36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug106816-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug106816-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug109043-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug109043-expected.png
index 34e3571..dbe859ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug109043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug109043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-1-expected.png
index 768c830..ecc7d2e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-3-expected.png
index 858e88c..2c9f10c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug113235-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384q-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384q-expected.png
index 500b13a54..15abc9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384q-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384q-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384s-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384s-expected.png
index 4f069d7..bd13f83 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11384s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1188-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1188-expected.png
index 9c7074f..5e3059f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug119786-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug119786-expected.png
index 92bdab2..087af9bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug119786-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug119786-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1224-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1224-expected.png
index f3d088e2..89bd87a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1224-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1224-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12384-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12384-expected.png
index 28fc782..68860e38 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12384-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12384-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1261-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1261-expected.png
index 5c8ebfb5..e0afd79e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1261-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1261-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12908-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12908-1-expected.png
index 3017974..bce8b935 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12908-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12908-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12910-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12910-expected.png
index ec251417..9635297 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12910-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug12910-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1302-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1302-expected.png
index ec58d46..b0d3f42 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1302-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1302-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug13118-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug13118-expected.png
index 7bc514b..8d0ab91 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug13118-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug13118-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug133756-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug133756-2-expected.png
index 188cb13..45ef0c0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug133756-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug133756-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug139524-4-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug139524-4-expected.png
index ecfbe379..f3f54b8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug139524-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug139524-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14323-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14323-expected.png
index 4deeefa..53d974bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14323-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14323-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1474-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1474-expected.png
index f2b0f7f..5d40cb8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1474-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1474-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14929-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14929-expected.png
index 457475b..a7629a71 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14929-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug14929-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug16252-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug16252-expected.png
index 5bc9bc1..a069fd5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug16252-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug16252-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17168-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17168-expected.png
index cdb1a18..baad22ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17168-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17168-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17548-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17548-expected.png
index b5358c4..aa2ecda 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17548-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17548-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17587-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17587-expected.png
index 0d37345b..45b983d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17587-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug17587-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1800-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1800-expected.png
index 14b8457..4f50715c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1800-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1800-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802-expected.png
index 1282680..1608918 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802s-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802s-expected.png
index 1282680..1608918 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802s-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1802s-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1809-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1809-expected.png
index 42d2410..c78c8a3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1809-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1809-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1828-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1828-expected.png
index 3e177f6..dd766a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1828-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug1828-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18359-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18359-expected.png
index d8547b4a..02da85f0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18359-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18359-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18558-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18558-expected.png
index 21a65b9c..fce0a050 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18558-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18558-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18955-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18955-expected.png
index be90c3b..00cb470a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18955-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug18955-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug19599-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug19599-expected.png
index 52082148..479d78a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug19599-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug19599-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2065-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2065-expected.png
index 98efd7b..7318a6c5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2065-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2065-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug20804-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug20804-expected.png
index 0684c7d..4c06daff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug20804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug20804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21299-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21299-expected.png
index d052eb59..6e55a4f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21299-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21299-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21918-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21918-expected.png
index 1039072..0645cbd9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21918-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug21918-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug220536-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug220536-expected.png
index 9a18f443..b0d2fe6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug220536-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug220536-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug221784-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug221784-1-expected.png
index ec6d3c3..41da5a20 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug221784-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug221784-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2-expected.png
index 35f956b6..11278ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2a-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2a-expected.png
index 35f956b6..11278ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-2a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3-expected.png
index c6abedfd..8a7bbfc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3a-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3a-expected.png
index c6abedfd..8a7bbfc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3a-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22246-3a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2267-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2267-expected.png
index 1bb6660..ec8364d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2267-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2267-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2296-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2296-expected.png
index 8f3a90858..e117b164 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2296-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2296-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug23235-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug23235-expected.png
index 04ca985..757ef26 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug23235-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug23235-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24503-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24503-expected.png
index e7b9cd3..2085a07 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24503-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24503-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24627-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24627-expected.png
index 1dcf10e..b0f709b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24627-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24627-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24661-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24661-expected.png
index bd91be6..11db88be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24661-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24661-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2479-3-expected.png
index 8af8486..0389153 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2479-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2479-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24880-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24880-expected.png
index 0a4fb92d..1dde937 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24880-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug24880-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug25004-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug25004-expected.png
index 42d2410..c78c8a3c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug25004-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug25004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2516-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2516-expected.png
index 3ae59558..ad5c0c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2516-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2516-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2585-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2585-expected.png
index dd4bc6ca..41fb5b1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2585-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2585-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2684-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2684-expected.png
index 5d147ed..02ed6b6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2684-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2684-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27038-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27038-2-expected.png
index e8165bf..3b4b94e2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27038-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27038-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2757-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2757-expected.png
index 9f1ddd1..df88254c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2757-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2757-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2773-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2773-expected.png
index 5d147ed..02ed6b6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2773-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2773-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27993-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27993-1-expected.png
index 12cf6ef..6f07c66 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27993-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug27993-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2886-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2886-expected.png
index bfea408..f121db0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2886-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug2886-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug28928-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug28928-expected.png
index 2d1c9ec0..60d0cc4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug28928-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug28928-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29058-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29058-1-expected.png
index 5249e95d..12e7905 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29058-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29058-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29157-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29157-expected.png
index e53facb..98a817e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29157-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug29157-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30273-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30273-expected.png
index 7cb57789..998a6f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30273-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30273-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-1-expected.png
index 084c517..67be5da 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-2-expected.png
index 084c517..67be5da 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30332-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30418-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30418-expected.png
index fd2da3ab..0ab949d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30418-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30418-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30692-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30692-expected.png
index d9b17e2c..7663ee3d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30692-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug30692-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3191-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3191-expected.png
index 482d07c8..c5f3fc7b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3191-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3191-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-2-expected.png
index 03d8a081..2340d71 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-5-expected.png
index 7cf8bcc..8f9884c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32205-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3260-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3260-expected.png
index 6f4ba679..71328e84 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3260-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3260-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3263-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3263-expected.png
index 16f01c4..d24b866 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3263-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3263-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32841-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32841-expected.png
index 8e97e952..08e50ec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32841-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug32841-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3309-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3309-2-expected.png
index 31836a2..4fc12c40 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3309-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3309-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug33137-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug33137-expected.png
index df60b8085..9227ef2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug33137-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug33137-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug34176-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug34176-expected.png
index 8f2e122..be3fe3cb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug34176-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug34176-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3454-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3454-expected.png
index 873713c..1fb0743 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3454-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3454-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug35662-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug35662-expected.png
index 262c1a3..b785f38 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug35662-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug35662-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3718-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3718-expected.png
index b14c210..8f790d3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3718-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3718-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug39209-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug39209-expected.png
index d098658..f03a6d0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug39209-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug39209-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3977-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3977-expected.png
index de07f31..2959000 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3977-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3977-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42187-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42187-expected.png
index 1c92c9afc..d047833 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42187-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42187-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42443-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42443-expected.png
index 6235a97..5b03ad9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42443-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug42443-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4284-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4284-expected.png
index 45994505..3ad4424 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4284-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4284-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4385-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4385-expected.png
index 9503bee..0ea607a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4385-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4385-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug43854-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug43854-1-expected.png
index 9b61ff1b..dec68b34 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug43854-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug43854-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4427-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4427-expected.png
index cda631f..fbf5339 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4427-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4427-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4429-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4429-expected.png
index bfd503b..37a84f36 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4429-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4429-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44505-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44505-expected.png
index 0c88f4e..cd151d4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44505-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44505-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44523-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44523-expected.png
index 7f8e64f4..2b8c0d6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug44523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4501-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4501-expected.png
index f63807e..74a21d76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4501-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4501-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4520-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4520-expected.png
index 7854e95..7d3b2eef 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4520-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4520-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4523-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4523-expected.png
index 014ebb7e..b3c0ea7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4523-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4523-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug45486-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug45486-expected.png
index e0e2d8c..1890f83 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug45486-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug45486-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4576-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4576-expected.png
index a57a282..75a9b29 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4576-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug4576-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-1-expected.png
index ee0748b5..7fcdcde 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-2-expected.png
index ee0748b5..7fcdcde 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-3-expected.png
index 96ffca2..1b34907 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-5-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-5-expected.png
index 76e5dcba..e1d325bc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-expected.png
index 76e5dcba..e1d325bc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46268-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46924-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46924-expected.png
index bd89c4df..339113a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46924-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46924-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46944-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46944-expected.png
index f6e14cc..51763a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46944-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46944-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug47432-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug47432-expected.png
index 6d9f178c..e8be734 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug47432-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug47432-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-1-expected.png
index 80497ed..c7fbb2368 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-2-expected.png
index c48242b..d587ca8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug48028-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51037-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51037-expected.png
index 0766932..218188c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51037-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51037-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51140-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51140-expected.png
index 6aac09e..926a48dc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51140-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug51140-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5188-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5188-expected.png
index 1a01de3c..a18bd34 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5188-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5188-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-1-expected.png
index c5184c9..3b28073 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-2-expected.png
index 1f69b44..9fad9cb1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug53690-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug54450-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug54450-expected.png
index a186590..fc9ed21 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug54450-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug54450-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug55694-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug55694-expected.png
index 11c8999..5d6a4f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug55694-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug55694-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56201-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56201-expected.png
index dbc66fd..389ca9f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56201-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56201-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56563-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56563-expected.png
index a3183be..284ec77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56563-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug56563-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57300-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57300-expected.png
index 3f6c9b1..a24a474 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57300-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57300-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57378-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57378-expected.png
index 415f7b3..0b4bd6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57378-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug57378-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5797-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5797-expected.png
index f6ce1a7..1c4a998 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5797-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5797-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5799-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5799-expected.png
index 759d703..148a49c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5799-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5799-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5835-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5835-expected.png
index 2a6a2d7..81896bb4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5835-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5835-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5838-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5838-expected.png
index 6794eb1..2336b9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5838-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug5838-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug58402-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug58402-1-expected.png
index 560064009..619efe6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug58402-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug58402-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug59354-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug59354-expected.png
index a5c28c6..5042ba6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug59354-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug59354-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60013-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60013-expected.png
index 373bdedd..67b744b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60013-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60013-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60749-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60749-expected.png
index 074be59f..212ac6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60749-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60749-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60804-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60804-expected.png
index d6632cfe..5cc8ed8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60804-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60804-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60807-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60807-expected.png
index d6632cfe..5cc8ed8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60807-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60807-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60992-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60992-expected.png
index f9adc2a..95b49f8e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60992-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug60992-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6184-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6184-expected.png
index d25a1510..701eb2f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6184-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6184-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6304-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6304-expected.png
index d9198259..a8f7379 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6304-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6304-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug647-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug647-expected.png
index d2744ff..2d75bb6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6674-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6674-expected.png
index 009ba4d6..b9c98b4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6674-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug6674-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug68998-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug68998-expected.png
index 6e90b542..c9b4742b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug68998-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug68998-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-1-expected.png
index d6fa50b0..2f21b27 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-2-expected.png
index 392f8fb..e0e4905 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug69382-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-1-expected.png
index ed07ff86..eba22e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-2-expected.png
index 8e29418..0c99737 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7112-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7121-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7121-1-expected.png
index 5b713df..fd31465 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7121-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7121-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug727-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug727-expected.png
index 66cc22ef..c8572c5b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug727-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug727-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7342-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7342-expected.png
index 69f7549..5c6d5d3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7342-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7342-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7471-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7471-expected.png
index b50482d..c3d82057 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7471-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7471-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.png
index fe06d11..24fade9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug81934-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug81934-expected.png
index 3ced683..8a166cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug81934-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug81934-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug82946-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug82946-1-expected.png
index 7c42e77..0e69356 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug82946-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug82946-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8381-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8381-expected.png
index c310046..3919cd8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8381-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8381-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug86708-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug86708-expected.png
index 4191d85..d57ebf2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug86708-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug86708-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8950-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8950-expected.png
index af3aafa..ebf87184 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8950-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug8950-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-1-expected.png
index cb2e4ea6..06d37ede 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-2-expected.png
index 34171c5..69f8583ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9123-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug92647-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug92647-2-expected.png
index 4c59302..d75d23593 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug92647-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug92647-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9271-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9271-1-expected.png
index 2be8da7..cee6603 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9271-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9271-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug965-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug965-expected.png
index 7e9751698..7478e05 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug965-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug965-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9879-1-expected.png
index 87efe54..cb3940e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug99948-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug99948-expected.png
index 800be9d..d592e73 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug99948-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug99948-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/bloomberg-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/bloomberg-expected.png
index c078e1eb..128c0ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/bloomberg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/bloomberg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/borders-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/borders-expected.png
index 6a63f11..a761cf27 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/borders-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/borders-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_span-expected.png
index f55caa4d..fdd4a22d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_auto-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_auto-expected.png
index 8629ed74..ec6c0df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFix-expected.png
index fc7da43..7d443bb8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
index 9c351cbe..c75a161 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoPer-expected.png
index f6ae154..50aa064 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fix-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fix-expected.png
index 627f563..e3f11513 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fixPer-expected.png
index b90659a..b13ffba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_per-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_per-expected.png
index ead504f7..7815d95 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_auto_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_auto-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_auto-expected.png
index 1a2e4fc..63ccf76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_auto-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_auto-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoFix-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoFix-expected.png
index 3081a014..b0a6ad7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoFix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoFix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoPer-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoPer-expected.png
index 46c7bfd..88255eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_autoPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fix-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fix-expected.png
index f8a06053..78c1d08 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fix-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fix-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fixPer-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fixPer-expected.png
index d35698f..e00a95b2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fixPer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_fixPer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_per-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_per-expected.png
index 1bc0cd65..56c4f8c5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_per-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/col_widths_fix_per-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/margins-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/margins-expected.png
index 39166986..3d68a9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/margins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/margins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/misc-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/misc-expected.png
index d4a8138..b0f5d643 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/misc-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/misc-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/nested1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/nested1-expected.png
index e006a37e..d0e3243 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/nested1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/nested1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/one_row-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/one_row-expected.png
index ef87147..39f42bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/one_row-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/one_row-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/row_span-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/row_span-expected.png
index 2e10a35..8663c51 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/row_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/row_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_frame-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_frame-expected.png
index a712a86d..353381da 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_frame-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_frame-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_widths-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_widths-expected.png
index 69273e66..4a199de 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_widths-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/table_widths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendCol2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendCol2-expected.png
index 3e755168e..cada2f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendRowsExpand1-expected.png
index 02397db..b4b08f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendTbodyExpand1-expected.png
index 7cca0c3..55f77c44 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/appendTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsRebuild1-expected.png
index 04212499..501476fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink1-expected.png
index 402b125..fbb9f6f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink2-expected.png
index ef6f760..bf5d0f8e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCellsShrink2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol1-expected.png
index a2db068..3c13eab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol2-expected.png
index 3b6f77e3..8103ca9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol3-expected.png
index d0b45c5..5a0d591 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteCol3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup1-expected.png
index 5054d92f0..22dd4ad 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup2-expected.png
index 43466ab..cd0e7f8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteColGroup2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsRebuild1-expected.png
index 5737bdbc9..e76f0e0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsShrink1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsShrink1-expected.png
index 5737bdbc9..e76f0e0a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsShrink1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteRowsShrink1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyExpand1-expected.png
index 3fa34d1..b6af1e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
index a1561b6..af57d9e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/deleteTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand1-expected.png
index ba751a6..d7cf534 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand2-expected.png
index 921481cec..7a30f76 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsExpand2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild1-expected.png
index 1736585..8931560b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild2-expected.png
index 8df8ddb6..1a566ba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCellsRebuild2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups1-expected.png
index 67876cd..f56e04c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups2-expected.png
index 52e3eaa1..6387a11 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertColGroups2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols1-expected.png
index 67876cd..f56e04c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols2-expected.png
index 67876cd..f56e04c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols3-expected.png
index 52e3eaa1..6387a11 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols4-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols4-expected.png
index 67876cd..f56e04c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols5-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols5-expected.png
index 67876cd..f56e04c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertCols5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsExpand1-expected.png
index efc3654..288b26a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsRebuild1-expected.png
index b7d61016..541a642 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/insertRowsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/tableDom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/tableDom-expected.png
index bee0b61..207fb51 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/tableDom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/dom/tableDom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/body_col-expected.png
index 1bea05da..a99f2e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/col_span-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/col_span-expected.png
index 5ab9d920..3262c1f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/col_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/col_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_center-expected.png
index 593e80b..e2f7d76f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_justify-expected.png
index 8843a6c7..c8c271ba 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_left-expected.png
index d9f047b..6102a7f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_right-expected.png
index 8dad7ac3..e97c9d9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_span-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_span-expected.png
index 6fdc3c1..a3f5624 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_span-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_span-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_pct-expected.png
index f1064c5..1bfb5b4e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_px-expected.png
index d495a2e..1cf728aa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_border-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_border-expected.png
index 1b0582d..e3f466c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_box-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_box-expected.png
index 1b0582d..e3f466c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_box-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_frame_box-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_overflow_hidden_td-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
index 0267479..5881880 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_overflow_hidden_td-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_center-expected.png
index b398c317..faa2a35 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_left-expected.png
index 3f18834..bedb072 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_right-expected.png
index d4d1bfdab..3c3c1a4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/table_row_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
index 06b148fe..f6dcbef 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
index 06b148fe..f6dcbef 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black-expected.png
index 3ce7bda..5268016 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
index 3ce7bda..5268016 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
index cf7455c..5c7ac6ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
index cf7455c..5c7ac6ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
index 3916237..f7338cd6c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
index 3916237..f7338cd6c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
index 9a932be..d7943fbf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
index 9a932be..d7943fbf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green-expected.png
index e4e853c..a75df46 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
index e4e853c..a75df46 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
index b87fbf3..f9adcc4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
index b87fbf3..f9adcc4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
index 0895b33b..598bab3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
index 0895b33b..598bab3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
index 2256be0..5984c554d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
index 2256be0..5984c554d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
index adcb8c87..b3887b9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
index adcb8c87..b3887b9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
index f517cc9..e67d91e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
index f517cc9..e67d91e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red-expected.png
index d602509..f9ff8bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
index d602509..f9ff8bd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
index 5c8c775..ce9db6f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
index 5c8c775..ce9db6f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
index e2844cc..df67abd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
index e2844cc..df67abd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white-expected.png
index 8ed01de3..ac382bd3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
index 8ed01de3..ac382bd3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
index 779e0c0..fce677c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
index 779e0c0..fce677c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_1-expected.png
index 17e0574..94f352b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_2-expected.png
index 264ac4bd..7e707a0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_3-expected.png
index 69ba24b..1846a6a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_border_3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_bot-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_bot-expected.png
index 3bd241e..b8e4640d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_bot-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_bot-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_top-expected.png
index e0145f45..4a7bfb1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding-expected.png
index adf2b5a4..7719ab5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding_pct-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
index 6638924d..a0718c58 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_cellpadding_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_id-expected.png
index 69df214..f5b29ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_row_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
index 8584b04..7825041 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_row_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_center-expected.png
index b4c9623..afcae67 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_left-expected.png
index 636e3701..8df5887 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_right-expected.png
index cb0b262..c946e063 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_colspan-expected.png
index d981826..75021c8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_height-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_height-expected.png
index 927088a..20182b09 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_nowrap-expected.png
index 601cfbe4..675232f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_rowspan-expected.png
index a5d4b2b..7c70a66 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_width-expected.png
index cdce3fd6b..72196e27 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_center-expected.png
index f575b17..cec5d74 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_left-expected.png
index e0134b4..e145809 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_right-expected.png
index 8c8d10d6..b09c9ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_colspan-expected.png
index e61cb58..944b0037 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_height-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_height-expected.png
index bd83f52..1142295e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_height-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_rowspan-expected.png
index 763adac..fc39044b7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_width-expected.png
index da12712..06667cd5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tables_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_center-expected.png
index 98880d5..778349f5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_char-expected.png
index 908a664..f4a4e9518 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_justify-expected.png
index 3c31c067..c6ec3c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_left-expected.png
index 9fb6419..3b481ed 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_right-expected.png
index 084eb4e..3f67976 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_char-expected.png
index 7592b81b..10083ea 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_baseline-expected.png
index 8426f2e..88efbd6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_bottom-expected.png
index 72a5ca8..6b48eb6b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_middle-expected.png
index e634d6e9..f367095 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_top-expected.png
index 3cdd8157..fc532bc4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_center-expected.png
index 4cb6100..e8b848d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_char-expected.png
index 5f2e532..6c7309c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_justify-expected.png
index d9711c77..dcc6c906 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_left-expected.png
index 9e218fa..c852d9a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_right-expected.png
index 880611e..89e4ccc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_char-expected.png
index 53d95b7..9e729a4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
index 1809abb..f43c75a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
index 090b8ae6..727d6658 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_middle-expected.png
index cdc64e7..6d8c82b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_top-expected.png
index ccea47f..8bde3a0c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_center-expected.png
index ccebd53..5399a9b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_char-expected.png
index da9abb5..d4ead85 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_justify-expected.png
index 9e3e2978..c79030ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_left-expected.png
index 5f7c041..4a87a34 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_right-expected.png
index 66f207a..148f5fd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_char-expected.png
index af1ebc85..6d6c1bc4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_baseline-expected.png
index ef07ae92..79baba2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_bottom-expected.png
index 1aa6e7a..68d9fa3b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_middle-expected.png
index f953e5e..cdd03f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_top-expected.png
index e4af110..347ecda 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
index 8c9b44f..9b7af6a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_aqua_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black-expected.png
index 963fd14..0b6a7d98 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
index 963fd14..0b6a7d98 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_black_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
index ec6f0d2..759edde 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
index ec6f0d2..759edde 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_blue_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
index 8bce7b5f..a42ba65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
index 8bce7b5f..a42ba65 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_fuchsia_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
index 675efdc..52d2452 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
index 675efdc..52d2452 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_gray_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green-expected.png
index ff88de3..f2f725c8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
index ff88de3..f2f725c8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_green_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
index 61d6e9a8..391e25d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
index 61d6e9a8..391e25d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_lime_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
index f851fae..1120e7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
index f851fae..1120e7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_maroon_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
index a6419cb..26e8c5e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
index a6419cb..26e8c5e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_navy_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
index 07ae57b..5b45765 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
index 07ae57b..5b45765 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_olive_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
index ccdca53..9b6ac594 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
index ccdca53..9b6ac594 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_purple_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red-expected.png
index ea23b5e..64c92a63 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
index ea23b5e..64c92a63 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_red_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
index 5a5d4c8..cbce9c92 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
index 5a5d4c8..cbce9c92 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_silver_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
index b2aa60bd..3313948 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
index b2aa60bd..3313948 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_teal_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white-expected.png
index 9bbceb0..c295876 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
index 9bbceb0..c295876 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_white_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
index 573580b..b81c07d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
index 573580b..b81c07d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/tr_bgcolor_yellow_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_bottom-expected.png
index 32b9aeb0..0869184 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_top-expected.png
index 04c5a42..2d4e98ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_align_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_class-expected.png
index 50aeb04..69f524be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_id-expected.png
index 50aeb04..69f524be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_style-expected.png
index 50aeb04..69f524be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_caption_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_center-expected.png
index 3912185..d387586 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_char-expected.png
index b2f292fc..bdc1dd7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_left-expected.png
index 6fb5447..a24df7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_right-expected.png
index 18cb1f9..a7aba3a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_col_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_center-expected.png
index 3912185..d387586 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_char-expected.png
index 842f6ed..f247b5b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_left-expected.png
index 6fb5447..a24df7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_right-expected.png
index 18cb1f9..a7aba3a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_colgroup_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_center-expected.png
index e03fe27..4d649d3f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_left-expected.png
index 4f292d7..8e50da2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_right-expected.png
index e0109998..70cf640 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
index 23171c6..8c78db7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
index 23171c6..8c78db7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border-expected.png
index da48c5db..0c9d8a83 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border_px-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border_px-expected.png
index cdf438f..d183ae2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_border_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing-expected.png
index f23bde6..c9edd4fb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
index d8c86d25..1bccbfd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_pct-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_pct-expected.png
index bebc65f..63ca713 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_px-expected.png
index 82666e1..08f853e9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_table_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_center-expected.png
index 946ae92..b0e2620 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_char-expected.png
index 26a4bc95..d61dc0c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_justify-expected.png
index 59e5cf4..5cdaa27 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_left-expected.png
index a8fce7b..78feda71 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_right-expected.png
index 4d9edd3..67988c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_class-expected.png
index 3a2dc71a..b8f1b43 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_id-expected.png
index 3a2dc71a..b8f1b43 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_style-expected.png
index 3a2dc71a..b8f1b43 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
index 9da7b46..b9a6706 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
index 80069243..efd2af7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
index 2574bd9..ea0fda0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_top-expected.png
index e0845e9d..4a4912c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tbody_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_center-expected.png
index 09d1aa94..3f8a795 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_char-expected.png
index 1f1ba48..6f24077 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_left-expected.png
index 6a0b902..37edaa1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_right-expected.png
index 10daf9f..5bc377d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
index a95b8749..8cdb4294 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
index a95b8749..8cdb4294 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_class-expected.png
index d6256e8c..6b84cff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_colspan-expected.png
index 773913d..70c93a97 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_id-expected.png
index d6256e8c..6b84cff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_nowrap-expected.png
index 7b7b1a4..bb1f2918a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_rowspan-expected.png
index 2c74700..ea442aa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_style-expected.png
index d6256e8c..6b84cff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_width-expected.png
index fc2af7fe..541ce99 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_td_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_center-expected.png
index aacc46b..ea030ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_char-expected.png
index 08f5902..769315d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
index 1db9506c..6fb04ee 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_left-expected.png
index ee30a36..af92395 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_right-expected.png
index 76cfa48..71995970 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_class-expected.png
index da6210d1..26f85ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_id-expected.png
index da6210d1..26f85ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_style-expected.png
index da6210d1..26f85ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
index a751dc95..090b26a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
index 320b73f..1f94404 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
index d2a10ca..af0f4d1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
index 461dd065..0862ffb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tfoot_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_center-expected.png
index 71ddceb..6b711bbc85 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_char-expected.png
index d0c807b..5099ad7a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_left-expected.png
index 1a548d21..2654ef7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_right-expected.png
index b0542769..e79c2cd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
index b257e6fb8..6eaeaf8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
index b257e6fb8..6eaeaf8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_class-expected.png
index e30a8e5b..e3d9a87 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_colspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_colspan-expected.png
index 6b4894a..01d62f4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_colspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_colspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_id-expected.png
index e30a8e5b..e3d9a87 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_nowrap-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_nowrap-expected.png
index 0192195c..c4d58811 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_nowrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_nowrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_rowspan-expected.png
index 642242a..6ac0832 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_style-expected.png
index e30a8e5b..e3d9a87 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_width-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_width-expected.png
index 76d1748..9b5b138 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_th_width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_center-expected.png
index 693b317..8e5724fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_char-expected.png
index 7381d14..9ce8d01 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_justify-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_justify-expected.png
index 7069a756..08a4de17 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_justify-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_justify-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_left-expected.png
index fdcef59..8a3c776 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_right-expected.png
index 5a7727e..a922c420 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_class-expected.png
index 66239ef..ea6a2e2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_id-expected.png
index 66239ef..ea6a2e2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_style-expected.png
index 66239ef..ea6a2e2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_baseline-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
index 0cd305e..10c5515b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_baseline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_bottom-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
index a4b3e68..4e86dbe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_bottom-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_middle-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_middle-expected.png
index e068c30..93b8362d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_middle-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_middle-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_top-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_top-expected.png
index 6b5855b..6c7d1fd3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_top-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_thead_valign_top-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_center-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_center-expected.png
index 5b6ae16..92bc84e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_center-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_center-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_char-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_char-expected.png
index 1f1ba48..6f24077 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_char-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_char-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_left-expected.png
index d5327471..6eb162c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_right-expected.png
index a2300bc5..9014a4162 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
index a95b8749..8cdb4294 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_name-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
index a95b8749..8cdb4294 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_bgcolor_rgb-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_class-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_class-expected.png
index e250c40..ac6509d77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_class-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_class-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_id-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_id-expected.png
index e250c40..ac6509d77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_id-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_id-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_style-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_style-expected.png
index e250c40..ac6509d77 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_style-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/marvin/x_tr_style-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/body_col-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/body_col-expected.png
index 1bea05da..a99f2e8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/body_col-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/body_col-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/cellspacing-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/cellspacing-expected.png
index b2edf8632..ed3a879 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/cellspacing-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/cellspacing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/nestedTables-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/nestedTables-expected.png
index c296104..00c1c70d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/nestedTables-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/nestedTables-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test3-expected.png
index 721c3ff1..00066ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test6-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test6-expected.png
index aed542ea..fdb52c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test6-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/test6-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_thtd_rowspan-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
index afbb0f5..47ba47a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_thtd_rowspan-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_tr_align-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_tr_align-expected.png
index d33846f..c1f2b99b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_tr_align-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/wa_table_tr_align-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/97619-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/97619-expected.png
index b819416..fd0e82c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/97619-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/97619-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1010-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1010-expected.png
index 7fc04b86..7ccd5e1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1010-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1010-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug10216-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug10216-expected.png
index 39dee44a..2c3f50c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug10216-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug10216-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1128-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1128-expected.png
index c1d5b77..4172fdfe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1128-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1128-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1164-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1164-expected.png
index 12920d8..524b6020 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1164-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1164-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug11945-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug11945-expected.png
index 1bd0505..a843cb1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug11945-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug11945-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1262-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1262-expected.png
index 0022d98b..cf5537c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1262-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1262-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
index c4e58c41..dbc72d30 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1647-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1647-expected.png
index d6ec456a..5de98df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1647-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug1647-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug18770-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug18770-expected.png
index a5935173..1f1aeeb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug18770-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug18770-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug21518-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug21518-expected.png
index 23529db..f8831231 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug21518-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug21518-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug220653-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug220653-expected.png
index f2cc0f42..b761de5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug220653-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug220653-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug22122-expected.png
index 943d699..cb8b0804 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug22122-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug22122-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug23847-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug23847-expected.png
index d790cfc..9a50346 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug23847-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug23847-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
index 0a4fb92d..1dde937 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug24880-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
index 12cf6ef..6f07c66 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
index 733a3be..fa7081e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug29058-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug3105-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug3105-expected.png
index e0f5919..a96de828 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug3105-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug3105-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
index 6ce782a..3e2ebcf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug32205-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug42043-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug42043-expected.png
index 5b45290..a88dcd1f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug42043-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug42043-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug4294-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug4294-expected.png
index 6121a03..5fc3e693 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug4294-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug4294-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
index 7b1397d..9b1ff2c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug46268-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug51000-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug51000-expected.png
index f2904191..17859214 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug51000-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug51000-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
index 750d0b9..b2b046c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug58402-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
index 403b141..476c2ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
index 403b141..476c2ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug65372-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug65372-expected.png
index 3a17e2c3..8f7e304 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug65372-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug65372-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
index 5a6a20cd..4a5dc6e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug67915-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7113-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7113-expected.png
index 6bad9a3..42ecb77f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7113-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7113-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug72393-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug72393-expected.png
index 8138cd6..2bd9358 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug72393-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug72393-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7243-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7243-expected.png
index d6978ddc9..77dbe62 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7243-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug7243-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug73629-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug73629-expected.png
index 6a7ad44..e2537be2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug73629-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug73629-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
index 8f71c52..eb4fcf7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug8499-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug8499-expected.png
index 1e47639..eae15c8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug8499-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug8499-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
index c127ba49..965b4eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
index 87efe54..cb3940e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/bugs/bug9879-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/backgrounds-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/backgrounds-expected.png
index d61123e..71219169 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/backgrounds-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/backgrounds-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/col_span2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/col_span2-expected.png
index cb621dd..912df312 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/col_span2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/col_span2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/cols1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/cols1-expected.png
index 1cf2201..07cc8ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/cols1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/cols1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/columns-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/columns-expected.png
index 0c84811..741822c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/columns-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/columns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/conflicts-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/conflicts-expected.png
index 125dfcfd..ef794814 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/conflicts-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/core/conflicts-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCells1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCells1-expected.png
index ed0502c8..bcad73d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCells1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCells1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
index 77fff270..c85e7bd0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCellsRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCol1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCol1-expected.png
index 3e755168e..cada2f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCol1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendCol1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
index d7b603a..6f6d1e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/appendColGroup1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
index 8c1b750..5f95f7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyExpand1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
index 8c1b750..5f95f7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/dom/insertTbodyRebuild1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index 4e999489..20645fd9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
index 165af94d..3eab001 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_above-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
index 0ce93b72..f0b2ffa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_below-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
index adc1a5f2..d43043e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_hsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
index 49d4da8..7295bd6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_lhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
index 547d507..2ca60cce 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_rhs-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
index bf1c075..84ccfa2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_void-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
index a5e2100..f9bd8a2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_frame_vsides-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
index 8a6fc07e..2d3a2c1c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
index 3b25b27f..d5b892bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
index 3b25b27f..d5b892bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
index f015783..48b9580 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
index 0160a5b..1614a74 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
index b7ff0ec..6635f8c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/tables_cellspacing_pct-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
index 9f900ed3..27d2aa5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_left-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
index 84965df0..8f565c9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_caption_align_right-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
index dba591b..267bb0b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/empty_cells-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/empty_cells-expected.png
index 6149f418..1383869 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/empty_cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/empty_cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/test4-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/test4-expected.png
index d213d24..6703992 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/test4-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/other/test4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/2d/compound-transforms-vs-containers-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/2d/compound-transforms-vs-containers-expected.png
index c42dc53..0e197aa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/2d/compound-transforms-vs-containers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/2d/compound-transforms-vs-containers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/2d/hindi-rotated-expected.png
index 0fefaa1..1cd480c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/diamond-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/diamond-expected.png
index 6671f8d4..d91f2df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/diamond-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/diamond-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/matrix-01-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/matrix-01-expected.png
deleted file mode 100644
index 3fffd8cb..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/matrix-01-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/shadows-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/shadows-expected.png
index 0bb1789..2671a20 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/shadows-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/shadows-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/skew-with-unitless-zero-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/skew-with-unitless-zero-expected.png
index 26201f7..bf9f691 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/skew-with-unitless-zero-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/skew-with-unitless-zero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/svg-vs-css-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/svg-vs-css-expected.png
index 491de4e..6d8d027 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/svg-vs-css-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/svg-vs-css-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-caret-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-caret-expected.png
index c0974f9a..37b2a57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-caret-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-caret-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-focused-text-input-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-focused-text-input-expected.png
index 87f2ce8..13d0499 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-focused-text-input-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/transformed-focused-text-input-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-float-positioned-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/block-no-inflow-children-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/block-no-inflow-children-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt
new file mode 100644
index 0000000..45526ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/box-inline-resize-expected.txt

@@ -0,0 +1,73 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [40, 103, 113, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow H2",
+          "rect": [8, 103, 113, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [40, 103, 113, 27],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 103, 113, 27],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 84, 32, 67],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='foo'",
+          "rect": [8, 84, 32, 32],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='foo'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow H2",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'Chromium'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-3509-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-3509-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-3509-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt
new file mode 100644
index 0000000..c0fa3164
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-5699-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 130, 784, 66],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 178, 36, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 148, 36, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='d'",
+          "rect": [8, 145, 4, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 145, 4, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 130, 4, 17],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='d'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-6278-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-6278-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6278-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-6473-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-6473-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-6473-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-7235-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/bugzilla-7235-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/bugzilla-7235-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
new file mode 100644
index 0000000..f3d0869
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
new file mode 100644
index 0000000..84d28b6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/canvas-resize-no-full-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-subpixel-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-subpixel-expected.txt
new file mode 100644
index 0000000..ea861c1f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-subpixel-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTextControl INPUT id='target'",
+          "rect": [8, 8, 224, 22],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 11, 201, 16],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTextControl INPUT id='target'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "subtree"
+    },
+    {
+      "object": "Caret",
+      "reason": "caret"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
new file mode 100644
index 0000000..233e2ca3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/caret-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/change-text-content-and-background-color-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/change-text-content-and-background-color-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/change-text-content-and-background-color-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/clip-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/clip-with-layout-delta-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/clip-with-layout-delta-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt
new file mode 100644
index 0000000..5378b6ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/control-clip-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [9, 83, 198, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [16, 113, 184, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [76, 113, 64, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText (anonymous)",
+          "rect": [9, 83, 63, 16],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText (anonymous)",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'SUCCESS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
new file mode 100644
index 0000000..440670ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/delete-into-nested-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt
new file mode 100644
index 0000000..cace2c4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/details-open-repaint-expected.txt

@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='details-content'",
+          "rect": [8, 68, 784, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTextControl INPUT",
+          "rect": [8, 68, 173, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 71, 169, 16],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutDetailsMarker DIV id='details-marker'",
+          "rect": [8, 53, 11, 11],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutDetailsMarker DIV id='details-marker'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='details-content'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTextControl INPUT",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
new file mode 100644
index 0000000..9eacc47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
new file mode 100644
index 0000000..9eacc47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/flexible-box-overflow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/gradients-em-stops-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/gradients-em-stops-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
new file mode 100644
index 0000000..a808451
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-block-overflow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt
new file mode 100644
index 0000000..3538684f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-color-change-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 68, 37, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 68, 37, 17],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt
new file mode 100644
index 0000000..dbfe536
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-focus-expected.txt

@@ -0,0 +1,76 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 34, 800, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [0, 0, 800, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 34, 429, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A id='link'",
+          "rect": [585, -1, 216, 234],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 40, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A id='link'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Home'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'crbug.com/424078: ensure inline elements get their outline painted'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt
new file mode 100644
index 0000000..ef7306f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidate-box-shadow-currentColor-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [8, 8, 29, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 29, 17],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Text'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt
new file mode 100644
index 0000000..0691fc8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/invalidation-after-opacity-change-subtree-expected.txt

@@ -0,0 +1,161 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 2350],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+          "rect": [8, 2000, 777, 350],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2200, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 2050, 777, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2047, 774, 106],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2047, 774, 106],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2197, 653, 106],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 2197, 653, 106],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='absolute'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This test checks that switching opacity'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'invalidates the full subtree.'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'This text should be visible in the'",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'output.'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
new file mode 100644
index 0000000..c98b5433
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-child-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
new file mode 100644
index 0000000..c770183d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
new file mode 100644
index 0000000..c770183d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layer-outline-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-relative-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-relative-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset2-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset2-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset3-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/layout-state-scrolloffset3-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layout-state-scrolloffset3-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..95c79a3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/layoutstate-invalid-invalidation-inline-relative-positioned-expected.txt

@@ -0,0 +1,103 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 40, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 220, 100, 103],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN id='target'",
+          "rect": [8, 200, 100, 103],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline (relative positioned) SPAN",
+          "rect": [8, 120, 100, 103],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 220, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 220, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 200, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 200, 100, 100],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) SPAN id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'x'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt
new file mode 100644
index 0000000..bac0a30
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-6-expected.txt

@@ -0,0 +1,124 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 242, 406, 125],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 368, 304, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [178, 350, 146, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 353, 48, 65],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [27, 353, 22, 18],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the hedgehog'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'way wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'that it was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'foo'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt
new file mode 100644
index 0000000..660bb793
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-flow-with-floats-8-expected.txt

@@ -0,0 +1,296 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 74, 418, 498],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 242, 406, 125],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 188, 406, 71],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 404, 355, 71],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 368, 355, 53],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 404, 355, 35],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 80, 354, 107],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 368, 336, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [65, 368, 304, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [178, 350, 146, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [127, 350, 145, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+          "rect": [14, 353, 48, 65],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [14, 188, 40, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (floating) SPAN id='blueFloat'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The chief difficulty Alice found at first was in'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'managing her\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'flamingo: she succeeded in getting its'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'body tucked away,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'comfortably enough, under her'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'arm, with its legs hanging down,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'but generally, just as'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she had got its neck nicely straightened\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'out, and was'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'going to give the hedgehog a blow with its head, it'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'would'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' twist itself round and look up in her face, with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'such a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'puzzled expression that she could not help bursting out'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'laughing: and when she had got its head down, and was going'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'to\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'begin again, it was very provoking to find that the hedgehog'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'had\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'unrolled itself, and was in the act of crawling away:'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'besides all\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'this, there was generally a ridge or furrow in the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'way wherever\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'she wanted to send the hedgehog to, and, as the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'doubled-up\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'soldiers were always getting up and walking off to'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'other parts of\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the ground, Alice soon came to the conclusion'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'that it was a very\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'difficult game indeed.\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'The players all played at once without waiting\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'for'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'turns,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'quarrelling all the while, and fighting for the'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hedgehogs; and in\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'a very short time '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'the Queen'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' was in a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'furious passion, and went\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'stamping about, and'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'shouting \u2018Off with his head!\u2019 or \u2018Off with\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'her head!\u2019'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'about once in a minute.\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-in-scrolled-clipped-block-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/line-in-scrolled-clipped-block-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-in-scrolled-clipped-block-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt
new file mode 100644
index 0000000..2fc7c9e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/line-overflow-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 200, 89],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 198, 53],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [115, 84, 37, 47],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [115, 114, 37, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='t'",
+          "rect": [38, 132, 36, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [38, 132, 36, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Cras faucibus. Nunc'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'adipiscing, enim in scelerisque'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'convallis,\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'augue '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'purus'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' eleifend'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'lacus, at sagittis eros leo'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pulvinar velit. Integer'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sollicitudin nisi ut urna blandit'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'convallis.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/lines-with-layout-delta-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/lines-with-layout-delta-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt
new file mode 100644
index 0000000..8f36077
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-2-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutListItem LI",
+          "rect": [48, 94, 744, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG id='target'",
+          "rect": [48, 94, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [31, 180, 7, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutListMarker (anonymous)",
+          "rect": [31, 130, 7, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutListItem LI",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutListMarker (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG id='target'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
new file mode 100644
index 0000000..f7d25dc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/list-marker-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt
new file mode 100644
index 0000000..102900fb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/make-children-non-inline-expected.txt

@@ -0,0 +1,353 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 60, 784, 262],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 60, 784, 90],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 250, 784, 72],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 250, 113, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 150, 113, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 132, 80, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 132, 80, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 96, 80, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 96, 80, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 268, 69, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 168, 69, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 304, 64, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 204, 64, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 45, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 114, 45, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 44, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 78, 44, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 60, 40, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 60, 40, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 286, 30, 17],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 186, 30, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [8, 150, 10, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Word,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'words,'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'more words.'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'I could'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'write a book'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'about all the stuff'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'that comes'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'after'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'the break.'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt
new file mode 100644
index 0000000..91cdf1a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multi-layout-one-frame-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [187, 11, 169, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 11, 169, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [187, 11, 53, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 11, 53, 16],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASSED'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt
new file mode 100644
index 0000000..7778c068
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/multicol-repaint-expected.txt

@@ -0,0 +1,84 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutMultiColumnFlowThread (anonymous)",
+          "rect": [9, 9, 400, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='a'",
+          "rect": [234, 10, 300, 56],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 300, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [234, 15, 50, 50],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 10, 13, 56],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutMultiColumnFlowThread (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'XXXXXX'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt
new file mode 100644
index 0000000..b7f09f47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-containing-image-in-non-standard-mode-expected.txt

@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [6, 6, 204, 57],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 8, 200, 50],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt
new file mode 100644
index 0000000..74351f8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/outline-continuations-expected.txt

@@ -0,0 +1,101 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 148, 200, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [18, 110, 200, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 108, 88, 59],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutInline SPAN id='outer'",
+          "rect": [16, 146, 88, 21],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 148, 84, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 110, 84, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CONTENTS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline SPAN id='outer'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-delete-line-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-delete-line-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-delete-line-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt
new file mode 100644
index 0000000..db6caf6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.txt

@@ -0,0 +1,134 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [2008, 2092],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 2008, 2092],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 585, 785, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 16, 784, 2068],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 50, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [127, 50, 390, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 348, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 50, 120, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 0, 15, 585],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [785, 585, 15, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [516, 50, 5, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This is the test for '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt
new file mode 100644
index 0000000..71a56aabb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/paint-invalidation-with-reparent-across-frame-boundaries-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [8, 184, 784, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-target'",
+          "rect": [18, 18, 284, 18],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 18, 23, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 184, 23, 17],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'abc'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-target'",
+      "reason": "layoutObject removal"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt
new file mode 100644
index 0000000..7e950f0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/positioned-document-element-expected.txt

@@ -0,0 +1,79 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "backgroundColor": "#008000",
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 800, 600],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [0, 0, 800, 50],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [8, 16, 784, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+          "rect": [100, 100, 452, 50],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [108, 116, 436, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 116, 436, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 16, 436, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) HTML class='changed'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Tests that the entire viewport is painted with a floated html element.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt
new file mode 100644
index 0000000..23df21a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/relative-inline-positioned-movement-repaint-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 784, 18],
+          "reason": "forced by layout"
+        }
+      ]
+    },
+    {
+      "name": "LayoutInline (relative positioned) DIV id='block'",
+      "position": [68, 7],
+      "bounds": [374, 19],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline (relative positioned) DIV id='block'",
+          "rect": [0, 0, 374, 19],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [1, 1, 372, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline (relative positioned) DIV id='block'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'When this layer moves it shouldn't generate a repaint rect.'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt
new file mode 100644
index 0000000..3609663b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-after-layout-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 194, 181, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [292, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 194, 4, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt
new file mode 100644
index 0000000..69adb92
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/remove-inline-layer-after-layout-expected.txt

@@ -0,0 +1,82 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline SPAN id='target'",
+          "rect": [112, 108, 181, 103],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 194, 181, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [292, 108, 101, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [112, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 108, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [108, 194, 4, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='target'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt
new file mode 100644
index 0000000..6567c00f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/search-field-cancel-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 45, 156, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [11, 45, 58, 16],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'some text'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt
new file mode 100644
index 0000000..2a85b5d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-after-remove-expected.txt

@@ -0,0 +1,80 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='test'",
+          "rect": [38, 74, 152, 110],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 75, 123, 107],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [112, 164, 42, 18],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [74, 75, 39, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [39, 75, 36, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutInline SPAN id='removeme'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='test'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'hello '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'world'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt
new file mode 100644
index 0000000..a8ac573
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/selection-clear-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='firstLine'",
+          "rect": [8, 8, 100, 200],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 208, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='root'",
+          "rect": [8, 208, 100, 100],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 49, 98, 117],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 49, 8, 17],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow HTML",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='root'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='firstLine'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "selection"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "selection"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "location change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
new file mode 100644
index 0000000..1899d47
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/shadow-multiple-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt
new file mode 100644
index 0000000..83930dd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/subtree-root-skipped-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [10, 11, 169, 16],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 11, 35, 16],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div'",
+          "rect": [8, 288, 10, 20],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..cf9df4a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
new file mode 100644
index 0000000..0d8a678
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt
new file mode 100644
index 0000000..c4cea3ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/append-text-node-to-tspan-expected.txt

@@ -0,0 +1,145 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 306, 374],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'SS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
new file mode 100644
index 0000000..cd6549d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/circle-move-invalidation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt
new file mode 100644
index 0000000..a0f411b4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/ems-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 54, 571, 85],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 54, 571, 85],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt
new file mode 100644
index 0000000..331fd6d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/exs-display-none-expected.txt

@@ -0,0 +1,102 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 50, 571, 81],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='tspan'",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [50, 50, 571, 81],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='tspan'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Two lines of text should be visible.'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
new file mode 100644
index 0000000..bca3bf3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/hit-test-unclosed-subpaths-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
new file mode 100644
index 0000000..2f2c3fc8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewPort-relative-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt
new file mode 100644
index 0000000..d4316ef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-and-object-creation-expected.txt

@@ -0,0 +1,98 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 40, 784, 168],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 40, 784, 168],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 40, 784, 168],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 40, 784, 168],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 40, 784, 168],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 40, 784, 168],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt
new file mode 100644
index 0000000..dfce073c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-clipPath-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [16, 40, 784, 168],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [16, 40, 784, 168],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [16, 40, 784, 168],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [0, 0, 334, 500],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Clipped. INVISIBLE.'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='dynClip'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt
new file mode 100644
index 0000000..82f9c38
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.txt

@@ -0,0 +1,122 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [0, 15, 759, 362],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 247, 759, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 247, 759, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 130, 596, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 130, 596, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 15, 449, 127],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 15, 449, 127],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGResourceLinearGradient linearGradient id='fillLinearGradient'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGResourceLinearGradient linearGradient id='strokeLinearGradient'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on fill'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on stroke'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Gradient on fill/stroke'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt
new file mode 100644
index 0000000..f17e76c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-and-object-creation-expected.txt

@@ -0,0 +1,146 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='content'",
+          "rect": [0, 15, 684, 362],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 247, 684, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 247, 684, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 130, 520, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 130, 520, 130],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 15, 374, 127],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 15, 374, 127],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [16, 16, 18, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [16, 16, 18, 18],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [8, 8, 17, 17],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [8, 8, 17, 17],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGResourcePattern pattern id='fillPattern'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGResourcePattern pattern id='strokePattern'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g id='content'",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on fill'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on stroke'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on fill/stroke'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt
new file mode 100644
index 0000000..b18a386
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/js-late-pattern-creation-expected.txt

@@ -0,0 +1,63 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [33, 23, 624, 189],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [33, 23, 624, 189],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [16, 25, 18, 25],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [8, 12, 17, 26],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Pattern on fill'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGResourcePattern pattern id='dynPattern'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt
new file mode 100644
index 0000000..b407a4d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-text-node-in-tspan-expected.txt

@@ -0,0 +1,132 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 306, 374],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt
new file mode 100644
index 0000000..2f3b3df
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/modify-transferred-listitem-different-attr-expected.txt

@@ -0,0 +1,71 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [23, 8, 85, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='target'",
+          "rect": [23, 8, 85, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [58, 45, 50, 26],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='source'",
+          "rect": [58, 45, 50, 26],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='target'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'A'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' B C'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGText text id='source'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'X Y Z'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt
new file mode 100644
index 0000000..9ad4f42
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/outline-offset-text-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [103, 25, 160, 114],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [103, 25, 160, 114],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [63, 25, 160, 114],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [63, 25, 160, 114],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Foo'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
new file mode 100644
index 0000000..e4f1a4c9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-with-resources-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
new file mode 100644
index 0000000..1cc938a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
new file mode 100644
index 0000000..c28dc12
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
new file mode 100644
index 0000000..1cc938a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt
new file mode 100644
index 0000000..8c81ac5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-text-node-from-tspan-expected.txt

@@ -0,0 +1,129 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 374],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='modify'",
+          "rect": [10, 63, 306, 374],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [10, 63, 306, 374],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='modify'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt
new file mode 100644
index 0000000..54634eb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/remove-tspan-from-text-expected.txt

@@ -0,0 +1,120 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 63, 306, 254],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [10, 63, 306, 254],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='remove'",
+          "rect": [10, 63, 306, 254],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text'",
+          "rect": [10, 63, 306, 254],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='remove'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox ' '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt
new file mode 100644
index 0000000..7c0a3d0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-decoration-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 13, 48, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 13, 48, 28],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 13, 48, 28],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt
new file mode 100644
index 0000000..7c0a3d0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-non-scaling-stroke-text-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [9, 13, 48, 28],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 13, 48, 28],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='t'",
+          "rect": [9, 13, 48, 28],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGText text id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Hello'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
new file mode 100644
index 0000000..261c2de1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -0,0 +1,106 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1026, 1036],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [24, 1011, 737, 21],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [178, 1011, 203, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [434, 1011, 173, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutInline A",
+          "rect": [384, 1010, 47, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [385, 1011, 45, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [429, 1011, 6, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [380, 1011, 6, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'pservers-pattern-01-b \u2190'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutInline A",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'index'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u2192 script-handle-01-b'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
new file mode 100644
index 0000000..e21db78
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-background-partial-redraw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
new file mode 100644
index 0000000..b87d6d79
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
new file mode 100644
index 0000000..cebff5a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tabgroup-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt
new file mode 100644
index 0000000..0eddc5da
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-mask-update-expected.txt

@@ -0,0 +1,77 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 2, 46, 22],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 2, 46, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGText text id='text1'",
+          "rect": [10, 2, 46, 22],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [10, 32, 43, 22],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='text2'",
+          "rect": [10, 32, 43, 22],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 32, 43, 18],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='text1'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGText text id='text2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt
new file mode 100644
index 0000000..236a782
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-repaint-including-stroke-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [80, 0, 551, 114],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [80, 0, 551, 114],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [30, 0, 404, 57],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text id='bounce'",
+          "rect": [30, 0, 404, 57],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='bounce'",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'Repaint me!'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt
new file mode 100644
index 0000000..2dec14c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-rescale-expected.txt

@@ -0,0 +1,384 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='text2g'",
+          "rect": [0, 63, 402, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 13, 402, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 113, 402, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 114, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 114, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 114, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 14, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 14, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 14, 194, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 13, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [210, 113, 100, 87],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 113, 100, 47],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [210, 13, 100, 47],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 114, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 114, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 114, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [310, 14, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [310, 14, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [310, 14, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 114, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 14, 92, 45],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text3g'",
+          "rect": [0, 3, 14, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [0, 3, 7, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [0, 3, 7, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [0, 3, 7, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [9, 3, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [9, 3, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [9, 3, 5, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [6, 3, 4, 4],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [6, 3, 4, 2],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow P",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='text1g'",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 1, 1],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='text1g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text2g'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='text3g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow P",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
new file mode 100644
index 0000000..79b98794
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-selection-text-05-t-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt
new file mode 100644
index 0000000..85288cd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-viewbox-rescale-expected.txt

@@ -0,0 +1,166 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 143, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner2'",
+          "rect": [59, 143, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [59, 43, 95, 23],
+          "reason": "became visible"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner1'",
+          "rect": [59, 43, 95, 23],
+          "reason": "full"
+        }
+      ],
+      "underPaintInvalidations": [
+        {
+          "x": 155,
+          "y": 55,
+          "oldPixel": "#FFFFFF",
+          "newPixel": "#008800"
+        },
+        {
+          "x": 155,
+          "y": 56,
+          "oldPixel": "#FFFFFF",
+          "newPixel": "#008800"
+        },
+        {
+          "x": 155,
+          "y": 57,
+          "oldPixel": "#FFFFFF",
+          "newPixel": "#008800"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner1'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "became visible"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner2'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGText text",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS '",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt
new file mode 100644
index 0000000..d7e7f44
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [808, 620],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [208, 14, 170, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [208, 14, 170, 17],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [18, 194, 170, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGText text id='ttt'",
+          "rect": [18, 194, 170, 17],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text id='ttt'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Passes, if text is at 200x20'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt
new file mode 100644
index 0000000..6bebf51
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/tspan-dynamic-positioning-expected.txt

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [200, 186, 256, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [200, 186, 256, 17],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [200, 186, 256, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [20, 6, 256, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGTSpan tspan id='ts'",
+          "rect": [20, 6, 256, 17],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [20, 6, 256, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGTSpan tspan id='ts'",
+      "reason": "full"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'This text should be at visible at 200,200'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt
new file mode 100644
index 0000000..e1b70a29
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/use-clipped-hit-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 116, 64, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGText text id='status'",
+          "rect": [90, 116, 64, 17],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [90, 116, 44, 17],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGText text id='status'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'Passed'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
new file mode 100644
index 0000000..debef6d9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-coords-viewattr-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
new file mode 100644
index 0000000..9996611
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/zoom-foreignObject-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt
new file mode 100644
index 0000000..5eba99d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/table-collapsed-border-expected.txt

@@ -0,0 +1,311 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 182, 110, 76],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 186, 102, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 96, 101, 76],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutTable TABLE id='t'",
+          "rect": [8, 10, 97, 76],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableCell TD id='d2'",
+          "rect": [22, 210, 96, 20],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [12, 100, 93, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 316, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 268, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 144, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [22, 96, 87, 28],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d3'",
+          "rect": [22, 296, 87, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD id='d'",
+          "rect": [22, 124, 87, 20],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 297, 77, 17],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 125, 77, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 317, 51, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 145, 51, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 277, 43, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 105, 43, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 211, 34, 17],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [79, 268, 30, 76],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 210, 14, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 124, 14, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 211, 4, 17],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [17, 125, 4, 17],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='d2'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE id='t'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox '\u00A0'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'Lorem'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell TD id='d3'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'ipsum dolor'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'sit amet'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt
new file mode 100644
index 0000000..ff00f33
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-match-document-change-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='to-be-changed'",
+          "rect": [18, 128, 269, 36],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 128, 257, 35],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [18, 128, 84, 17],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [295, 102, 15, 400],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='to-be-changed'",
+      "reason": "full"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "InlineTextBox 'After change'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
new file mode 100644
index 0000000..19401ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
new file mode 100644
index 0000000..19401ee
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/text-shadow-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.txt
new file mode 100644
index 0000000..2e02823
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/textarea-caret-expected.txt

@@ -0,0 +1,72 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [7, 7, 183, 40],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [9, 11, 179, 16],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 175, 16],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [9, 30, 164, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutTextControl TEXTAREA id='editor'",
+          "rect": [173, 30, 15, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTextControl TEXTAREA id='editor'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTextControl TEXTAREA id='editor'",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "Caret",
+      "reason": "caret"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox '------------------------------------------------------------'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/transform-layout-repaint-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/win/paint/invalidation/transform-layout-repaint-expected.txt
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/transform-layout-repaint-expected.txt

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt
new file mode 100644
index 0000000..3be2d60
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/window-resize-vertical-writing-mode-expected.txt

@@ -0,0 +1,427 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [913, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 897, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 7, 894, 215],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [313, 0, 600, 500],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 600, 500],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [313, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [491, 8, 414, 484],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [493, 8, 411, 484],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [913, 235],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [200, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [208, 8, 897, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 897, 219],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [210, 7, 894, 215],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 7, 894, 215],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [513, 235, 600, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [513, 235, 400, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "bounds change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'AAAA'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'BBBB'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'CCCC'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'DDDD'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'EEEE'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'FFFF'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'GGGG'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'HHHH'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'IIII JJJJ'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'KKKK'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'LLLL'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'MMMM'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "bounds change"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [400, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 913, 235],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [-513, 0, 913, 235],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [-505, 8, 897, 219],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [-503, 7, 894, 215],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 0, 400, 600],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 235, 400, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [47, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [49, 7, 342, 566],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutView #document",
+          "rect": [400, 0, 400, 600],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [447, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [47, 8, 345, 584],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [449, 7, 342, 566],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [49, 7, 342, 566],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAA BBBB CCCC'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'DDDD EEEE FFFF'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'GGGG HHHH IIII JJJJ'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'KKKK LLLL MMMM'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'NNNN'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
index 8a439c4..a557dcf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
index ecbefce..3e5cfef6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/canvas-incremental-repaint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
index 42d8a8af..a010bdf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 5dc8657..1a43857d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/display_list_2d_canvas/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
index 0beb98e..3f4f0ab 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
index 5dc8657..1a43857d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/setWidthResetAfterForcedRender-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
deleted file mode 100644
index b70c5bd..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
index e519cdd..21b4662 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
index 0fd4166..d45c9d628 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-small-content-rect-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
index f0bc0a9..3ddac74 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-border-radius-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
index 4c414225..70fdedc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
index ad69204..0b7d99a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
index fc486b81..43402a4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index a07b8e3e..e3758d88 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
index 303c2833..7d94b2b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor150/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index ee2eec1..5122f5e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index 14e3a2f..2cfd3fd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
index 937b1dd..59b2f2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
index e1cffeb..5fe9804 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
index ee2eec1..5122f5e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
index 14e3a2f..2cfd3fd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/data-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
index 937b1dd..59b2f2a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
index e1cffeb..5fe9804 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/scalefactor200withzoom/fast/hidpi/static/popup-menu-with-scrollbar-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/spv2/fast/block/basic/018-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/spv2/fast/block/basic/018-expected.png
index 66169bd8..b5166ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/spv2/fast/block/basic/018-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/spv2/fast/block/basic/018-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt
index ba86422..f6ff00f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt

@@ -5286,6 +5286,7 @@
     method getRangeAt
     method modify
     method removeAllRanges
+    method removeRange
     method selectAllChildren
     method setBaseAndExtent
     method setPosition

diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.png b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.png
index a3b08b8e..a5d81a6 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_family-expected.png b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_family-expected.png
index a7c0f904..bb8c195 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_family-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_family-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_variant-expected.png b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_variant-expected.png
index 2d57495..0ff834b 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_variant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/css1/font_properties/font_variant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/firstline-expected.png
index dd18810..7a9c099 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/multiple_pseudo_elements-expected.png
index 5611ae90c..027e24b 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/multiple_pseudo_elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/css1/pseudo/multiple_pseudo_elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/encoding/invalid-UTF-8-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/encoding/invalid-UTF-8-expected.png
index 1e2abc9..6f36de7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/encoding/invalid-UTF-8-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/encoding/invalid-UTF-8-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
index c28df2e..e39933b 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
index c3ded87..88e67ed 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
index b28a209..159566f 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-minimum-date-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
index a251322..d0dd031f 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-ar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
index 945e866b..76f2ffa 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-required-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
index 84fce83..a8092ee6 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
index e44bd554..c8b8d22 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
index 766ecd0f..ea712be 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/calendar-picker-appearance-zoom200-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-expected.png
index 64ed178..00b8182 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
index b1693f2d..5503c12 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/month-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-expected.png
index 5c6c24c..cf3f8502 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-step-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
index 33aae082..224ae165 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/calendar-picker/week-picker-appearance-step-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-basic-expected.png
index 1082e82..6134b364 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-pseudo-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-pseudo-elements-expected.png
index 47a4df1..c6df4fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-pseudo-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/month/month-appearance-pseudo-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/search/search-appearance-basic-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/search/search-appearance-basic-expected.png
index a4589fe7..6db8111c 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/search/search-appearance-basic-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/search/search-appearance-basic-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
index de84497..c9c82c9 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select-popup/popup-menu-appearance-zoom110-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.png
index 32745794..f0d944f 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/select/menulist-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
index 3cb8e7d5..e01debce 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
index 36d569c..2ac6346 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-rtl-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
index aab04b4..69cfe626 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/forms/suggestion-picker/month-suggestion-picker-appearance-with-scroll-bar-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text-autosizing/list-item-above-dbcat-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text-autosizing/list-item-above-dbcat-expected.png
index a7769416..33f29be 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text-autosizing/list-item-above-dbcat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text-autosizing/list-item-above-dbcat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-kerning-and-ligatures-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-kerning-and-ligatures-expected.png
index 134b3f3..cecfd5c 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-kerning-and-ligatures-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-kerning-and-ligatures-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-multiple-renderers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-multiple-renderers-expected.png
index 5f82603b..d995f9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-multiple-renderers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-multiple-renderers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-negative-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-negative-spacing-features-expected.png
index f3aaa337..956bf987 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-negative-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-negative-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-small-caps-punctuation-size-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-small-caps-punctuation-size-expected.png
index 5d8aff4..4f740888 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-small-caps-punctuation-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-small-caps-punctuation-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-spacing-features-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-spacing-features-expected.png
index e5d8d02b..7bdd925 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-spacing-features-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/atsui-spacing-features-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/cg-vs-atsui-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/cg-vs-atsui-expected.png
index 3223097..b70e2342 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/cg-vs-atsui-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/cg-vs-atsui-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/color-emoji-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/color-emoji-expected.png
index 1af7497..3a4b355 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/color-emoji-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/color-emoji-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/hebrew-vowels-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/hebrew-vowels-expected.png
index c13b396..9cddbf2f 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/hebrew-vowels-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/hebrew-vowels-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/rtl-white-space-pre-wrap-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/rtl-white-space-pre-wrap-expected.png
index 79a68aab6..59239cf 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/rtl-white-space-pre-wrap-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/rtl-white-space-pre-wrap-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/text-spliced-font-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/text-spliced-font-expected.png
index 1648a76..a55f894 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/text-spliced-font-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/text-spliced-font-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/midword-break-hang-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/midword-break-hang-expected.png
index 84d0843..c420d22 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/midword-break-hang-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/midword-break-hang-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/writing-mode/border-vertical-lr-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/writing-mode/border-vertical-lr-expected.png
index 57b6754..4f081da 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/writing-mode/border-vertical-lr-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/writing-mode/border-vertical-lr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/compositing/text-match-highlight-expected.png
index 2fba65dc..7906422d 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/compositing/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/compositing/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 3aca683..71f8235 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

@@ -25,21 +25,6 @@
           "object": "LayoutInline A",
           "rect": [384, 1010, 47, 22],
           "reason": "style change"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [385, 1011, 45, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [379, 1011, 7, 20],
-          "reason": "forced by layout"
-        },
-        {
-          "object": "LayoutText #text",
-          "rect": [429, 1011, 6, 20],
-          "reason": "forced by layout"
         }
       ]
     }

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/absolute-position-headers-and-footers-expected.png
index ac7e069c..a7b2e772 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index 5a206e9..f9ed701 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index 72da78b7..8481ad5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-expected.png
index a1403160..9c3ba61 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index 51bf19f6..6311f0d 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index 75220d4..b2534fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/iframe-print-expected.png
index 0a28d6ce..f8671c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/win7/printing/list-item-with-empty-first-line-expected.png
index 6e7ae48c..12854fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/printing/list-item-with-empty-first-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/printing/list-item-with-empty-first-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
index 657dd441..43ad56d 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/W3C-SVG-1.1/painting-render-01-b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/as-background-image/svg-as-background-5-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/as-background-image/svg-as-background-5-expected.png
index a9f5e62..d5322a9 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/as-background-image/svg-as-background-5-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/as-background-image/svg-as-background-5-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/batik/text/verticalText-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/batik/text/verticalText-expected.png
index b2569ec..bf4c59a 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/batik/text/verticalText-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/batik/text/verticalText-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/carto.net/combobox-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/carto.net/combobox-expected.png
index 749a0d9..6f9f9b5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/carto.net/combobox-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/carto.net/combobox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png
index 2fe6a8f..d77fc88 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/svg-fonts-in-html-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/text-match-highlight-expected.png b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/text-match-highlight-expected.png
index f23be38..b8615de 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/text-match-highlight-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/text-match-highlight-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/WebKit/LayoutTests/platform/win7/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
index 68569c33..6e9e165 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/transforms/2d/hindi-rotated-expected.png b/third_party/WebKit/LayoutTests/platform/win7/transforms/2d/hindi-rotated-expected.png
index c3463739..3eb4d793 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/transforms/2d/hindi-rotated-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/transforms/2d/hindi-rotated-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
index 47bdcc1..e4ba1ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
index be5a1ac..6a800942 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
index be5a1ac..6a800942 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/scalefactor200withzoom/fast/hidpi/static/calendar-picker-appearance-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
index ac7e069c..a7b2e772 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/absolute-position-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
index 5a206e9..f9ed701 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-but-static-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
index 72da78b7..8481ad5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-absolute-covering-some-pages-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
index a1403160..9c3ba61 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
index 51bf19f6..6311f0d 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-inside-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
index 75220d4..b2534fc 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/fixed-positioned-headers-and-footers-larger-than-page-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/iframe-print-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/iframe-print-expected.png
index 0a28d6ce..f8671c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/iframe-print-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/iframe-print-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/list-item-with-empty-first-line-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
index 6e7ae48c..12854fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/threaded/printing/list-item-with-empty-first-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/resources/testharnessreport.js b/third_party/WebKit/LayoutTests/resources/testharnessreport.js
index c3d3ff94..96f2dd2 100644
--- a/third_party/WebKit/LayoutTests/resources/testharnessreport.js
+++ b/third_party/WebKit/LayoutTests/resources/testharnessreport.js

@@ -80,7 +80,7 @@
         var path = location.pathname;
         if (location.hostname == 'web-platform.test' && path.endsWith('-manual.html'))
             return true;
-        return /\/imported\/wpt\/.*-manual\.html$/.test(path);
+        return /\/external\/wpt\/.*-manual\.html$/.test(path);
     }
 
     // Returns a directory part relative to WPT root and a basename part of the
@@ -93,7 +93,7 @@
             var matches = path.match(/^(\/.*)\.html$/);
             return matches ? matches[1] : null;
         }
-        var matches = path.match(/imported\/wpt(\/.*)\.html$/);
+        var matches = path.match(/external\/wpt(\/.*)\.html$/);
         return matches ? matches[1] : null;
     }
 
@@ -101,7 +101,7 @@
         var pathAndBase = pathAndBaseNameInWPT();
         if (!pathAndBase)
             return;
-        var automationPath = location.pathname.replace(/\/imported\/wpt\/.*$/, '/external/wpt_automation');
+        var automationPath = location.pathname.replace(/\/external\/wpt\/.*$/, '/external/wpt_automation');
         if (location.hostname == 'web-platform.test')
             automationPath = '/wpt_automation';
 

diff --git a/third_party/WebKit/LayoutTests/scrollbars/custom-scrollbar-display-expected.png b/third_party/WebKit/LayoutTests/scrollbars/custom-scrollbar-display-expected.png
index b90661b3..a0c5c17 100644
--- a/third_party/WebKit/LayoutTests/scrollbars/custom-scrollbar-display-expected.png
+++ b/third_party/WebKit/LayoutTests/scrollbars/custom-scrollbar-display-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1a-expected.png b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1a-expected.png
deleted file mode 100644
index 7aba054..0000000
--- a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1a-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1b-expected.png b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1b-expected.png
index d1300f6..eda1fb7 100644
--- a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1b-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-1b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2a-expected.png b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2a-expected.png
index cbcf6bf..d360d6c 100644
--- a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2a-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2a-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2b-expected.png b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2b-expected.png
index 80b6e80..2fa7ea9 100644
--- a/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2b-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/animations/animateMotion-accumulate-2b-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-background-image/background-image-tiled-expected.png b/third_party/WebKit/LayoutTests/svg/as-background-image/background-image-tiled-expected.png
index 8ab7dfd..258114d5 100644
--- a/third_party/WebKit/LayoutTests/svg/as-background-image/background-image-tiled-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-background-image/background-image-tiled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-background-image/background-repeat-expected.png b/third_party/WebKit/LayoutTests/svg/as-background-image/background-repeat-expected.png
index d394cb3..d7c3a34 100644
--- a/third_party/WebKit/LayoutTests/svg/as-background-image/background-repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-background-image/background-repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-background-image/same-image-two-instances-background-image-expected.png b/third_party/WebKit/LayoutTests/svg/as-background-image/same-image-two-instances-background-image-expected.png
index c3de3597..828464c 100644
--- a/third_party/WebKit/LayoutTests/svg/as-background-image/same-image-two-instances-background-image-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-background-image/same-image-two-instances-background-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-background-image/svg-as-background-with-relative-size-expected.png b/third_party/WebKit/LayoutTests/svg/as-background-image/svg-as-background-with-relative-size-expected.png
index 6e442ad..9059741 100644
--- a/third_party/WebKit/LayoutTests/svg/as-background-image/svg-as-background-with-relative-size-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-background-image/svg-as-background-with-relative-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-image/same-image-two-instances-expected.png b/third_party/WebKit/LayoutTests/svg/as-image/same-image-two-instances-expected.png
index b4092c3..815162d 100644
--- a/third_party/WebKit/LayoutTests/svg/as-image/same-image-two-instances-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-image/same-image-two-instances-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-expected.png b/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-expected.png
index 9f808d4..188aa5f6 100644
--- a/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png b/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png
index 9f808d4..188aa5f6 100644
--- a/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-image/svg-as-relative-image-with-explicit-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-object/object-box-sizing-no-width-height-expected.png b/third_party/WebKit/LayoutTests/svg/as-object/object-box-sizing-no-width-height-expected.png
index 1300b02..2e4232ac 100644
--- a/third_party/WebKit/LayoutTests/svg/as-object/object-box-sizing-no-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-object/object-box-sizing-no-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe-expected.png b/third_party/WebKit/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe-expected.png
index 804eedf..d392a67b 100644
--- a/third_party/WebKit/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/as-object/svg-embedded-in-html-in-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/canvas/canvas-default-object-sizing-expected.png b/third_party/WebKit/LayoutTests/svg/canvas/canvas-default-object-sizing-expected.png
index a90c882..76d02a7 100644
--- a/third_party/WebKit/LayoutTests/svg/canvas/canvas-default-object-sizing-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/canvas/canvas-default-object-sizing-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-in-mask-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-in-mask-expected.png
index 6ec2e6fa..24bd37e8 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-in-mask-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-in-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-child-clipped-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-child-clipped-expected.png
index 3d269e0..fe10e2ef 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-child-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-child-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-childs-clipped-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-childs-clipped-expected.png
index 7cbb671..e708f22 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-childs-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-childs-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-evenodd-twice-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-evenodd-twice-expected.png
index 492c51aa..ae0ebec 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-evenodd-twice-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-evenodd-twice-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-expected.png
index aa62e026..ebbbfdd 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-nonzero-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-nonzero-expected.png
index a8c70e2..db4da21 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-nonzero-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-clipped-nonzero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-1-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-1-expected.png
index 285cd87c..a3f2578 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-1-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-2-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-2-expected.png
index 285cd87c..a3f2578 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-2-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-css-transform-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-expected.png
index 20d821a..92983858 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-nonzero-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-nonzero-expected.png
index 5010818..e300ea86 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-nonzero-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-evenodd-nonzero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-evenodd-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-evenodd-expected.png
index ec39d6c3..b8cfe43 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-evenodd-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-evenodd-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-expected.png
index 30c17bc..52a9028 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-nonzero-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-objectBoundingBox-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-objectBoundingBox-expected.png
index 0a154e8f..2dae4dcc 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-objectBoundingBox-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-objectBoundingBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-g-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-g-expected.png
index 0ef4c5518..5f3e831a 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-g-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-svg-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-svg-expected.png
index 0ef4c5518..5f3e831a 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-on-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-1-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-1-expected.png
index 285cd87c..a3f2578 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-1-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-2-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-2-expected.png
index 285cd87c..a3f2578 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-2-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-transform-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-use-as-child-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-use-as-child-expected.png
index 0ef4c5518..5f3e831a 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-use-as-child-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-use-as-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-userSpaceOnUse-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-userSpaceOnUse-expected.png
index 53708f8..36a3dc2 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-userSpaceOnUse-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/clip-path-userSpaceOnUse-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-image-based-clipping-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-image-based-clipping-expected.png
index 6ec2e6fa..24bd37e8 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-image-based-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-image-based-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-and-image-based-clipping-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-and-image-based-clipping-expected.png
index a559737..41715b7f 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-and-image-based-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-and-image-based-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-based-clipping-expected.png b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-based-clipping-expected.png
index 16e65257..18fba42 100644
--- a/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-based-clipping-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/clip-path/nested-clip-in-mask-path-based-clipping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/css/background-image-svg-expected.png b/third_party/WebKit/LayoutTests/svg/css/background-image-svg-expected.png
index 2f1794ba..a1f627d 100644
--- a/third_party/WebKit/LayoutTests/svg/css/background-image-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/css/background-image-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/absolute-root-position-masking-expected.png b/third_party/WebKit/LayoutTests/svg/custom/absolute-root-position-masking-expected.png
index 46b046aa..c3dc113 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/absolute-root-position-masking-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/absolute-root-position-masking-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-1-expected.png b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-1-expected.png
index d216a7c..ba9690c 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-1-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-2-expected.png b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-2-expected.png
index 25a0d1e..ce01aec 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-2-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-3-expected.png b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-3-expected.png
index d216a7c..ba9690c 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-3-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-4-expected.png b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-4-expected.png
index d216a7c..ba9690c 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-4-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/circular-marker-reference-4-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/dasharrayOrigin-expected.png b/third_party/WebKit/LayoutTests/svg/custom/dasharrayOrigin-expected.png
index 4dd15e7..ecaf199 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/dasharrayOrigin-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/dasharrayOrigin-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/filter-css-transform-resolution-expected.png b/third_party/WebKit/LayoutTests/svg/custom/filter-css-transform-resolution-expected.png
index 87df60e..90f12b71 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/filter-css-transform-resolution-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/filter-css-transform-resolution-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/fractional-rects-expected.png b/third_party/WebKit/LayoutTests/svg/custom/fractional-rects-expected.png
index 4cae92d5..bce67914 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/fractional-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/fractional-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/gradient-rotated-bbox-expected.png b/third_party/WebKit/LayoutTests/svg/custom/gradient-rotated-bbox-expected.png
index b6c9435..a973bc3 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/gradient-rotated-bbox-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/gradient-rotated-bbox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/gradient-stroke-width-expected.png b/third_party/WebKit/LayoutTests/svg/custom/gradient-stroke-width-expected.png
index a7df7707..6abea08 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/gradient-stroke-width-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/gradient-stroke-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/marker-changes-expected.png b/third_party/WebKit/LayoutTests/svg/custom/marker-changes-expected.png
index 4bbdefaf..e8de613 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/marker-changes-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/marker-changes-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/marker-opacity-expected.png b/third_party/WebKit/LayoutTests/svg/custom/marker-opacity-expected.png
index 4184412e..9aafc8b9 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/marker-opacity-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/marker-opacity-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/marker-referencePoint-expected.png b/third_party/WebKit/LayoutTests/svg/custom/marker-referencePoint-expected.png
index 4c83d0d4..c355eb38 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/marker-referencePoint-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/marker-referencePoint-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/mask-on-multiple-objects-expected.png b/third_party/WebKit/LayoutTests/svg/custom/mask-on-multiple-objects-expected.png
index 4f00a5c..9befdb7 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/mask-on-multiple-objects-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/mask-on-multiple-objects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/non-circular-marker-reference-expected.png b/third_party/WebKit/LayoutTests/svg/custom/non-circular-marker-reference-expected.png
index a6943c5..cb45d6b 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/non-circular-marker-reference-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/non-circular-marker-reference-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-expected.png b/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-expected.png
index 88dedf59..54e6fe1 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-markers-expected.png b/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-markers-expected.png
index 7378ad6..95c9454e 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-markers-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/non-scaling-stroke-markers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-height-expected.png b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-height-expected.png
index 5f034aa1..6a8b070 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-height-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-expected.png b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-expected.png
index 5f034aa1..6a8b070 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-height-expected.png b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-height-expected.png
index e65669f..026ae64 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-height-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/object-sizing-explicit-width-height-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/path-update-expected.png b/third_party/WebKit/LayoutTests/svg/custom/path-update-expected.png
index 1ea2eb91..0c9baa0 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/path-update-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/path-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/path-zero-strokewidth-expected.png b/third_party/WebKit/LayoutTests/svg/custom/path-zero-strokewidth-expected.png
index e03d2b74..12b7f49 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/path-zero-strokewidth-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/path-zero-strokewidth-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/pattern-no-pixelation-expected.png b/third_party/WebKit/LayoutTests/svg/custom/pattern-no-pixelation-expected.png
index fe639da..071e3b3c 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/pattern-no-pixelation-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/pattern-no-pixelation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/pattern-referencing-preserve-aspect-ratio-expected.png b/third_party/WebKit/LayoutTests/svg/custom/pattern-referencing-preserve-aspect-ratio-expected.png
index b30dc0d..a1610e1 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/pattern-referencing-preserve-aspect-ratio-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/pattern-referencing-preserve-aspect-ratio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/pattern-scaled-pattern-space-expected.png b/third_party/WebKit/LayoutTests/svg/custom/pattern-scaled-pattern-space-expected.png
index 9b6db1f..23ed89f 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/pattern-scaled-pattern-space-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/pattern-scaled-pattern-space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/rounded-rects-expected.png b/third_party/WebKit/LayoutTests/svg/custom/rounded-rects-expected.png
index b6baba8..c3b23c8 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/rounded-rects-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/rounded-rects-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/use-css-no-effect-on-shadow-tree-expected.png b/third_party/WebKit/LayoutTests/svg/custom/use-css-no-effect-on-shadow-tree-expected.png
index e2118563c..442c35f 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/use-css-no-effect-on-shadow-tree-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/use-css-no-effect-on-shadow-tree-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/use-nested-transform-expected.png b/third_party/WebKit/LayoutTests/svg/custom/use-nested-transform-expected.png
index 3ae49e7..177487f 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/use-nested-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/use-nested-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png b/third_party/WebKit/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png
index 34e7363..ebf4eb3 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/use-on-clip-path-with-transformation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/viewBox-hit-expected.png b/third_party/WebKit/LayoutTests/svg/custom/viewBox-hit-expected.png
index 456fa97..a8463a2 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/viewBox-hit-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/viewBox-hit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/custom/width-full-percentage-expected.png b/third_party/WebKit/LayoutTests/svg/custom/width-full-percentage-expected.png
index f1685105..fb9d05e 100644
--- a/third_party/WebKit/LayoutTests/svg/custom/width-full-percentage-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/custom/width-full-percentage-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVG-dynamic-css-transform-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVG-dynamic-css-transform-expected.png
index 61ebd22..cf31fe1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVG-dynamic-css-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVG-dynamic-css-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cx-attr-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cy-attr-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-cy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-r-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-r-attr-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-r-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-dom-r-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-cy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGCircleElement-svgdom-r-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cx-attr-expected.png
index de86057c..b2540e8 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cy-attr-expected.png
index de86057c..b2540e8 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-cy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-rx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-rx-attr-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-rx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-rx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-dom-ry-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop-expected.png
index de86057c..b2540e8 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop-expected.png
index de86057c..b2540e8 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-rx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop-expected.png
index b7d383f..14991494 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png
index 15167faa..6ecc6dc 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-in2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k1-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png
index b33b2696c..85b74fb0 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k3-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-k4-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-dom-operator-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png
index 15167faa..6ecc6dc 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-in2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k1-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png
index b33b2696c..85b74fb0 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k3-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-k4-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png
index 316b84b..6a5059a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFECompositeElement-svgdom-operator-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-diffuseConstant-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-diffuseConstant-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-diffuseConstant-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-diffuseConstant-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-in-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-in-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-in-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-in-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-lighting-color-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-lighting-color-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-lighting-color-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-lighting-color-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-surfaceScale-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-surfaceScale-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-surfaceScale-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-dom-surfaceScale-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-inherit-lighting-color-css-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-lighting-color-css-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-diffuseConstant-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-diffuseConstant-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-diffuseConstant-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-diffuseConstant-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-in-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-in-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-in-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-in-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-surfaceScale-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-surfaceScale-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-surfaceScale-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDiffuseLightingElement-svgdom-surfaceScale-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-azimuth-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-azimuth-attr-expected.png
index 701aa58..d540771 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-azimuth-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-azimuth-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-elevation-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-elevation-attr-expected.png
index 701aa58..d540771 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-elevation-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-dom-elevation-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-azimuth-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-azimuth-prop-expected.png
index 701aa58..d540771 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-azimuth-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-azimuth-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-elevation-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-elevation-prop-expected.png
index 701aa58..d540771 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-elevation-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDistantLightElement-svgdom-elevation-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-in-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png
index f499ddf..bdd59c0 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-color-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png
index 2f89878..6b118a70 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-shadow-opacity-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png
index abdf019a..741a9850 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-dy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png
index 964ed4e3..d9b531b2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-in-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png
index f499ddf..bdd59c0 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-color-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png
index 2f89878..6b118a70 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-shadow-opacity-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png
index abdf019a..741a9850 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEDropShadowElement-svgdom-stdDeviation-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-dom-in-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-dom-in-attr-expected.png
index 8ce4ad1d..b71c364 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-dom-in-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-dom-in-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-svgdom-in-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-svgdom-in-prop-expected.png
index 8ce4ad1d..b71c364 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-svgdom-in-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEMergeNodeElement-svgdom-in-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dx-attr-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dy-attr-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-dy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop-expected.png
index 6add5e6..e9b237a 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-x-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-x-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-x-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-x-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-y-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-y-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-y-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-y-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-z-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-z-attr-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-z-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-dom-z-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-x-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-x-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-x-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-x-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-y-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-y-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-y-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-y-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-z-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-z-prop-expected.png
index c371c85..d10057d1 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-z-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGFEPointLightElement-svgdom-z-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x1-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x1-attr-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x1-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x1-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x2-attr-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-x2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y1-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y1-attr-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y1-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y1-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y2-attr-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-dom-y2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x1-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-x2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y1-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop-expected.png
index fab4533b..569113e 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLineElement-svgdom-y2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientUnits-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientUnits-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientUnits-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientUnits-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x1-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x1-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x1-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x1-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x2-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-x2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y1-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y1-attr-expected.png
index 2eb19d02..4bc4aa5 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y1-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y1-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y2-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y2-attr-expected.png
index 4242181..9840a135 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y2-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-dom-y2-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientUnits-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientUnits-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientUnits-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientUnits-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x1-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-x2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop-expected.png
index 2eb19d02..4bc4aa5 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y1-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop-expected.png
index 4242181..9840a135 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGLinearGradientElement-svgdom-y2-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerHeight-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerUnits-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerUnits-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerUnits-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerUnits-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerWidth-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerWidth-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerWidth-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-markerWidth-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-orient-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-orient-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-orient-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-orient-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refX-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refX-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refX-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refX-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refY-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refY-attr-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refY-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-dom-refY-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerHeight-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerUnits-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerUnits-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerUnits-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerUnits-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-markerWidth-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientAngle-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientAngle-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientAngle-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientAngle-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientType-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientType-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientType-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-orientType-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refX-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-refY-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAngle-call-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAngle-call-expected.png
index 44dd79a..19d3287 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAngle-call-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAngle-call-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAuto-call-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAuto-call-expected.png
index b9c14ad4..1e05f23 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAuto-call-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMarkerElement-svgdom-setOrientToAuto-call-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-height-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-height-attr-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-height-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-height-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskContentUnits-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskContentUnits-attr-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskContentUnits-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskContentUnits-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskUnits-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskUnits-attr-expected.png
index 581e136a..2292c99 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskUnits-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-maskUnits-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-width-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-width-attr-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-width-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-width-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-x-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-x-attr-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-x-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-x-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-y-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-y-attr-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-y-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-dom-y-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-height-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskContentUnits-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskContentUnits-prop-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskContentUnits-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskContentUnits-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskUnits-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskUnits-prop-expected.png
index 581e136a..2292c99 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskUnits-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-maskUnits-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-width-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-x-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop-expected.png
index 8e7b4755..b5de8e2 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGMaskElement-svgdom-y-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cx-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cy-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-cy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fx-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fx-attr-expected.png
index 8b7ac31..69d6a89 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fx-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fx-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fy-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fy-attr-expected.png
index 8b7ac31..69d6a89 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fy-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-fy-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientUnits-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientUnits-attr-expected.png
index 8f23824..9728e43 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientUnits-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientUnits-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-r-attr-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-r-attr-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-r-attr-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-dom-r-attr-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-cy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop-expected.png
index 8b7ac31..69d6a89 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fx-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop-expected.png
index 8b7ac31..69d6a89 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-fy-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientUnits-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientUnits-prop-expected.png
index 8f23824..9728e43 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientUnits-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientUnits-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop-expected.png b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop-expected.png
index dda7e32..8ec65e4 100644
--- a/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/dynamic-updates/SVGRadialGradientElement-svgdom-r-prop-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png b/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png
index b8494a8..9fa58d7 100644
--- a/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/filters/feImage-late-indirect-update-expected.png b/third_party/WebKit/LayoutTests/svg/filters/feImage-late-indirect-update-expected.png
index b3fb1a1..ce37863 100644
--- a/third_party/WebKit/LayoutTests/svg/filters/feImage-late-indirect-update-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/filters/feImage-late-indirect-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/filters/filter-clip-expected.png b/third_party/WebKit/LayoutTests/svg/filters/filter-clip-expected.png
index 13161be..b3a2953 100644
--- a/third_party/WebKit/LayoutTests/svg/filters/filter-clip-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/filters/filter-clip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/cascade/001-broken-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/cascade/001-broken-expected.png
index 7e3999b..3139a99 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/cascade/001-broken-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/cascade/001-broken-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/cascade/002-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/cascade/002-expected.png
index 3663322..59096af 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/cascade/002-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/cascade/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/links/001-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/links/001-expected.png
index 2e5020ea..0a2eed7 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/links/001-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/links/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/mixed/004-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/mixed/004-expected.png
index 342db5f..e5039d5 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/mixed/004-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/mixed/004-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/mixed/005-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/mixed/005-expected.png
index 342db5f..e5039d5 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/mixed/005-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/mixed/005-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/001-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/001-expected.png
index 495dae0..528c056 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/001-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/002-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/002-expected.png
index f4091cc..41297ae 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/002-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/rendering-model/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/shapes/path/001-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/shapes/path/001-expected.png
index d31b9679..bcb5daf 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/shapes/path/001-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/shapes/path/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/hixie/transform/001-expected.png b/third_party/WebKit/LayoutTests/svg/hixie/transform/001-expected.png
index 8bf64dd..5640257 100644
--- a/third_party/WebKit/LayoutTests/svg/hixie/transform/001-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/hixie/transform/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-arc-linecaps-rendering-expected.png b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-arc-linecaps-rendering-expected.png
index 69a22a8..325f1e59 100644
--- a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-arc-linecaps-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-arc-linecaps-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-path-linecap-rendering-expected.png b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-path-linecap-rendering-expected.png
index 774ae5b..58291604 100644
--- a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-path-linecap-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-path-linecap-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-subpaths-linecap-rendering-expected.png b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-subpaths-linecap-rendering-expected.png
index c24c9b77..dd6667c0 100644
--- a/third_party/WebKit/LayoutTests/svg/stroke/zero-length-subpaths-linecap-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/stroke/zero-length-subpaths-linecap-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-background-image-tiled-expected.png b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-background-image-tiled-expected.png
index cd054df0..f4bf275 100644
--- a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-background-image-tiled-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-background-image-tiled-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-clip-path-expected.png b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-clip-path-expected.png
index 122a628..c394efd 100644
--- a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-clip-path-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-clip-path-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png
index 30a7506e..f117ce4 100644
--- a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-and-viewBox-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png
index 3537ae0c0..9381163 100644
--- a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-background-with-relative-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-relative-image-expected.png b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-relative-image-expected.png
index ab0bff2..77c2b3a 100644
--- a/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-relative-image-expected.png
+++ b/third_party/WebKit/LayoutTests/svg/zoom/page/zoom-svg-as-relative-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug106795-expected.png b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug106795-expected.png
index abd38a1b..e6e2aba 100644
--- a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug106795-expected.png
+++ b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug106795-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug13169-expected.png b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug13169-expected.png
index 23dadd4f..0ac6aa6 100644
--- a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug13169-expected.png
+++ b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug13169-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug15933-expected.png b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug15933-expected.png
index c8bd412..7638e104 100644
--- a/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug15933-expected.png
+++ b/third_party/WebKit/LayoutTests/tables/mozilla/bugs/bug15933-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/transforms/matrix-01-expected.png b/third_party/WebKit/LayoutTests/transforms/matrix-01-expected.png
new file mode 100644
index 0000000..de91787d8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/transforms/matrix-01-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-1-expected.png b/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-1-expected.png
index ccc23a5..e05efe8e 100644
--- a/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-1-expected.png
+++ b/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-2-expected.png b/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-2-expected.png
index 47e3827..5ffb879f 100644
--- a/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-2-expected.png
+++ b/third_party/WebKit/LayoutTests/transforms/rotated-transform-affects-scrolling-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/transitions/opacity-transform-transitions-inside-iframe-expected.png b/third_party/WebKit/LayoutTests/transitions/opacity-transform-transitions-inside-iframe-expected.png
index 0305074..65d5a58ff 100644
--- a/third_party/WebKit/LayoutTests/transitions/opacity-transform-transitions-inside-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/transitions/opacity-transform-transitions-inside-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorSpace-attribute.html b/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorSpace-attribute.html
deleted file mode 100644
index 1cd5a1b..0000000
--- a/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorSpace-attribute.html
+++ /dev/null

@@ -1,18 +0,0 @@
-<!DOCTYPE HTML>
-<script src="../../../../../resources/testharness.js"></script>
-<script src="../../../../../resources/testharnessreport.js"></script>
-<script>
-function checkCanvasColorSpace(requestedColorSpace, expectedColorSpace) {
-	var canvas = document.createElement("canvas")
-	var ctx = canvas.getContext('2d', { colorSpace: requestedColorSpace });
-	assert_equals(ctx.getContextAttributes().colorSpace, expectedColorSpace);
-}
-
-generate_tests(checkCanvasColorSpace, [
-	['legacy-srgb is supported', 'legacy-srgb', 'legacy-srgb'],
-	['srgb is supported', 'srgb', 'srgb'],
-	['linear-rgb is supported', 'linear-rgb', 'linear-rgb'],
-	['rec-2020 is supported', 'rec-2020', 'rec-2020'],
-	['p3 is supported', 'p3', 'p3'],
-]);
-</script>

diff --git a/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorspace-arguments.html b/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorspace-arguments.html
new file mode 100644
index 0000000..2ee2a984
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/color_space/fast/canvas/color-space/canvas-colorspace-arguments.html

@@ -0,0 +1,59 @@
+<script src="../../../../../resources/testharness.js"></script>
+<script src="../../../../../resources/testharnessreport.js"></script>
+
+<script>
+
+var testScenarios = [
+    ["Test default context creation parameters", {}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+
+    ["Test CanvasColorSpace value srgb", {colorSpace: "srgb"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test CanvasColorSpace value rec2020", {colorSpace: "rec2020"},  {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test CanvasColorSpace value p3", {colorSpace: "p3"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+
+    ["Test CanvasPixelFormat value 8-8-8-8", {pixelFormat: "8-8-8-8"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test CanvasPixelFormat value 10-10-10-2", {pixelFormat: "10-10-10-2"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test CanvasPixelFormat value 12-12-12-12", {pixelFormat: "12-12-12-12"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test CanvasPixelFormat value float16", {pixelFormat: "float16"}, {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test supported CanvasColorSpace and CanvasPixelFormat combination: srgb/8-8-8-8", {colorSpace: "srgb", pixelFormat: "8-8-8-8"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: srgb/10-10-10-2", {colorSpace: "srgb", pixelFormat: "10-10-10-2"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: srgb/12-12-12-12", {colorSpace: "srgb", pixelFormat: "12-12-12-12"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test supported CanvasColorSpace and CanvasPixelFormat combination: srgb/float16", {colorSpace: "srgb", pixelFormat: "float16"}, {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: rec2020/8-8-8-8", {colorSpace: "rec2020", pixelFormat: "8-8-8-8"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: rec2020/10-10-10-2", {colorSpace: "rec2020", pixelFormat: "10-10-10-2"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: rec2020/12-12-12-12", {colorSpace: "rec2020", pixelFormat: "12-12-12-12"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test supported CanvasColorSpace and CanvasPixelFormat combination: rec2020/float16", {colorSpace: "rec2020", pixelFormat: "float16"}, {colorSpace: "rec2020", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: p3/8-8-8-8", {colorSpace: "p3", pixelFormat: "8-8-8-8"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: p3/10-10-10-2", {colorSpace: "p3", pixelFormat: "10-10-10-2"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test not-supported CanvasColorSpace and CanvasPixelFormat combination: p3/12-12-12-12", {colorSpace: "p3", pixelFormat: "12-12-12-12"}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test supported CanvasColorSpace and CanvasPixelFormat combination: p3/float16", {colorSpace: "p3", pixelFormat: "float16"}, {colorSpace: "p3", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test parameter linearPixelMath srgb/8-8-8-8/false", {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test parameter linearPixelMath srgb/8-8-8-8/true", {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: true}, {colorSpace: "srgb", pixelFormat: "8-8-8-8", linearPixelMath: false}],
+    ["Test parameter linearPixelMath srgb/float16/false", {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: false}, {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: true}],
+    ["Test parameter linearPixelMath srgb/float16/true", {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: true}, {colorSpace: "srgb", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test parameter linearPixelMath rec2020/float16/false", {colorSpace: "rec2020", pixelFormat: "float16", linearPixelMath: false}, {colorSpace: "rec2020", pixelFormat: "float16", linearPixelMath: true}],
+    ["Test parameter linearPixelMath rec2020/float16/true", {colorSpace: "rec2020", pixelFormat: "float16", linearPixelMath: true}, {colorSpace: "rec2020", pixelFormat: "float16", linearPixelMath: true}],
+
+    ["Test parameter linearPixelMath p3/float16/false", {colorSpace: "p3", pixelFormat: "float16", linearPixelMath: false}, {colorSpace: "p3", pixelFormat: "float16", linearPixelMath: true}],
+    ["Test parameter linearPixelMath p3/float16/true", {colorSpace: "p3", pixelFormat: "float16", linearPixelMath: true}, {colorSpace: "p3", pixelFormat: "float16", linearPixelMath: true}],
+];
+
+function runTestScenario(contextCreationParameters, expectedContextAttributes) {
+    console.log(contextCreationParameters);
+    var canvas = document. createElement('canvas');
+    var ctx = canvas.getContext('2d', contextCreationParameters);
+    var contextAttributes = ctx.getContextAttributes();
+    console.log(contextAttributes);
+    console.log(expectedContextAttributes);
+    assert_equals(contextAttributes.colorSpace, expectedContextAttributes.colorSpace);
+    assert_equals(contextAttributes.pixelFormat, expectedContextAttributes.pixelFormat);
+    assert_equals(contextAttributes.linearPixelMath, expectedContextAttributes.linearPixelMath);
+}
+
+generate_tests(runTestScenario, testScenarios);
+</script>
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/absolute-position-change-containing-block-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/absolute-position-change-containing-block-expected.txt
new file mode 100644
index 0000000..b7e4583
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/absolute-position-change-containing-block-expected.txt

@@ -0,0 +1,72 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 784, 2000],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [108, 5100, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [100, 100, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
+          "rect": [8, 5000, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='container' class='fixed blue'",
+          "rect": [8, 8, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='container' class='fixed blue'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='container' class='fixed blue'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/add-table-overpaint-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/add-table-overpaint-expected.txt
new file mode 100644
index 0000000..cf7d883
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/add-table-overpaint-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [0, 312, 800, 156],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [0, 312, 156, 156],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [0, 312, 156, 156],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [0, 314, 156, 152],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [2, 314, 152, 152],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-replaced-expected.txt
new file mode 100644
index 0000000..6c873755
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/block-layout-inline-children-replaced-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target' class='target'",
+          "rect": [0, 116, 402, 152],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [151, 117, 100, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target' class='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt
new file mode 100644
index 0000000..975c18ea
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/clipped-relative-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='inner'",
+          "rect": [8, 70, 204, 232],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 70, 204, 232],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='inner'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-cell-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-cell-expected.txt
new file mode 100644
index 0000000..dcb65bb6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-cell-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable (positioned) TABLE",
+          "rect": [0, 0, 350, 350],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [0, 0, 350, 350],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutTableCell (anonymous)",
+          "rect": [200, 200, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+          "rect": [200, 200, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+          "rect": [50, 200, 100, 100],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTable (positioned) TABLE",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-expected.txt
new file mode 100644
index 0000000..4c7d66b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-expected.txt

@@ -0,0 +1,78 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable (positioned) TABLE",
+          "rect": [0, 0, 200, 200],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+          "rect": [100, 100, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell (anonymous)",
+          "rect": [100, 100, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+          "rect": [100, 100, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='green'",
+          "rect": [0, 100, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='green'",
+          "rect": [0, 100, 100, 100],
+          "reason": "layoutObject removal"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='green'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTable (positioned) TABLE",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='green'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-zindex-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-zindex-expected.txt
new file mode 100644
index 0000000..937b655a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-table-overflow-zindex-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable (positioned) TABLE",
+          "rect": [0, 0, 200, 200],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+          "rect": [100, 100, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell (anonymous)",
+          "rect": [0, 100, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+          "rect": [0, 100, 100, 100],
+          "reason": "layoutObject removal"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD id='moveMe' class='fixed'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTable (positioned) TABLE",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutTableCell (anonymous)",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt
new file mode 100644
index 0000000..3d89906
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/fixed-to-relative-position-with-absolute-child-expected.txt

@@ -0,0 +1,68 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [8, 8, 784, 2000],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [108, 308, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [108, 300, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='fixed blue'",
+          "rect": [8, 208, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
+          "rect": [8, 200, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='container' class='fixed blue'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='fixed blue'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='container' class='fixed blue'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-outline-repaint-2-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-outline-repaint-2-expected.txt
new file mode 100644
index 0000000..d613eeadd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-outline-repaint-2-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutInline SPAN",
+          "rect": [210, -5, 50, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [215, 0, 40, 10],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutInline SPAN",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineFlowBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Test'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-reflow-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-reflow-expected.txt
new file mode 100644
index 0000000..c509ebe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-reflow-expected.txt

@@ -0,0 +1,113 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div1' class='container'",
+          "rect": [0, 0, 300, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 300, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div2' class='container'",
+          "rect": [0, 300, 300, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='div1' class='container'",
+          "rect": [0, 0, 200, 300],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 0, 200, 300],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 300, 180, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div1' class='container'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'A A A A A AA AA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AA AA AAA AAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAA AAAA AAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAAA AAAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAAAA AAAAAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAAAA AAAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAAAA AAAA AAAA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AAA AAA AAA AA'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'AA AA AA A A A'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'A A'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='div2' class='container'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'A A A A A'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-relative-positioned-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-relative-positioned-expected.txt
new file mode 100644
index 0000000..d704f4b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/inline-relative-positioned-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [8, 88, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 88, 100, 100],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'a'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/insert-frame-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/insert-frame-expected.txt
new file mode 100644
index 0000000..a60dfc36
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/insert-frame-expected.txt

@@ -0,0 +1,52 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutIFrame IFRAME",
+          "rect": [0, 0, 104, 104],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutBlockFlow HTML",
+          "rect": [2, 2, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [2, 2, 100, 100],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [10, 10, 84, 84],
+          "reason": "layoutObject insertion"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutIFrame IFRAME",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-expected.txt
new file mode 100644
index 0000000..f0b7d56
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target'",
+          "rect": [0, 580, 80, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [0, 580, 80, 20],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt
new file mode 100644
index 0000000..b35e2e8
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-abspos-in-relpos-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target'",
+          "rect": [508, 28, 80, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [508, 28, 80, 20],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-block-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-block-expected.txt
new file mode 100644
index 0000000..0be81a2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/multicol-with-block-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [488, 8, 150, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [488, 8, 80, 20],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt
new file mode 100644
index 0000000..1d7d279b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [8, 8, 769, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 300, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 300, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [762, 8, 15, 300],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='innerDiv'",
+      "reason": "subtree"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt
new file mode 100644
index 0000000..af7f859
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-in-overflow-hidden-scrolled-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV class='innerWrapper'",
+          "rect": [8, 18, 100, 190],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='red'",
+          "rect": [8, 18, 100, 190],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='ucp' class='green'",
+          "rect": [8, 18, 100, 190],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV class='innerWrapper'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='red'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='ucp' class='green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt
new file mode 100644
index 0000000..35c9ba28
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-expected.txt

@@ -0,0 +1,59 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='scroller'",
+      "position": [8, 8],
+      "bounds": [302, 302],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='scroller'",
+          "rect": [0, 0, 302, 302],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, 1, 300, 600],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, -399, 300, 600],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, 601, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, 201, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='scroller'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt
new file mode 100644
index 0000000..47d9d336
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt

@@ -0,0 +1,105 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow DIV id='scroller'",
+      "position": [8, 8],
+      "bounds": [302, 302],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='scroller'",
+          "rect": [0, 0, 302, 302],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, 1, 300, 600],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [1, -399, 300, 600],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [1, 601, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [1, 201, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [1, 689, 88, 12],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [1, 289, 88, 12],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [89, 601, 12, 88],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [89, 201, 12, 88],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [89, 689, 12, 12],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [89, 289, 12, 12],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='scroller'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "subtree"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutScrollbarPart (anonymous)",
+      "reason": "scroll"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutScrollbarPart (anonymous)",
+      "reason": "scroll"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt
new file mode 100644
index 0000000..1d7d279b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [8, 8, 769, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 300, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 300, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [762, 8, 15, 300],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='innerDiv'",
+      "reason": "subtree"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-content-size-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-content-size-expected.txt
new file mode 100644
index 0000000..c4d681d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-content-size-expected.txt

@@ -0,0 +1,47 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'",
+          "rect": [0, 200, 140, 140],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
+          "rect": [0, 0, 140, 140],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='inner'",
+          "rect": [20, 220, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='inner'",
+          "rect": [0, 200, 100, 100],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='inner'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-visual-size-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-visual-size-expected.txt
new file mode 100644
index 0000000..72637310
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/padding-keeping-visual-size-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'",
+          "rect": [0, 200, 100, 100],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='inner'",
+          "rect": [0, 200, 100, 100],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
+          "rect": [0, 0, 100, 100],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target1' class='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='target2' class='outer'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='inner'",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt
new file mode 100644
index 0000000..1a867151
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/positioned-list-offset-change-repaint-expected.txt

@@ -0,0 +1,45 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutListItem (positioned) LI",
+          "rect": [8, 60, 214, 236],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage IMG",
+          "rect": [8, 60, 214, 232],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutListItem (positioned) LI",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutListMarker (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage IMG",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/reflection-repaint-test-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/reflection-repaint-test-expected.txt
new file mode 100644
index 0000000..93ee8bef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/reflection-repaint-test-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [22, 50, 226, 167],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [23, 51, 71, 109],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "full"
+    },
+    {
+      "object": "InlineTextBox 'PASS'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt
new file mode 100644
index 0000000..3b2516b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/remove-inline-block-descendant-of-flex-expected.txt

@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [0, 100, 100, 300],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'",
+          "rect": [0, 200, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inline-block-1' class='item'",
+          "rect": [0, 100, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'",
+          "rect": [0, 100, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBR BR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inline-block-1' class='item'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inline-block-2' class='item'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBR BR",
+      "reason": "location change"
+    },
+    {
+      "object": "InlineTextBox '\n'",
+      "reason": "location change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt
new file mode 100644
index 0000000..aa5b644
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/resize-scrollable-iframe-expected.txt

@@ -0,0 +1,97 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (anonymous)",
+          "rect": [8, 108, 784, 304],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutIFrame IFRAME id='iframe'",
+          "rect": [8, 108, 300, 300],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 193, 285, 200],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 393, 285, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 108, 200, 285],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [8, 193, 85, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [293, 108, 15, 285],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 108, 15, 85],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [293, 393, 15, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [93, 193, 15, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutIFrame IFRAME id='iframe'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/ruby-flipped-blocks-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/ruby-flipped-blocks-expected.txt
new file mode 100644
index 0000000..0d5573a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/ruby-flipped-blocks-expected.txt

@@ -0,0 +1,89 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 30, 40],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutRubyBase (anonymous)",
+          "rect": [8, 28, 20, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutRubyRun (anonymous)",
+          "rect": [8, 28, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 28, 20, 20],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [8, 8, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [28, 33, 10, 10],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "InlineTextBox 'a'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutRubyRun (anonymous)",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'c'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutRubyBase (anonymous)",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'b'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt
new file mode 100644
index 0000000..03eb4e6f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-absolute-layer-with-reflection-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [250, 230, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
+          "rect": [250, 230, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='relative reflected'",
+          "rect": [250, 230, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='green'",
+          "rect": [250, 230, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='relative reflected'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt
new file mode 100644
index 0000000..a9df748
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-descendant-with-cached-cliprects-expected.txt

@@ -0,0 +1,87 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 1893],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+          "rect": [677, 250, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+          "rect": [677, 250, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+          "rect": [677, 250, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [677, 250, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+          "rect": [677, 50, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+          "rect": [677, 50, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+          "rect": [677, 50, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [677, 50, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='scrollpanel'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='container'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV id='ul'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt
new file mode 100644
index 0000000..28ae4a6e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-no-visible-content-expected.txt

@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [100, 1150, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+          "rect": [100, 1150, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt
new file mode 100644
index 0000000..20a9c14c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-reflection-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'",
+          "rect": [250, 280, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [250, 280, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+          "rect": [250, 280, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green reflected'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt
new file mode 100644
index 0000000..7f67f9f0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-fixed-layer-with-transformed-parent-layer-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [93, 234, 142, 143],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [93, 234, 142, 143],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+          "rect": [93, 234, 142, 143],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-clipped-layer-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-clipped-layer-expected.txt
new file mode 100644
index 0000000..38ad5852
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-clipped-layer-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [100, 150, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
+          "rect": [100, 150, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='relative green'",
+          "rect": [100, 150, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='absolute clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='relative green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-fixed-layer-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-fixed-layer-expected.txt
new file mode 100644
index 0000000..2319fc1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-in-fixed-layer-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 2016],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [100, 1150, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+          "rect": [100, 1150, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+          "rect": [100, 1150, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute red'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-inside-table-cell-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-inside-table-cell-expected.txt
new file mode 100644
index 0000000..80456fce
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-inside-table-cell-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+          "rect": [312, 112, 454, 469],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [314, 114, 435, 450],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
+          "rect": [314, 114, 435, 450],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+          "rect": [314, 564, 435, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+      "reason": "subtree"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt
new file mode 100644
index 0000000..d4421e6f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-relative-table-inside-table-cell-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1566, 1781],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+          "rect": [1112, 1312, 454, 469],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+          "rect": [1114, 1314, 435, 450],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
+          "rect": [1114, 1314, 435, 450],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+          "rect": [1114, 1764, 435, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell (relative positioned) TD id='cellToScroll' class='relative'",
+      "reason": "subtree"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='relative red'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='absolute green'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt
new file mode 100644
index 0000000..d11313f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt

@@ -0,0 +1,50 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [785, 5054],
+      "contentsOpaque": true,
+      "drawsContent": true
+    },
+    {
+      "name": "LayoutBlockFlow (relative positioned) HEADER",
+      "position": [8, 26],
+      "bounds": [769, 1974],
+      "drawsContent": true,
+      "backfaceVisibility": "hidden",
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+          "rect": [10, 1824, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='recentlink'",
+          "rect": [10, 1824, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+          "rect": [10, 1424, 150, 150],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='recentlink'",
+          "rect": [10, 1424, 150, 150],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow (positioned) DIV id='searchbar'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='recentlink'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt
new file mode 100644
index 0000000..18e3373
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt

@@ -0,0 +1,41 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [1059, 585],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableCell TH id='target'",
+          "rect": [8, 68, 840, 190],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutText #text",
+          "rect": [10, 68, 836, 190],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TH id='target'",
+      "reason": "style change"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "style change"
+    },
+    {
+      "object": "InlineTextBox 'Col 1'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt
new file mode 100644
index 0000000..b71f204b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/absolute-sized-content-with-resources-expected.txt

@@ -0,0 +1,116 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 50, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [42, 117, 334, 268],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [42, 117, 334, 268],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [42, 117, 334, 268],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [242, 251, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [242, 51, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [9, 251, 167, 200],
+          "reason": "location change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [9, 51, 167, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [17, 217, 84, 68],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [17, 217, 84, 68],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [17, 217, 84, 68],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [67, 251, 42, 67],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [67, 184, 42, 67],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "SVG resource change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/container-repaint-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/container-repaint-expected.txt
new file mode 100644
index 0000000..89d73c7a3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/container-repaint-expected.txt

@@ -0,0 +1,43 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 100, 100, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='mover'",
+          "rect": [0, 100, 100, 50],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 50, 100, 50],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='mover'",
+          "rect": [0, 50, 100, 50],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='mover'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt
new file mode 100644
index 0000000..e484f81
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/embedded-svg-size-changes-no-layout-triggers-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 600],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [0, 0, 402, 202],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject OBJECT",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt
new file mode 100644
index 0000000..94c0b7e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/feImage-target-attribute-change-with-use-indirection-2-expected.txt

@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 0, 110, 110],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer use id='use'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [0, 0, 100, 100],
+          "reason": "location change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer use id='use'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGResourceFilterPrimitive feImage id='feimage'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-child-repaint-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-child-repaint-expected.txt
new file mode 100644
index 0000000..69f28641
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-child-repaint-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 106, 106],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='poke'",
+          "rect": [32, 32, 64, 64],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='poke'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-refresh-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-refresh-expected.txt
new file mode 100644
index 0000000..2385e606
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/filter-refresh-expected.txt

@@ -0,0 +1,468 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [10, 170, 132, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [10, 130, 132, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='separate2'",
+          "rect": [140, 140, 36, 36],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='filtered'",
+          "rect": [140, 100, 36, 36],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [140, 60, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 170, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 130, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 90, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 90, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 50, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [90, 50, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 170, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 130, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 90, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 90, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 50, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [50, 50, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [10, 90, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [10, 50, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='separate1'",
+          "rect": [140, 60, 30, 30],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 170, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 170, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 130, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 130, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 90, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 90, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 50, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [90, 50, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 170, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 170, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 130, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 130, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 90, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 90, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 50, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 50, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 170, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 170, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 130, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 130, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 90, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 90, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 50, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 50, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [0, 10, 30, 30],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='separate1'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='filtered'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGRect rect id='separate2'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/image-with-clip-path-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/image-with-clip-path-expected.txt
new file mode 100644
index 0000000..a0fe8056
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/image-with-clip-path-expected.txt

@@ -0,0 +1,110 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGRect rect id='r'",
+          "rect": [0, 0, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGRect rect id='r'",
+          "rect": [0, 0, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='g'",
+          "rect": [20, 20, 60, 60],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='g'",
+          "rect": [20, 20, 60, 60],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [20, 20, 60, 60],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [20, 20, 60, 60],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='g'",
+          "rect": [175, 25, 50, 50],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [175, 25, 50, 50],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGRect rect id='r'",
+          "rect": [175, 25, 50, 50],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGContainer g id='g'",
+          "rect": [0, 0, 10, 10],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [0, 0, 10, 10],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGHiddenContainer defs",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='p'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGRect rect id='r'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGImage image",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer g id='g'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGHiddenContainer defs",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGResourceClipper clipPath id='p'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGRect rect id='r'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGImage image",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt
new file mode 100644
index 0000000..9a52d15
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-contract-expected.txt

@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 0, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='inner'",
+          "rect": [0, 0, 200, 200],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='inner'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt
new file mode 100644
index 0000000..0830470
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/inner-svg-change-viewBox-expected.txt

@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='s'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGViewportContainer svg id='s'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/invalidate-on-child-layout-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/invalidate-on-child-layout-expected.txt
new file mode 100644
index 0000000..11db7d5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/invalidate-on-child-layout-expected.txt

@@ -0,0 +1,43 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [40, 40, 120, 120],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 110, 110],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGEllipse circle id='circle'",
+          "rect": [50, 50, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGEllipse circle id='circle'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGEllipse circle id='circle'",
+      "reason": "full"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt
new file mode 100644
index 0000000..fd7d6e4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-1-expected.txt

@@ -0,0 +1,144 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 600],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [0, 0, 402, 202],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [1, 1, 400, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [1, 1, 400, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 285, 135],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [0, 0, 285, 135],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 135, 285, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [211, 11, 180, 180],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [11, 11, 180, 180],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 10, 180, 125],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [210, 10, 75, 125],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [285, 0, 15, 135],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [285, 135, 15, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject OBJECT",
+      "reason": "style change"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow HTML",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject OBJECT",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt
new file mode 100644
index 0000000..fd7d6e4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/nested-embedded-svg-size-changes-no-layout-triggers-2-expected.txt

@@ -0,0 +1,144 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 600],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [0, 0, 402, 202],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [1, 1, 400, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [1, 1, 400, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 285, 135],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject OBJECT",
+          "rect": [0, 0, 285, 135],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 135, 285, 15],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [211, 11, 180, 180],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [11, 11, 180, 180],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [10, 10, 180, 125],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [210, 10, 75, 125],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [285, 0, 15, 135],
+          "reason": "scroll"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [285, 135, 15, 15],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject OBJECT",
+      "reason": "style change"
+    },
+    {
+      "object": "HorizontalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutBlockFlow HTML",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject OBJECT",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutText #text",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutView #document",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "location change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt
new file mode 100644
index 0000000..fcfdf499
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/object-sizing-no-width-height-change-content-box-size-expected.txt

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 8, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutEmbeddedObject object",
+          "rect": [9, 9, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [9, 9, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 9, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [169, 169, 80, 80],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse circle",
+          "rect": [89, 189, 40, 40],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutEmbeddedObject object",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGEllipse circle",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt
new file mode 100644
index 0000000..39e6dc21
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-content-expected.txt

@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 68, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..554d1f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-deep-shadow-tree-content-expected.txt

@@ -0,0 +1,121 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 68, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [209, 269, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [209, 269, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [209, 269, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [209, 269, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [109, 169, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [109, 169, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 169, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [59, 269, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [59, 269, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [59, 269, 50, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [59, 269, 50, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [34, 169, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [34, 169, 50, 200],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt
new file mode 100644
index 0000000..b877f187
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-image-expected.txt

@@ -0,0 +1,46 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 68, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGImage image",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGImage image",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt
new file mode 100644
index 0000000..cb5af87
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-inner-svg-expected.txt

@@ -0,0 +1,70 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 50, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [27, 67, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [27, 67, 364, 364],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [27, 67, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [13, 205, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [13, 205, 92, 91],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg",
+          "rect": [13, 205, 92, 91],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt
new file mode 100644
index 0000000..6cb9baaf
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-expected.txt

@@ -0,0 +1,128 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 68, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [209, 269, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [209, 269, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [9, 269, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer g id='targetUse'",
+          "rect": [9, 69, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [9, 69, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use id='targetUse'",
+          "rect": [9, 69, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 69, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 69, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect1'",
+          "rect": [9, 69, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [59, 269, 50, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='targetRect'",
+          "rect": [59, 269, 50, 200],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='targetUse'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='targetRect1'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt
new file mode 100644
index 0000000..266a46ac
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-shadow-tree-content-with-symbol-expected.txt

@@ -0,0 +1,78 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 68, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [9, 69, 400, 400],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [9, 69, 400, 400],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
+          "rect": [9, 69, 400, 400],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [209, 269, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [9, 69, 200, 200],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRect rect",
+          "rect": [59, 269, 50, 50],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='targetSymbol'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGRect rect",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt
new file mode 100644
index 0000000..38d1145
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-on-symbol-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 50, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [45, 85, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [45, 85, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [45, 85, 328, 328],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [45, 85, 328, 328],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [16, 57, 136, 137],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [18, 209, 82, 83],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [18, 209, 82, 83],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [18, 209, 82, 83],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [18, 209, 82, 83],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt
new file mode 100644
index 0000000..99cb27d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/relative-sized-use-without-attributes-on-symbol-expected.txt

@@ -0,0 +1,93 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 50, 402, 402],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [27, 67, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [27, 67, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [27, 67, 364, 364],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [27, 67, 364, 364],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [16, 57, 136, 137],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [13, 205, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGPath path",
+          "rect": [13, 205, 92, 91],
+          "reason": "bounds change"
+        },
+        {
+          "object": "LayoutSVGRoot svg",
+          "rect": [13, 205, 92, 91],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+          "rect": [13, 205, 92, 91],
+          "reason": "bounds change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='gamesBorder'",
+      "reason": "bounds change"
+    },
+    {
+      "object": "LayoutSVGPath path",
+      "reason": "bounds change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-paintorder-expected.png b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-paintorder-expected.png
new file mode 100644
index 0000000..0093e74
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-paintorder-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/resource-client-removal-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/resource-client-removal-expected.txt
new file mode 100644
index 0000000..554193b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/resource-client-removal-expected.txt

@@ -0,0 +1,395 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGContainer g id='inneruse'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGPath path id='hp'",
+          "rect": [0, 0, 100, 100],
+          "reason": "SVG resource change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop id='offset'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop id='offset'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop id='offset'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop id='offset'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGGradientStop stop id='offset'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGContainer g id='inneruse'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer g",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGPath path id='hp'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt
new file mode 100644
index 0000000..328806e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/svg-image-change-content-size-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow div id='contentBox'",
+          "rect": [8, 50, 602, 422],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutImage img",
+          "rect": [9, 51, 420, 420],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow div id='contentBox'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutImage img",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-foreign-object-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-foreign-object-expected.txt
new file mode 100644
index 0000000..d051621
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-foreign-object-expected.txt

@@ -0,0 +1,43 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [108, 8, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [108, 8, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV",
+          "rect": [8, 8, 100, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGForeignObject foreignObject",
+          "rect": [8, 8, 100, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGForeignObject foreignObject",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-text-element-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-text-element-expected.txt
new file mode 100644
index 0000000..9b8351f2
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/transform-text-element-expected.txt

@@ -0,0 +1,51 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [8, 58, 400, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [8, 58, 400, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGInlineText #text",
+          "rect": [8, 8, 400, 100],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGText text",
+          "rect": [8, 8, 400, 100],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGText text",
+      "reason": "subtree"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGInlineText #text",
+      "reason": "subtree"
+    },
+    {
+      "object": "InlineTextBox 'Test'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-disappears-after-style-update-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-disappears-after-style-update-expected.txt
new file mode 100644
index 0000000..fd49df3d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-disappears-after-style-update-expected.txt

@@ -0,0 +1,69 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [50, 10, 36, 36],
+          "reason": "SVG resource change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 10, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [50, 10, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 10, 30, 30],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [10, 10, 30, 30],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [0, 10, 30, 30],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "SVG resource change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-inherit-style-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-inherit-style-expected.txt
new file mode 100644
index 0000000..4b166e4b4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-inherit-style-expected.txt

@@ -0,0 +1,42 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutSVGContainer g id='g'",
+          "rect": [0, 0, 100, 60],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGContainer use",
+          "rect": [0, 0, 100, 60],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutSVGRect rect id='rect'",
+          "rect": [0, 0, 100, 60],
+          "reason": "style change"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGContainer g id='g'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGContainer use",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutSVGRect rect id='rect'",
+      "reason": "style change"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt
new file mode 100644
index 0000000..bc87857
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/svg/use-setAttribute-crash-expected.txt

@@ -0,0 +1,91 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow body",
+          "rect": [8, 8, 784, 204],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [32, 32, 52, 52],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGContainer svg:use id='use'",
+          "rect": [33, 33, 50, 50],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGRoot svg:svg id='svg'",
+          "rect": [33, 33, 50, 50],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='symbol'",
+          "rect": [33, 33, 50, 50],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [7, 7, 27, 27],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutSVGEllipse svg:circle id='circle'",
+          "rect": [52, 52, 12, 12],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutSVGViewportContainer svg id='symbol'",
+          "rect": [53, 53, 10, 10],
+          "reason": "layoutObject removal"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='symbol'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutBlockFlow body",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutSVGRoot svg:svg id='svg'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutSVGContainer svg:use id='use'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutSVGViewportContainer svg id='symbol'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutSVGEllipse svg:circle id='circle'",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-outer-border-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-outer-border-expected.txt
new file mode 100644
index 0000000..b06d1cb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-outer-border-expected.txt

@@ -0,0 +1,131 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTable TABLE id='table'",
+          "rect": [8, 8, 132, 149],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTable TABLE id='table' class='green'",
+          "rect": [8, 8, 132, 149],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 75, 132, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 75, 132, 82],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 8, 132, 82],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [8, 8, 132, 82],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [15, 15, 117, 134],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [15, 15, 117, 134],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [15, 82, 117, 67],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [15, 82, 117, 67],
+          "reason": "layoutObject removal"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [15, 15, 117, 67],
+          "reason": "layoutObject insertion"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [15, 15, 117, 67],
+          "reason": "layoutObject removal"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTable TABLE id='table'",
+      "reason": "layoutObject removal"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTable TABLE id='table' class='green'",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "layoutObject insertion"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "layoutObject insertion"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt
new file mode 100644
index 0000000..bf51a4b9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-auto-in-overflow-auto-scrolled-expected.txt

@@ -0,0 +1,87 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [8, 8, 769, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [10, 8, 302, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [10, 8, 302, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [762, 8, 15, 300],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='innerDiv'",
+      "reason": "subtree"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt
new file mode 100644
index 0000000..bf51a4b9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-overflow-scroll-in-overflow-scroll-scrolled-expected.txt

@@ -0,0 +1,87 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [8, 8, 769, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTable TABLE",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableRow TR",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableSection TBODY",
+          "rect": [8, 8, 306, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [10, 8, 302, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [10, 8, 302, 300],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='innerDiv'",
+          "rect": [762, 8, 15, 300],
+          "reason": "scroll"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow DIV id='innerDiv'",
+      "reason": "subtree"
+    },
+    {
+      "object": "VerticalScrollbar",
+      "reason": "scroll"
+    },
+    {
+      "object": "LayoutTable TABLE",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableSection TBODY",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableRow TR",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-row-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-row-expected.txt
new file mode 100644
index 0000000..a401d9f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/table-row-expected.txt

@@ -0,0 +1,37 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTableRow TR id='target' class='green'",
+          "rect": [8, 10, 106, 100],
+          "reason": "style change"
+        },
+        {
+          "object": "LayoutTableCell TD",
+          "rect": [10, 10, 102, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableRow TR id='target' class='green'",
+      "reason": "style change"
+    },
+    {
+      "object": "LayoutTableCell TD",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/textarea-set-disabled-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/textarea-set-disabled-expected.txt
new file mode 100644
index 0000000..1fe9d5a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/textarea-set-disabled-expected.txt

@@ -0,0 +1,33 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutTextControl TEXTAREA",
+          "rect": [8, 8, 106, 106],
+          "reason": "subtree"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='inner-editor'",
+          "rect": [11, 11, 100, 10],
+          "reason": "subtree"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutTextControl TEXTAREA",
+      "reason": "subtree"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='inner-editor'",
+      "reason": "subtree"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt
new file mode 100644
index 0000000..d5165bed
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length1-expected.txt

@@ -0,0 +1,65 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 154],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [20, 0, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 130, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 100, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 130, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 100, 20, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt
new file mode 100644
index 0000000..d0a82cf7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align-length2-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 204],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [300, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 80, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 50, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt
new file mode 100644
index 0000000..767c886
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align1-expected.txt

@@ -0,0 +1,65 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 104],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [20, 0, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 80, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [120, 34, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 80, 20, 20],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 34, 20, 20],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt
new file mode 100644
index 0000000..67a4ee39
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/vertical-align2-expected.txt

@@ -0,0 +1,60 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow BODY",
+          "rect": [0, 0, 800, 246],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [300, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='other'",
+          "rect": [0, 0, 200, 200],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 146, 100, 100],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow DIV id='target'",
+          "rect": [200, 100, 100, 100],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutBlockFlow BODY",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV id='target'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='other'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt
new file mode 100644
index 0000000..73762ea
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/disable-spinvalidation/paint/invalidation/window-resize-centered-inline-under-fixed-pos-expected.txt

@@ -0,0 +1,227 @@
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [600, 250],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='container'",
+          "rect": [0, 0, 600, 500],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 250, 600, 250],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='parent'",
+          "rect": [0, 0, 6, 500],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 250, 6, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 125, 6, 30],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='container'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='parent'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [400, 250],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='container'",
+          "rect": [0, 0, 600, 250],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [400, 0, 200, 250],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='parent'",
+          "rect": [0, 0, 6, 250],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 125, 6, 30],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='container'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='parent'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [400, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='container'",
+          "rect": [0, 0, 400, 600],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [0, 250, 400, 350],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='parent'",
+          "rect": [0, 0, 6, 600],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 300, 6, 30],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 125, 6, 30],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='container'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='parent'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+{
+  "layers": [
+    {
+      "name": "LayoutView #document",
+      "bounds": [800, 600],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "paintInvalidations": [
+        {
+          "object": "LayoutBlockFlow (positioned) DIV class='container'",
+          "rect": [0, 0, 800, 600],
+          "reason": "full"
+        },
+        {
+          "object": "LayoutView #document",
+          "rect": [400, 0, 400, 600],
+          "reason": "incremental"
+        },
+        {
+          "object": "LayoutBlockFlow DIV class='parent'",
+          "rect": [0, 0, 6, 600],
+          "reason": "forced by layout"
+        },
+        {
+          "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+          "rect": [0, 300, 6, 30],
+          "reason": "forced by layout"
+        }
+      ]
+    }
+  ],
+  "objectPaintInvalidations": [
+    {
+      "object": "LayoutView #document",
+      "reason": "incremental"
+    },
+    {
+      "object": "LayoutBlockFlow (positioned) DIV class='container'",
+      "reason": "full"
+    },
+    {
+      "object": "LayoutBlockFlow DIV class='parent'",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "RootInlineBox",
+      "reason": "forced by layout"
+    },
+    {
+      "object": "LayoutBlockFlow (relative positioned) DIV class='child'",
+      "reason": "forced by layout"
+    }
+  ]
+}
+

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-arc-circumference-fill-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-arc-circumference-fill-expected.png
index bcc8bcb..f44424a 100644
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-arc-circumference-fill-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-arc-circumference-fill-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-transformclip-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-transformclip-expected.png
index 2dcbcbf..6ff69f8 100644
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-transformclip-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-composite-transformclip-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-circumference-fill-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-circumference-fill-expected.png
index f0a34f66..9679b87 100644
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-circumference-fill-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-circumference-fill-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.png
deleted file mode 100644
index ab81036..0000000
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-ellipse-connecting-line-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
index bf9392bd..396bbdb 100644
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-imageSmoothingEnabled-patterns-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
new file mode 100644
index 0000000..3c23e1f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/downsample-quality-expected.png b/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/downsample-quality-expected.png
deleted file mode 100644
index 63e7c30..0000000
--- a/third_party/WebKit/LayoutTests/virtual/display_list_2d_canvas/fast/canvas/downsample-quality-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-ellipse-connecting-line-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-ellipse-connecting-line-expected.png
index ab81036..018ce5b 100644
--- a/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-ellipse-connecting-line-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-ellipse-connecting-line-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/downsample-quality-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/downsample-quality-expected.png
deleted file mode 100644
index 63e7c30..0000000
--- a/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/downsample-quality-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt
index 9cb4ac85..290dd14c 100644
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/foreignfetch-origin-trial-interfaces-expected.txt

@@ -1,19 +1,9 @@
-CONSOLE MESSAGE: line 20: Interfaces in Service Worker - no origin trial
-interface InstallEvent
-global object
-CONSOLE MESSAGE: line 32: Interfaces in Service Worker - origin trial enabled.
-interface ForeignFetchEvent
-    getter origin
-    getter request
-    method constructor
-    method respondWith
-interface InstallEvent
-    method registerForeignFetch
-global object
-    getter onforeignfetch
-    setter onforeignfetch
 This is a testharness.js-based test.
 PASS ForeignFetch related interfaces in SW - no origin trial. 
 PASS ForeignFetch related interfaces in SW - origin trial enabled. 
+PASS ForeignFetch related properties on interfaces in service worker, without trial. 
+PASS ForeignFetch related interfaces in service worker, without trial. 
+PASS ForeignFetch related properties on interfaces in service worker, with trial enabled. 
+PASS ForeignFetch related interfaces in service worker, with trial enabled. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt
deleted file mode 100644
index 7becb254..0000000
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,35 +0,0 @@
-CONSOLE MESSAGE: line 17: Interfaces in document
-interface ImageCapture
-    getter videoStreamTrack
-    method constructor
-    method getPhotoCapabilities
-    method grabFrame
-    method setOptions
-    method takePhoto
-interface MediaSettingsRange
-    getter current
-    getter max
-    getter min
-    getter step
-    method constructor
-interface PhotoCapabilities
-    getter brightness
-    getter colorTemperature
-    getter contrast
-    getter exposureCompensation
-    getter exposureMode
-    getter fillLightMode
-    getter focusMode
-    getter imageHeight
-    getter imageWidth
-    getter iso
-    getter redEyeReduction
-    getter saturation
-    getter sharpness
-    getter whiteBalanceMode
-    getter zoom
-    method constructor
-This is a testharness.js-based test.
-PASS ImageCapture related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt
index 3bd95cb..ae75c20 100644
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/imagecapture-origin-trial-interfaces-script-added-expected.txt

@@ -1,36 +1,3 @@
-CONSOLE MESSAGE: line 17: Interfaces before adding trial token
-
-CONSOLE MESSAGE: line 27: Interfaces after adding trial token
-interface ImageCapture
-    getter videoStreamTrack
-    method constructor
-    method getPhotoCapabilities
-    method grabFrame
-    method setOptions
-    method takePhoto
-interface MediaSettingsRange
-    getter current
-    getter max
-    getter min
-    getter step
-    method constructor
-interface PhotoCapabilities
-    getter brightness
-    getter colorTemperature
-    getter contrast
-    getter exposureCompensation
-    getter exposureMode
-    getter fillLightMode
-    getter focusMode
-    getter imageHeight
-    getter imageWidth
-    getter iso
-    getter redEyeReduction
-    getter saturation
-    getter sharpness
-    getter whiteBalanceMode
-    getter zoom
-    method constructor
 This is a testharness.js-based test.
 PASS ImageCapture related interfaces before adding trial token via script. 
 PASS ImageCapture related interfaces after adding trial token via script. 

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt
deleted file mode 100644
index f3af481..0000000
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,8 +0,0 @@
-CONSOLE MESSAGE: line 16: Interfaces in document
-interface Document
-    getter rootScroller
-    setter rootScroller
-This is a testharness.js-based test.
-PASS RootScroller related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt
index 7ee3373..d007a49 100644
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/rootscroller-origin-trial-interfaces-script-added-expected.txt

@@ -1,11 +1,5 @@
-CONSOLE MESSAGE: line 16: Interfaces before adding trial token
-interface Document
-CONSOLE MESSAGE: line 25: Interfaces after adding trial token
-interface Document
-    getter rootScroller
-    setter rootScroller
 This is a testharness.js-based test.
-PASS RootScroller related interfaces before adding trial token via script. 
-PASS RootScroller related interfaces after adding trial token via script. 
+PASS RootScroller related properties on interfaces before adding trial token via script. 
+PASS RootScroller related properties on interfaces after adding trial token via script. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt
deleted file mode 100644
index 61830f9..0000000
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-expected.txt
+++ /dev/null

@@ -1,91 +0,0 @@
-CONSOLE MESSAGE: line 33: Interfaces in document
-interface Navigator
-    getter usb
-interface USBAlternateInterface
-    getter alternateSetting
-    getter endpoints
-    getter interfaceClass
-    getter interfaceName
-    getter interfaceProtocol
-    getter interfaceSubclass
-    method constructor
-interface USBConfiguration
-    getter configurationName
-    getter configurationValue
-    getter interfaces
-    method constructor
-interface USBConnectionEvent
-    getter device
-    method constructor
-interface USBDevice
-    getter configuration
-    getter configurations
-    getter deviceClass
-    getter deviceProtocol
-    getter deviceSubclass
-    getter deviceVersionMajor
-    getter deviceVersionMinor
-    getter deviceVersionSubminor
-    getter manufacturerName
-    getter opened
-    getter productId
-    getter productName
-    getter serialNumber
-    getter usbVersionMajor
-    getter usbVersionMinor
-    getter usbVersionSubminor
-    getter vendorId
-    method claimInterface
-    method clearHalt
-    method close
-    method constructor
-    method controlTransferIn
-    method controlTransferOut
-    method isochronousTransferIn
-    method isochronousTransferOut
-    method open
-    method releaseInterface
-    method reset
-    method selectAlternateInterface
-    method selectConfiguration
-    method transferIn
-    method transferOut
-interface USBEndpoint
-    getter direction
-    getter endpointNumber
-    getter packetSize
-    getter type
-    method constructor
-interface USBInTransferResult
-    getter data
-    getter status
-    method constructor
-interface USBInterface
-    getter alternate
-    getter alternates
-    getter claimed
-    getter interfaceNumber
-    method constructor
-interface USBIsochronousInTransferPacket
-    getter data
-    getter status
-    method constructor
-interface USBIsochronousInTransferResult
-    getter data
-    getter packets
-    method constructor
-interface USBIsochronousOutTransferPacket
-    getter bytesWritten
-    getter status
-    method constructor
-interface USBIsochronousOutTransferResult
-    getter packets
-    method constructor
-interface USBOutTransferResult
-    getter bytesWritten
-    getter status
-    method constructor
-This is a testharness.js-based test.
-PASS WebUSB related interfaces in Origin-Trial enabled document. 
-Harness: the test ran to completion.
-

diff --git a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt
index e9942e0b..072f70f 100644
--- a/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt
+++ b/third_party/WebKit/LayoutTests/virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/webusb-origin-trial-interfaces-script-added-expected.txt

@@ -1,94 +1,7 @@
-CONSOLE MESSAGE: line 31: Interfaces before adding trial token
-interface Navigator
-CONSOLE MESSAGE: line 53: Interfaces after adding trial token
-interface Navigator
-    getter usb
-interface USBAlternateInterface
-    getter alternateSetting
-    getter endpoints
-    getter interfaceClass
-    getter interfaceName
-    getter interfaceProtocol
-    getter interfaceSubclass
-    method constructor
-interface USBConfiguration
-    getter configurationName
-    getter configurationValue
-    getter interfaces
-    method constructor
-interface USBConnectionEvent
-    getter device
-    method constructor
-interface USBDevice
-    getter configuration
-    getter configurations
-    getter deviceClass
-    getter deviceProtocol
-    getter deviceSubclass
-    getter deviceVersionMajor
-    getter deviceVersionMinor
-    getter deviceVersionSubminor
-    getter manufacturerName
-    getter opened
-    getter productId
-    getter productName
-    getter serialNumber
-    getter usbVersionMajor
-    getter usbVersionMinor
-    getter usbVersionSubminor
-    getter vendorId
-    method claimInterface
-    method clearHalt
-    method close
-    method constructor
-    method controlTransferIn
-    method controlTransferOut
-    method isochronousTransferIn
-    method isochronousTransferOut
-    method open
-    method releaseInterface
-    method reset
-    method selectAlternateInterface
-    method selectConfiguration
-    method transferIn
-    method transferOut
-interface USBEndpoint
-    getter direction
-    getter endpointNumber
-    getter packetSize
-    getter type
-    method constructor
-interface USBInTransferResult
-    getter data
-    getter status
-    method constructor
-interface USBInterface
-    getter alternate
-    getter alternates
-    getter claimed
-    getter interfaceNumber
-    method constructor
-interface USBIsochronousInTransferPacket
-    getter data
-    getter status
-    method constructor
-interface USBIsochronousInTransferResult
-    getter data
-    getter packets
-    method constructor
-interface USBIsochronousOutTransferPacket
-    getter bytesWritten
-    getter status
-    method constructor
-interface USBIsochronousOutTransferResult
-    getter packets
-    method constructor
-interface USBOutTransferResult
-    getter bytesWritten
-    getter status
-    method constructor
 This is a testharness.js-based test.
+PASS WebUSB related properties on interfaces before adding trial token via script. 
 PASS WebUSB related interfaces before adding trial token via script. 
+PASS WebUSB related properties on interfaces after adding trial token via script. 
 PASS WebUSB related interfaces after adding trial token via script. 
 Harness: the test ran to completion.
 

diff --git a/third_party/WebKit/LayoutTests/virtual/threaded/transitions/opacity-transform-transitions-inside-iframe-expected.png b/third_party/WebKit/LayoutTests/virtual/threaded/transitions/opacity-transform-transitions-inside-iframe-expected.png
index e778d07..70fc03d6 100644
--- a/third_party/WebKit/LayoutTests/virtual/threaded/transitions/opacity-transform-transitions-inside-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/virtual/threaded/transitions/opacity-transform-transitions-inside-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo-expected.txt b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo-expected.txt
deleted file mode 100644
index 5987c72..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo-expected.txt
+++ /dev/null

@@ -1,13 +0,0 @@
-Test equal-power panner model of AudioPannerNode with stereo source.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS Number of impulses matches the number of panner nodes.
-PASS All impulses at expected offsets.
-PASS Left channel gain values are correct.
-PASS Right channel gain values are correct.
-PASS EqualPower panner test passed
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo.html b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo.html
index f885a05..6637657 100644
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo.html
+++ b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-automation-equalpower-stereo.html

@@ -1,18 +1,16 @@
 <!doctype html>
 <html>
   <head>
-    <script src="../../resources/js-test.js"></script>
+    <script src="../../resources/testharness.js"></script>
+    <script src="../../resources/testharnessreport.js"></script> 
     <script src="../resources/audit-util.js"></script>
-    <script src="../resources/audio-testing.js"></script>
+    <script src="../resources/audit.js"></script>
     <script src="../resources/panner-model-testing.js"></script>
   </head>
 
   <body>
-    <div id="description"></div>
-    <div id="console"></div>
-
     <script>
-      description("Test equal-power panner model of AudioPannerNode with stereo source.");
+      let audit = Audit.createTaskRunner();
 
       // To test the panner, we create a number of panner nodes
       // equally spaced on a semicircle at unit distance.  The
@@ -20,27 +18,28 @@
       // covering full left to full right.  Each source is an impulse
       // turning at a different time and we check that the rendered
       // impulse has the expected gain.
-      function runTest() {
-          if (window.testRunner) {
-              testRunner.dumpAsText();
-              testRunner.waitUntilDone();
-          }
+      audit.define(
+          {
+            label: 'test',
+            description:
+                'Equal-power panner model of AudioPannerNode with stereo source',
+          },
+          (task, should) => {
+            // Create offline audio context.
+            context = new OfflineAudioContext(
+                2, sampleRate * renderLengthSeconds, sampleRate);
 
-          window.jsTestIsAsync = true;
-
-          // Create offline audio context.
-          context = new OfflineAudioContext(2, sampleRate * renderLengthSeconds, sampleRate);
-
-          createTestAndRun(context, nodesToCreate, 2, function (panner, x, y, z) {
-            panner.positionX.value = x;
-            panner.positionY.value = y;
-            panner.positionZ.value = z;
+            createTestAndRun(
+                context, should, nodesToCreate, 2,
+                function(panner, x, y, z) {
+                  panner.positionX.value = x;
+                  panner.positionY.value = y;
+                  panner.positionZ.value = z;
+                })
+                .then(() => task.done());
           });
-      }
-
-      runTest();
-      successfullyParsed = true;
-
+      
+      audit.run();
     </script>
 
   </body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-expected.txt b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-expected.txt
deleted file mode 100644
index cbda404..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-expected.txt
+++ /dev/null

@@ -1,13 +0,0 @@
-Test equal-power panner model of AudioPannerNode.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS Number of impulses matches the number of panner nodes.
-PASS All impulses at expected offsets.
-PASS Left channel gain values are correct.
-PASS Right channel gain values are correct.
-PASS EqualPower panner test passed
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo-expected.txt b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo-expected.txt
deleted file mode 100644
index 5987c72..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo-expected.txt
+++ /dev/null

@@ -1,13 +0,0 @@
-Test equal-power panner model of AudioPannerNode with stereo source.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS Number of impulses matches the number of panner nodes.
-PASS All impulses at expected offsets.
-PASS Left channel gain values are correct.
-PASS Right channel gain values are correct.
-PASS EqualPower panner test passed
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo.html b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo.html
index 033f3e7..aa18675 100644
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo.html
+++ b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower-stereo.html

@@ -1,18 +1,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <script src="../../resources/js-test.js"></script>
+    <script src="../../resources/testharness.js"></script>
+    <script src="../../resources/testharnessreport.js"></script> 
     <script src="../resources/audit-util.js"></script>
-    <script src="../resources/audio-testing.js"></script>
+    <script src="../resources/audit.js"></script>
     <script src="../resources/panner-model-testing.js"></script>
   </head>
 
   <body>
-    <div id="description"></div>
-    <div id="console"></div>
-
     <script>
-      description("Test equal-power panner model of AudioPannerNode with stereo source.");
+      let audit = Audit.createTaskRunner();
 
       // To test the panner, we create a number of panner nodes
       // equally spaced on a semicircle at unit distance.  The
@@ -20,25 +18,25 @@
       // covering full left to full right.  Each source is an impulse
       // turning at a different time and we check that the rendered
       // impulse has the expected gain.
-      function runTest() {
-          if (window.testRunner) {
-              testRunner.dumpAsText();
-              testRunner.waitUntilDone();
-          }
+      audit.define(
+          {
+            label: 'test',
+            description:
+                'Equal-power panner model of AudioPannerNode with stereo source'
+          },
+          (task, should) => {
+            context = new OfflineAudioContext(
+                2, sampleRate * renderLengthSeconds, sampleRate);
 
-          window.jsTestIsAsync = true;
-
-          // Create offline audio context.
-          context = new OfflineAudioContext(2, sampleRate * renderLengthSeconds, sampleRate);
-
-          createTestAndRun(context, nodesToCreate, 2, function (panner, x, y, z) {
-            panner.setPosition(x, y, z);
+            createTestAndRun(
+                context, should, nodesToCreate, 2,
+                function(panner, x, y, z) {
+                  panner.setPosition(x, y, z);
+                })
+                .then(() => task.done());
           });
-      }
-
-      runTest();
-      successfullyParsed = true;
-
+      
+      audit.run();
     </script>
 
   </body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower.html b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower.html
index 8ab2bbd..66a152d 100644
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower.html
+++ b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-equalpower.html

@@ -1,18 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!doctype html>
 <html>
   <head>
-    <script src="../../resources/js-test.js"></script>
+    <script src="../../resources/testharness.js"></script>
+    <script src="../../resources/testharnessreport.js"></script> 
     <script src="../resources/audit-util.js"></script>
-    <script src="../resources/audio-testing.js"></script>
+    <script src="../resources/audit.js"></script>
     <script src="../resources/panner-model-testing.js"></script>
   </head>
 
   <body>
-    <div id="description"></div>
-    <div id="console"></div>
-
     <script>
-      description("Test equal-power panner model of AudioPannerNode.");
+      let audit = Audit.createTaskRunner();
 
       // To test the panner, we create a number of panner nodes
       // equally spaced on a semicircle at unit distance.  The
@@ -20,25 +18,26 @@
       // covering full left to full right.  Each source is an impulse
       // turning at a different time and we check that the rendered
       // impulse has the expected gain.
-      function runTest() {
-          if (window.testRunner) {
-              testRunner.dumpAsText();
-              testRunner.waitUntilDone();
-          }
+      audit.define(
+          {
+            label: 'test',
+            description: 'Equal-power panner model of AudioPannerNode',
+          },
+          (task, should) => {
+            // Create offline audio context.
+            context = new OfflineAudioContext(
+                2, sampleRate * renderLengthSeconds, sampleRate);
 
-          window.jsTestIsAsync = true;
-
-          // Create offline audio context.
-          context = new OfflineAudioContext(2, sampleRate * renderLengthSeconds, sampleRate);
-
-          createTestAndRun(context, nodesToCreate, 1, function (panner, x, y, z) {
-            panner.setPosition(x, y, z);
+            createTestAndRun(
+                context, should, nodesToCreate, 1,
+                function(panner, x, y, z) {
+                  panner.setPosition(x, y, z);
+                })
+                .then(() => task.done());
+            ;
           });
-      }
 
-      runTest();
-      successfullyParsed = true;
-
+      audit.run();
     </script>
 
   </body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop-expected.txt b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop-expected.txt
deleted file mode 100644
index f3ae92b..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop-expected.txt
+++ /dev/null

@@ -1,9 +0,0 @@
-Test PannerNode handling of feedback loops
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS Rendering successfully completed.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop.html b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop.html
index 83fe6e5..8ac17ec 100644
--- a/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop.html
+++ b/third_party/WebKit/LayoutTests/webaudio/Panner/panner-loop.html

@@ -1,83 +1,78 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <script src="../../resources/js-test.js"></script>
+    <script src="../../resources/testharness.js"></script>
+    <script src="../../resources/testharnessreport.js"></script> 
     <script src="../resources/audit-util.js"></script>
-    <script src="../resources/audio-testing.js"></script>
+    <script src="../resources/audit.js"></script>
     <script src="../resources/panner-model-testing.js"></script>
   </head>
 
   <body>
-    <div id="description"></div>
-    <div id="console"></div>
     <script>
-      description("Test PannerNode handling of feedback loops");
+      let audit = Audit.createTaskRunner();
 
       // See crbug.com/331446.
 
       // Create a simple feedback loop and make sure the panner node processes it correctly.
 
-      function runTest() {
-          if (window.testRunner) {
-              testRunner.dumpAsText();
-              testRunner.waitUntilDone();
-          }
+      audit.define(
+          {label: 'test', description: 'PannerNode handling of feedback loops'},
+          (task, should) => {
 
-          window.jsTestIsAsync = true;
+            var sampleRate = 44100;
+            var renderLengthSeconds = 1;
 
-          var sampleRate = 44100;
-          var renderLengthSeconds = 1;
-      
-          // Create offline audio context.
-          var context = new OfflineAudioContext(2, sampleRate * renderLengthSeconds, sampleRate);
+            // Create offline audio context.
+            var context = new OfflineAudioContext(
+                2, sampleRate * renderLengthSeconds, sampleRate);
 
-          // Create nodes in graph. This is based on the test given in crbug.com/331446.
-          var source = context.createBufferSource();
-          source.buffer = createImpulseBuffer(context, sampleRate * renderLengthSeconds);
-          var activateNode = context.createGain();
-          var dry = context.createGain();
-          var wet = context.createGain();
-          var filter = context.createBiquadFilter();
-          var delay = context.createDelay();
-          var feedbackNode = context.createGain();
-          var output = context.createGain();
+            // Create nodes in graph. This is based on the test given in
+            // crbug.com/331446.
+            var source = context.createBufferSource();
+            source.buffer =
+                createImpulseBuffer(context, sampleRate * renderLengthSeconds);
+            var activateNode = context.createGain();
+            var dry = context.createGain();
+            var wet = context.createGain();
+            var filter = context.createBiquadFilter();
+            var delay = context.createDelay();
+            var feedbackNode = context.createGain();
+            var output = context.createGain();
 
-          delay.delayTime.value = 0.1;
-          wet.gain.value = 0.5;
-          dry.gain.value = 1;
-          feedbackNode.gain.value = 0.45;
-          filter.frequency.value = 20000;
+            delay.delayTime.value = 0.1;
+            wet.gain.value = 0.5;
+            dry.gain.value = 1;
+            feedbackNode.gain.value = 0.45;
+            filter.frequency.value = 20000;
 
-          source.connect(activateNode);
-          activateNode.connect(delay);
-          activateNode.connect(dry);
-          delay.connect(filter);
-          filter.connect(feedbackNode);
-          feedbackNode.connect(delay);
-          feedbackNode.connect(wet);
-          wet.connect(output);
-          dry.connect(output);
+            source.connect(activateNode);
+            activateNode.connect(delay);
+            activateNode.connect(dry);
+            delay.connect(filter);
+            filter.connect(feedbackNode);
+            feedbackNode.connect(delay);
+            feedbackNode.connect(wet);
+            wet.connect(output);
+            dry.connect(output);
 
-          var panner = context.createPanner();
-          panner.coneOuterGain = 0.1;
-          panner.coneOuterAngle = 180;
-          panner.coneInnerAngle = 0;
+            var panner = context.createPanner();
+            panner.coneOuterGain = 0.1;
+            panner.coneOuterAngle = 180;
+            panner.coneInnerAngle = 0;
 
-          panner.connect(context.destination);
+            panner.connect(context.destination);
 
-          output.connect(panner);
+            output.connect(panner);
 
-          // Render.  We don't care what the output is, though.
+            // Render.  We don't care what the output is, though.
 
-          context.oncomplete = function (event) {
-                                   testPassed("Rendering successfully completed.");
-                                   finishJSTest();
-                               };
-          context.startRendering();
-      }
-      
-      runTest();
-      successfullyParsed = true;
+            should(context.startRendering(), 'Rendering of offline context')
+                .beResolved()
+                .then(() => task.done());
+          });
+
+      audit.run();
     </script>
     
   </body>

diff --git a/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379-expected.txt b/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379-expected.txt
deleted file mode 100644
index 185a886..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379-expected.txt
+++ /dev/null

@@ -1,9 +0,0 @@
-Test WaveShaperNode
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS WaveShaper successfully handled change in oversampling
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379.html b/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379.html
index 7e7dad6..aebbcc2 100644
--- a/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379.html
+++ b/third_party/WebKit/LayoutTests/webaudio/WaveShaper/waveshaper-364379.html

@@ -1,40 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!doctype html>
 <html>
   <head>
-    <script src="../../resources/js-test.js"></script>
+    <script src="../../resources/testharness.js"></script>
+    <script src="../../resources/testharnessreport.js"></script> 
+    <script src="../resources/audit-util.js"></script>
+    <script src="../resources/audit.js"></script>
   </head>
 
   <body>
-    <div id="description"></div>
-    <div id="console"></div>
-
     <script>
-      description("Test WaveShaperNode");
+      let audit = Audit.createTaskRunner();
 
-      function runTest() {
-        if (window.testRunner) {
-          testRunner.dumpAsText();
-          testRunner.waitUntilDone();
-        }
-
-        window.jsTestIsAsync = true;
-
+      audit.define({label: 'Test WaveShaperNode'}, (task, should) => {
         // Simplified test from crbug.com/364379
-        var sampleRate = 44100;
-        var context = new OfflineAudioContext(1, sampleRate, sampleRate);
-        var waveShaper = context.createWaveShaper();
-        context.oncomplete = function () {
-          // If we get here, we passed the test from bug 364379.  Just say we succeeded.
-          testPassed("WaveShaper successfully handled change in oversampling");
-          finishJSTest();
+        let sampleRate = 44100;
+        let context = new OfflineAudioContext(1, sampleRate, sampleRate);
+        let waveShaper = context.createWaveShaper();
+        context.oncomplete = () => {
+          // If we get here, we passed the test from bug 364379.  Just say we
+          // succeeded.
+          should(true, 'WaveShaper successfully handled change in oversampling')
+              .beTrue();
+          task.done();
         };
         context.startRendering();
         waveShaper.connect(context.destination);
-        waveShaper.oversample = "4x";
-      }
+        waveShaper.oversample = '4x';
+      });
 
-      runTest();
-      successfullyParsed = true;
+      audit.run();
     </script>
   </body>
 </html>

diff --git a/third_party/WebKit/LayoutTests/webaudio/resources/panner-model-testing.js b/third_party/WebKit/LayoutTests/webaudio/resources/panner-model-testing.js
index 16ef23e..cf9c828 100644
--- a/third_party/WebKit/LayoutTests/webaudio/resources/panner-model-testing.js
+++ b/third_party/WebKit/LayoutTests/webaudio/resources/panner-model-testing.js

@@ -62,13 +62,14 @@
     }
 }
 
-function createTestAndRun(context, nodeCount, numberOfSourceChannels, positionSetter) {
+function createTestAndRun(context, should, nodeCount, numberOfSourceChannels,
+    positionSetter) {
     numberOfChannels = numberOfSourceChannels;
 
     createGraph(context, nodeCount, positionSetter);
 
-    context.oncomplete = checkResult;
-    context.startRendering();
+    return context.startRendering()
+        .then(buffer => checkResult(buffer, should));
 }
 
 // Map our position angle to the azimuth angle (in degrees).
@@ -108,8 +109,7 @@
     }
 }
 
-function checkResult(event) {
-    renderedBuffer = event.renderedBuffer;
+function checkResult(renderedBuffer, should) {
     renderedLeft = renderedBuffer.getChannelData(0);
     renderedRight = renderedBuffer.getChannelData(1);
 
@@ -168,42 +168,15 @@
         }
     }
 
-    if (impulseCount == nodesToCreate) {
-        testPassed("Number of impulses matches the number of panner nodes.");
-    } else {
-        testFailed("Number of impulses is incorrect.  (Found " + impulseCount + " but expected " + nodesToCreate + ")");
-        success = false;
-    }
+    should(impulseCount, "Number of impulses found")
+        .beEqualTo(nodesToCreate);
 
-    if (timeErrors.length > 0) {
-        success = false;
-        testFailed(timeErrors.length + " timing errors found in " + nodesToCreate + " panner nodes.");
-        for (var k = 0; k < timeErrors.length; ++k) {
-            testFailed("Impulse at sample " + timeErrors[k].actual + " but expected " + timeErrors[k].expected);
-        }
-    } else {
-        testPassed("All impulses at expected offsets.");
-    }
+    should(timeErrors.map(x => x.actual), "Offsets of impulses at the wrong position")
+        .beEqualToArray(timeErrors.map(x => x.expected));
 
-    if (maxErrorL <= maxAllowedError) {
-        testPassed("Left channel gain values are correct.");
-    } else {
-        testFailed("Left channel gain values are incorrect.  Max error = " + maxErrorL + " at time " + time[maxErrorIndexL] + " (threshold = " + maxAllowedError + ")");
-        success = false;
-    }
-    
-    if (maxErrorR <= maxAllowedError) {
-        testPassed("Right channel gain values are correct.");
-    } else {
-        testFailed("Right channel gain values are incorrect.  Max error = " + maxErrorR + " at time " + time[maxErrorIndexR] + " (threshold = " + maxAllowedError + ")");
-        success = false;
-    }
+    should(maxErrorL, "Error in left channel gain values")
+        .beLessThanOrEqualTo(maxAllowedError);
 
-    if (success) {
-        testPassed("EqualPower panner test passed");
-    } else {
-        testFailed("EqualPower panner test failed");
-    }
-
-    finishJSTest();
+    should(maxErrorR, "Error in right channel gain values")
+        .beLessThanOrEqualTo(maxAllowedError);
 }

diff --git a/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing-expected.txt b/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing-expected.txt
deleted file mode 100644
index 96b28ccb..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing-expected.txt
+++ /dev/null

@@ -1,9 +0,0 @@
-This test verifies whether down mixing from stereo to mono will cause assertion error.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-PASS Test no ASSERT error.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

diff --git a/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing.html b/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing.html
deleted file mode 100644
index b4a1b3b4..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/stereo2mono-down-mixing.html
+++ /dev/null

@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<script src="../resources/js-test.js"></script>
-<script src="resources/audit-util.js"></script>
-<script src="resources/audio-testing.js"></script>
-</head>
-
-<body>
-
-<div id="description"></div>
-<div id="console"></div>
-
-<script>
-description("This test verifies whether down mixing from stereo to mono will cause assertion error.");
-
-var sampleRate = 44100.0;
-var renderLengthSeconds = 0.1;
-
-var context;
-var toneBuffer;
-var bufferSource;
-
-function createDataBuffer(context, lengthInSeconds) {
-    var audioBuffer = context.createBuffer(2, lengthInSeconds * sampleRate, sampleRate);
-
-    var n = audioBuffer.length;
-    var data0 = audioBuffer.getChannelData(0);
-    var data1 = audioBuffer.getChannelData(1);
-
-    for (var i = 0; i < n; ++i) {
-        data0[i] = 1.0;
-        data1[i] = 1.0;
-    }
-
-    return audioBuffer;
-}
-
-function testFinished() {
-    testPassed("Test no ASSERT error.");
-    finishJSTest();
-}
-
-function runTest() {
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    window.jsTestIsAsync = true;
-
-    // Create offline audio context, the destination is mono.
-    context = new OfflineAudioContext(1, sampleRate * renderLengthSeconds, sampleRate);
-    // Create a stereo AudioBuffer.
-    toneBuffer = createDataBuffer(context, renderLengthSeconds);
-
-    bufferSource = context.createBufferSource();
-    bufferSource.buffer = toneBuffer;
-
-    bufferSource.connect(context.destination);
-
-    bufferSource.start(0);
-
-    context.oncomplete = testFinished;
-    context.startRendering();
-}
-
-
-runTest();
-
-</script>
-
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51-expected.wav b/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51-expected.wav
deleted file mode 100644
index 2caf9f5..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51-expected.wav
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51.html b/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51.html
deleted file mode 100644
index 3aa35e6..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-51.html
+++ /dev/null

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-Test up mixing from mono to 5.1.
--->
-
-<html>
-<head>
-<script src="resources/audit-util.js"></script>
-<script src="resources/audio-testing.js"></script>
-<script type="text/javascript" src="resources/mix-testing.js"></script>
-</head>
-<body>
-
-<script>
-
-function runTest() {
-    if (!window.testRunner)
-        return;
-
-    testRunner.waitUntilDone();
-
-    window.jsTestAsync = true;
-
-    // Create offline audio context
-    var sampleRate = 44100.0;
-    var context = new OfflineAudioContext(6, sampleRate * toneLengthSeconds, sampleRate);
-    var toneBuffer = createToneBuffer(context, 440, toneLengthSeconds, 1); 
-
-    var source = context.createBufferSource();
-    source.buffer = toneBuffer;
-    
-    source.connect(context.destination);
-    source.start(0);
-    
-    context.oncomplete = finishAudioTest;
-    context.startRendering();    
-}
-
-runTest();
-</script>
-
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo-expected.wav b/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo-expected.wav
deleted file mode 100644
index a60c9b4c..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo-expected.wav
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo.html b/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo.html
deleted file mode 100644
index ed18016..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-mono-stereo.html
+++ /dev/null

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-Test up mixing from mono to stereo.
--->
-
-<html>
-<head>
-<script src="resources/audit-util.js"></script>
-<script src="resources/audio-testing.js"></script>
-<script type="text/javascript" src="resources/mix-testing.js"></script>
-</head>
-<body>
-
-<script>
-
-function runTest() {
-    if (!window.testRunner)
-        return;
-
-    testRunner.waitUntilDone();
-
-    window.jsTestAsync = true;
-
-    // Create offline audio context
-    var sampleRate = 44100.0;
-    var context = new OfflineAudioContext(2, sampleRate * toneLengthSeconds, sampleRate);
-    var toneBuffer = createToneBuffer(context, 440, toneLengthSeconds, 1); 
-
-    var source = context.createBufferSource();
-    source.buffer = toneBuffer;
-    
-    source.connect(context.destination);
-    source.start(0);
-    
-    context.oncomplete = finishAudioTest;
-    context.startRendering();    
-}
-
-runTest();
-</script>
-
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51-expected.wav b/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51-expected.wav
deleted file mode 100644
index 383d0306..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51-expected.wav
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51.html b/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51.html
deleted file mode 100644
index 4f29991..0000000
--- a/third_party/WebKit/LayoutTests/webaudio/up-mixing-stereo-51.html
+++ /dev/null

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-
-<!--
-Test up mixing from stereo to 5.1.
--->
-
-<html>
-<head>
-<script src="resources/audit-util.js"></script>
-<script src="resources/audio-testing.js"></script>
-<script type="text/javascript" src="resources/mix-testing.js"></script>
-</head>
-<body>
-
-<script>
-
-function runTest() {
-    if (!window.testRunner)
-        return;
-
-    testRunner.waitUntilDone();
-
-    window.jsTestAsync = true;
-
-    // Create offline audio context
-    var sampleRate = 44100.0;
-    var context = new OfflineAudioContext(6, sampleRate * toneLengthSeconds, sampleRate);
-    var toneBuffer = createToneBuffer(context, 440, toneLengthSeconds, 2); 
-
-    var source = context.createBufferSource();
-    source.buffer = toneBuffer;
-    
-    source.connect(context.destination);
-    source.start(0);
-    
-    context.oncomplete = finishAudioTest;
-    context.startRendering();    
-}
-
-runTest();
-</script>
-
-</body>
-</html>

diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
index 0f46396..a2db1a12 100644
--- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt

@@ -6280,6 +6280,7 @@
     method getRangeAt
     method modify
     method removeAllRanges
+    method removeRange
     method selectAllChildren
     method setBaseAndExtent
     method setPosition

diff --git a/third_party/WebKit/ManualTests/overflow-on-text-beside-form-element.html b/third_party/WebKit/ManualTests/overflow-on-text-beside-form-element.html
new file mode 100644
index 0000000..7bc11e1
--- /dev/null
+++ b/third_party/WebKit/ManualTests/overflow-on-text-beside-form-element.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset=utf8>
+<p>crbug.com/667245: Overflow on text beside a form element should get repainted. When clicking on the checkbox there should be no artefact's left from the black rectangle and it should stay the same size (with the bug a row of pixels at the top and bottom were getting lost).</p>
+<div id="test" style="font-size: 35px;">
+    <input type="checkbox" id="checkbox" checked=true onclick="toggle();"> â–ˆ
+</div>
+<script>
+function toggle()
+{
+    var node = document.getElementById("test");
+    node.style.color == 'rgb(255, 255, 255)' ? node.style.color = 'rgb(0, 0, 0)' : node.style.color = 'rgb(255, 255, 255)';
+}
+</script>
+

diff --git a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt
index 4e6998f..1c4eeac2 100644
--- a/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt
+++ b/third_party/WebKit/Source/bindings/IDLExtendedAttributes.txt

@@ -98,4 +98,4 @@
 URL
 Unforgeable
 Unscopable
-WebModuleAPI
+WebAgentAPI

diff --git a/third_party/WebKit/Source/bindings/core/v8/ExceptionState.cpp b/third_party/WebKit/Source/bindings/core/v8/ExceptionState.cpp
index dc447ca..a446114b 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ExceptionState.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ExceptionState.cpp

@@ -37,6 +37,23 @@
 
 namespace blink {
 
+void ExceptionState::throwDOMException(ExceptionCode ec, const char* message) {
+  throwDOMException(ec, String(message));
+}
+
+void ExceptionState::throwRangeError(const char* message) {
+  throwRangeError(String(message));
+}
+
+void ExceptionState::throwSecurityError(const char* sanitizedMessage,
+                                        const char* unsanitizedMessage) {
+  throwSecurityError(String(sanitizedMessage), String(unsanitizedMessage));
+}
+
+void ExceptionState::throwTypeError(const char* message) {
+  throwTypeError(String(message));
+}
+
 void ExceptionState::throwDOMException(ExceptionCode ec,
                                        const String& message) {
   // SecurityError is thrown via ::throwSecurityError, and _careful_

diff --git a/third_party/WebKit/Source/bindings/core/v8/ExceptionState.h b/third_party/WebKit/Source/bindings/core/v8/ExceptionState.h
index fd45146..c1628c1 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ExceptionState.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ExceptionState.h

@@ -104,6 +104,12 @@
     }
   }
 
+  void throwDOMException(ExceptionCode, const char* message);
+  void throwRangeError(const char* message);
+  void throwSecurityError(const char* sanitizedMessage,
+                          const char* unsanitizedMessage = nullptr);
+  void throwTypeError(const char* message);
+
   virtual void throwDOMException(ExceptionCode, const String& message);
   virtual void throwRangeError(const String& message);
   virtual void throwSecurityError(const String& sanitizedMessage,

diff --git a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
index b400de9..0720f8d 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.cpp

@@ -37,19 +37,21 @@
 #include "bindings/core/v8/ToV8.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
+#include "bindings/core/v8/V8GCForContextDispose.h"
 #include "bindings/core/v8/V8HTMLDocument.h"
 #include "bindings/core/v8/V8HiddenValue.h"
 #include "bindings/core/v8/V8Initializer.h"
+#include "bindings/core/v8/V8PagePopupControllerBinding.h"
 #include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/core/v8/V8Window.h"
 #include "core/dom/Modulator.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/DocumentNameCollection.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/origin_trials/OriginTrialContext.h"
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ -57,6 +59,7 @@
 #include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/weborigin/SecurityOrigin.h"
+#include "v8/include/v8.h"
 #include "wtf/Assertions.h"
 
 namespace blink {
@@ -74,7 +77,36 @@
                                                        m_world->worldId());
   MainThreadDebugger::instance()->contextWillBeDestroyed(m_scriptState.get());
 
-  WindowProxy::disposeContext(behavior);
+  if (behavior == DetachGlobal) {
+    v8::Local<v8::Context> context = m_scriptState->context();
+    // Clean up state on the global proxy, which will be reused.
+    if (!m_globalProxy.isEmpty()) {
+      // TODO(yukishiino): This DCHECK failed on Canary (M57) and Dev (M56).
+      // We need to figure out why m_globalProxy != context->Global().
+      DCHECK(m_globalProxy == context->Global());
+      DCHECK_EQ(toScriptWrappable(context->Global()),
+                toScriptWrappable(
+                    context->Global()->GetPrototype().As<v8::Object>()));
+      m_globalProxy.get().SetWrapperClassId(0);
+    }
+    V8DOMWrapper::clearNativeInfo(isolate(), context->Global());
+    m_scriptState->detachGlobalObject();
+
+#if DCHECK_IS_ON()
+    didDetachGlobalProxy();
+#endif
+  }
+
+  m_scriptState->disposePerContextData();
+
+  // It's likely that disposing the context has created a lot of
+  // garbage. Notify V8 about this so it'll have a chance of cleaning
+  // it up when idle.
+  V8GCForContextDispose::instance().notifyContextDisposed(
+      frame()->isMainFrame());
+
+  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
+  m_lifecycle = Lifecycle::ContextDetached;
 }
 
 void LocalWindowProxy::initialize() {
@@ -130,12 +162,54 @@
     frame()->loader().dispatchDidClearWindowObjectInMainWorld();
 }
 
+void LocalWindowProxy::setupWindowPrototypeChain() {
+  // Associate the window wrapper object and its prototype chain with the
+  // corresponding native DOMWindow object.
+  LocalDOMWindow* window = frame()->domWindow();
+  const WrapperTypeInfo* wrapperTypeInfo = window->wrapperTypeInfo();
+  v8::Local<v8::Context> context = m_scriptState->context();
+
+  // The global proxy object.  Note this is not the global object.
+  v8::Local<v8::Object> globalProxy = context->Global();
+  CHECK(m_globalProxy == globalProxy);
+  V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window);
+  // Mark the handle to be traced by Oilpan, since the global proxy has a
+  // reference to the DOMWindow.
+  m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
+
+#if DCHECK_IS_ON()
+  didAttachGlobalProxy();
+#endif
+
+  // The global object, aka window wrapper object.
+  v8::Local<v8::Object> windowWrapper =
+      globalProxy->GetPrototype().As<v8::Object>();
+  V8DOMWrapper::setNativeInfo(isolate(), windowWrapper, wrapperTypeInfo,
+                              window);
+
+  // The prototype object of Window interface.
+  v8::Local<v8::Object> windowPrototype =
+      windowWrapper->GetPrototype().As<v8::Object>();
+  CHECK(!windowPrototype.IsEmpty());
+  V8DOMWrapper::setNativeInfo(isolate(), windowPrototype, wrapperTypeInfo,
+                              window);
+
+  // The named properties object of Window interface.
+  v8::Local<v8::Object> windowProperties =
+      windowPrototype->GetPrototype().As<v8::Object>();
+  CHECK(!windowProperties.IsEmpty());
+  V8DOMWrapper::setNativeInfo(isolate(), windowProperties, wrapperTypeInfo,
+                              window);
+
+  // TODO(keishi): Remove installPagePopupController and implement
+  // PagePopupController in another way.
+  V8PagePopupControllerBinding::installPagePopupController(context,
+                                                           windowWrapper);
+}
+
 void LocalWindowProxy::createContext() {
   // Create a new v8::Context with the window object as the global object
-  // (aka the inner global).  Reuse the global proxy object (aka the outer
-  // global) if it already exists.  See the comments in
-  // setupWindowPrototypeChain for the structure of the prototype chain of
-  // the global object.
+  // (aka the inner global). Reuse the outer global proxy if it already exists.
   v8::Local<v8::ObjectTemplate> globalTemplate =
       V8Window::domTemplate(isolate(), *m_world)->InstanceTemplate();
   CHECK(!globalTemplate.IsEmpty());

diff --git a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.h b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.h
index e92aea2..a171b73 100644
--- a/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.h
+++ b/third_party/WebKit/Source/bindings/core/v8/LocalWindowProxy.h

@@ -62,6 +62,11 @@
   // (e.g., after setting docoument.domain).
   void updateSecurityOrigin(SecurityOrigin*);
 
+  ScriptState* getScriptState() const { return m_scriptState.get(); }
+  v8::Local<v8::Context> contextIfInitialized() const {
+    return m_scriptState ? m_scriptState->context() : v8::Local<v8::Context>();
+  }
+
  private:
   LocalWindowProxy(v8::Isolate*, LocalFrame&, RefPtr<DOMWrapperWorld>);
 
@@ -74,6 +79,10 @@
   // wrapper is not yet associated with the native DOMWindow object.
   void createContext();
 
+  // Associates the window wrapper and its prototype chain with the native
+  // DOMWindow object. Also does some more Window-specific initialization.
+  void setupWindowPrototypeChain();
+
   void setSecurityToken(SecurityOrigin*);
 
   // The JavaScript wrapper for the document object is cached on the global
@@ -85,6 +94,8 @@
   void updateActivityLogger();
 
   LocalFrame* frame() const { return toLocalFrame(WindowProxy::frame()); }
+
+  RefPtr<ScriptState> m_scriptState;
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp
index 2bbdba3..fe75242a 100644
--- a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp

@@ -28,49 +28,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bindings/core/v8/WindowProxy.h"
+#include "bindings/core/v8/RemoteWindowProxy.h"
 
-#include "bindings/core/v8/ConditionalFeatures.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
-#include "bindings/core/v8/ScriptController.h"
-#include "bindings/core/v8/ToV8.h"
-#include "bindings/core/v8/V8Binding.h"
-#include "bindings/core/v8/V8DOMActivityLogger.h"
-#include "bindings/core/v8/V8Document.h"
-#include "bindings/core/v8/V8GCForContextDispose.h"
-#include "bindings/core/v8/V8HTMLCollection.h"
-#include "bindings/core/v8/V8HTMLDocument.h"
-#include "bindings/core/v8/V8HiddenValue.h"
-#include "bindings/core/v8/V8Initializer.h"
-#include "bindings/core/v8/V8ObjectConstructor.h"
-#include "bindings/core/v8/V8PagePopupControllerBinding.h"
-#include "bindings/core/v8/V8PrivateProperty.h"
+#include "bindings/core/v8/V8DOMWrapper.h"
 #include "bindings/core/v8/V8Window.h"
-#include "core/frame/LocalFrame.h"
-#include "core/frame/csp/ContentSecurityPolicy.h"
-#include "core/html/DocumentNameCollection.h"
-#include "core/html/HTMLCollection.h"
-#include "core/html/HTMLIFrameElement.h"
-#include "core/inspector/InspectorInstrumentation.h"
-#include "core/inspector/MainThreadDebugger.h"
-#include "core/loader/DocumentLoader.h"
-#include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
-#include "core/origin_trials/OriginTrialContext.h"
 #include "platform/Histogram.h"
-#include "platform/RuntimeEnabledFeatures.h"
-#include "platform/ScriptForbiddenScope.h"
-#include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
-#include "platform/weborigin/SecurityOrigin.h"
-#include "public/platform/Platform.h"
+#include "v8/include/v8.h"
 #include "wtf/Assertions.h"
-#include "wtf/StringExtras.h"
-#include "wtf/text/CString.h"
-#include <algorithm>
-#include <utility>
-#include <v8-debug.h>
-#include <v8.h>
 
 namespace blink {
 
@@ -83,7 +49,16 @@
   if (m_lifecycle != Lifecycle::ContextInitialized)
     return;
 
-  WindowProxy::disposeContext(behavior);
+  if (behavior == DetachGlobal && !m_globalProxy.isEmpty()) {
+    m_globalProxy.get().SetWrapperClassId(0);
+    V8DOMWrapper::clearNativeInfo(isolate(), m_globalProxy.newLocal(isolate()));
+#if DCHECK_IS_ON()
+    didDetachGlobalProxy();
+#endif
+  }
+
+  DCHECK_EQ(Lifecycle::ContextInitialized, m_lifecycle);
+  m_lifecycle = Lifecycle::ContextDetached;
 }
 
 void RemoteWindowProxy::initialize() {
@@ -93,23 +68,11 @@
       frame()->isMainFrame() ? "Blink.Binding.InitializeMainWindowProxy"
                              : "Blink.Binding.InitializeNonMainWindowProxy");
 
-  ScriptForbiddenScope::AllowUserAgentScript allowScript;
-
   v8::HandleScope handleScope(isolate());
 
   createContext();
 
-  ScriptState::Scope scope(m_scriptState.get());
-  v8::Local<v8::Context> context = m_scriptState->context();
-  if (m_globalProxy.isEmpty()) {
-    m_globalProxy.set(isolate(), context->Global());
-    CHECK(!m_globalProxy.isEmpty());
-  }
-
   setupWindowPrototypeChain();
-
-  // Remote frames always require a full canAccess() check.
-  context->UseDefaultSecurityToken();
 }
 
 void RemoteWindowProxy::createContext() {
@@ -122,22 +85,41 @@
       V8Window::domTemplate(isolate(), *m_world)->InstanceTemplate();
   CHECK(!globalTemplate.IsEmpty());
 
-  v8::Local<v8::Context> context;
-  {
-    V8PerIsolateData::UseCounterDisabledScope useCounterDisabled(
-        V8PerIsolateData::from(isolate()));
-    context = v8::Context::New(isolate(), nullptr, globalTemplate,
-                               m_globalProxy.newLocal(isolate()));
-  }
-  CHECK(!context.IsEmpty());
-
-  m_scriptState = ScriptState::create(context, m_world);
+  v8::Local<v8::Object> globalProxy =
+      v8::Context::NewRemoteContext(isolate(), globalTemplate,
+                                    m_globalProxy.newLocal(isolate()))
+          .ToLocalChecked();
+  if (m_globalProxy.isEmpty())
+    m_globalProxy.set(isolate(), globalProxy);
+  else
+    DCHECK(m_globalProxy.get() == globalProxy);
+  CHECK(!m_globalProxy.isEmpty());
 
   // TODO(haraken): Currently we cannot enable the following DCHECK because
   // an already detached window proxy can be re-initialized. This is wrong.
   // DCHECK(m_lifecycle == Lifecycle::ContextUninitialized);
   m_lifecycle = Lifecycle::ContextInitialized;
-  DCHECK(m_scriptState->contextIsValid());
+}
+
+void RemoteWindowProxy::setupWindowPrototypeChain() {
+  DOMWindow* window = frame()->domWindow();
+  const WrapperTypeInfo* wrapperTypeInfo = window->wrapperTypeInfo();
+  // The global proxy object.  Note this is not the global object.
+  v8::Local<v8::Object> globalProxy = m_globalProxy.newLocal(isolate());
+  V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window);
+  // Mark the handle to be traced by Oilpan, since the global proxy has a
+  // reference to the DOMWindow.
+  m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
+
+#if DCHECK_IS_ON()
+  didAttachGlobalProxy();
+#endif
+
+  // The global object, aka window wrapper object.
+  v8::Local<v8::Object> windowWrapper =
+      globalProxy->GetPrototype().As<v8::Object>();
+  V8DOMWrapper::setNativeInfo(isolate(), windowWrapper, wrapperTypeInfo,
+                              window);
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.h b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.h
index d85780f..ad85a74 100644
--- a/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.h
+++ b/third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.h

@@ -31,9 +31,10 @@
 #ifndef RemoteWindowProxy_h
 #define RemoteWindowProxy_h
 
-#include "bindings/core/v8/DOMWrapperWorld.h"
-#include "core/frame/RemoteFrame.h"
 #include <v8.h>
+#include "bindings/core/v8/DOMWrapperWorld.h"
+#include "bindings/core/v8/WindowProxy.h"
+#include "core/frame/RemoteFrame.h"
 
 namespace blink {
 
@@ -42,7 +43,6 @@
  public:
   static RemoteWindowProxy* create(v8::Isolate* isolate,
                                    RemoteFrame& frame,
-
                                    RefPtr<DOMWrapperWorld> world) {
     return new RemoteWindowProxy(isolate, frame, std::move(world));
   }
@@ -58,6 +58,8 @@
   // prototype chain do not get fully initialized yet, e.g. the window
   // wrapper is not yet associated with the native DOMWindow object.
   void createContext();
+
+  void setupWindowPrototypeChain();
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
index e6a135ae..3dcd2b0 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp

@@ -48,6 +48,7 @@
 #include "core/events/Event.h"
 #include "core/events/EventListener.h"
 #include "core/frame/LocalDOMWindow.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
@@ -58,7 +59,6 @@
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/plugins/PluginView.h"

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
index 4dcdb81..561d28e3 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptState.cpp

@@ -36,8 +36,7 @@
     : m_isolate(context->GetIsolate()),
       m_context(m_isolate, context),
       m_world(world),
-      m_perContextData(V8PerContextData::create(context))
-{
+      m_perContextData(V8PerContextData::create(context)) {
   DCHECK(m_world);
   m_context.setWeak(this, &contextCollectedCallback);
   context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this);
@@ -51,9 +50,6 @@
 void ScriptState::detachGlobalObject() {
   ASSERT(!m_context.isEmpty());
   context()->DetachGlobal();
-#if DCHECK_IS_ON()
-  m_globalObjectDetached = true;
-#endif
 }
 
 void ScriptState::disposePerContextData() {

diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptState.h b/third_party/WebKit/Source/bindings/core/v8/ScriptState.h
index 4d8d0fe..e3fe7dd6 100644
--- a/third_party/WebKit/Source/bindings/core/v8/ScriptState.h
+++ b/third_party/WebKit/Source/bindings/core/v8/ScriptState.h

@@ -155,9 +155,6 @@
   }
   void detachGlobalObject();
   void clearContext() { return m_context.clear(); }
-#if DCHECK_IS_ON()
-  bool isGlobalObjectDetached() const { return m_globalObjectDetached; }
-#endif
 
   V8PerContextData* perContextData() const { return m_perContextData.get(); }
   void disposePerContextData();
@@ -183,10 +180,6 @@
   // disposePerContextData() once you no longer need V8PerContextData.
   // Otherwise, the v8::Context will leak.
   std::unique_ptr<V8PerContextData> m_perContextData;
-
-#if DCHECK_IS_ON()
-  bool m_globalObjectDetached = false;
-#endif
 };
 
 // ScriptStateProtectingContext keeps the context associated with the

diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
index b247d2c..a75fca0 100644
--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.cpp

@@ -112,7 +112,14 @@
     : m_externallyAllocatedMemory(0) {}
 
 SerializedScriptValue::SerializedScriptValue(const String& wireData)
-    : m_dataString(wireData.isolatedCopy()), m_externallyAllocatedMemory(0) {}
+    : m_externallyAllocatedMemory(0) {
+  size_t byteLength = wireData.length() * 2;
+  m_dataBuffer.reset(static_cast<uint8_t*>(WTF::Partitions::bufferMalloc(
+      byteLength, "SerializedScriptValue buffer")));
+  m_dataBufferSize = byteLength;
+  wireData.copyTo(reinterpret_cast<UChar*>(m_dataBuffer.get()), 0,
+                  wireData.length());
+}
 
 SerializedScriptValue::~SerializedScriptValue() {
   // If the allocated memory was not registered before, then this class is
@@ -132,9 +139,6 @@
 }
 
 String SerializedScriptValue::toWireString() const {
-  if (!m_dataString.isNull())
-    return m_dataString;
-
   // Add the padding '\0', but don't put it in |m_dataBuffer|.
   // This requires direct use of uninitialized strings, though.
   UChar* destination;
@@ -151,36 +155,18 @@
 void SerializedScriptValue::toWireBytes(Vector<char>& result) const {
   DCHECK(result.isEmpty());
 
-  if (m_dataString.isNull()) {
-    size_t wireSizeBytes = (m_dataBufferSize + 1) & ~1;
-    result.resize(wireSizeBytes);
+  size_t wireSizeBytes = (m_dataBufferSize + 1) & ~1;
+  result.resize(wireSizeBytes);
 
-    const UChar* src = reinterpret_cast<UChar*>(m_dataBuffer.get());
-    UChar* dst = reinterpret_cast<UChar*>(result.data());
-    for (size_t i = 0; i < m_dataBufferSize / 2; i++)
-      dst[i] = htons(src[i]);
-
-    // This is equivalent to swapping the byte order of the two bytes (x, 0),
-    // depending on endianness.
-    if (m_dataBufferSize % 2)
-      dst[wireSizeBytes / 2 - 1] = m_dataBuffer[m_dataBufferSize - 1] << 8;
-
-    return;
-  }
-
-  size_t length = m_dataString.length();
-  result.resize(length * sizeof(UChar));
+  const UChar* src = reinterpret_cast<UChar*>(m_dataBuffer.get());
   UChar* dst = reinterpret_cast<UChar*>(result.data());
+  for (size_t i = 0; i < m_dataBufferSize / 2; i++)
+    dst[i] = htons(src[i]);
 
-  if (m_dataString.is8Bit()) {
-    const LChar* src = m_dataString.characters8();
-    for (size_t i = 0; i < length; i++)
-      dst[i] = htons(static_cast<UChar>(src[i]));
-  } else {
-    const UChar* src = m_dataString.characters16();
-    for (size_t i = 0; i < length; i++)
-      dst[i] = htons(src[i]);
-  }
+  // This is equivalent to swapping the byte order of the two bytes (x, 0),
+  // depending on endianness.
+  if (m_dataBufferSize % 2)
+    dst[wireSizeBytes / 2 - 1] = m_dataBuffer[m_dataBufferSize - 1] << 8;
 }
 
 static void accumulateArrayBuffersForAllWorlds(

diff --git a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.h b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.h
index 7799d5bd..903256d 100644
--- a/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.h
+++ b/third_party/WebKit/Source/bindings/core/v8/SerializedScriptValue.h

@@ -134,27 +134,8 @@
   // The memory registration is revoked automatically in destructor.
   void registerMemoryAllocatedWithCurrentScriptContext();
 
-  // Provides access to the data and its attributes, regardless of whether the
-  // data was created as a string or as a vector.
-  // TODO(jbroman): Remove the 16-bit string representation, and simplify.
-  const uint8_t* data() {
-    if (!m_dataString.isNull()) {
-      DCHECK(!m_dataBuffer);
-      m_dataString.ensure16Bit();
-      return reinterpret_cast<const uint8_t*>(m_dataString.characters16());
-    }
-    return m_dataBuffer.get();
-  }
-  size_t dataLengthInBytes() const {
-    if (!m_dataString.isNull())
-      return m_dataString.length() * 2;
-    return m_dataBufferSize;
-  }
-  bool dataHasOneRef() const {
-    if (!m_dataString.isNull())
-      return m_dataString.impl()->hasOneRef();
-    return true;
-  }
+  const uint8_t* data() const { return m_dataBuffer.get(); }
+  size_t dataLengthInBytes() const { return m_dataBufferSize; }
 
   BlobDataHandleMap& blobDataHandles() { return m_blobDataHandles; }
   ArrayBufferContentsArray* getArrayBufferContentsArray() {
@@ -176,13 +157,7 @@
   SerializedScriptValue();
   explicit SerializedScriptValue(const String& wireData);
 
-  void setData(const String& data) {
-    m_dataString = data;
-    m_dataBuffer.reset();
-    m_dataBufferSize = 0;
-  }
   void setData(DataBufferPtr data, size_t size) {
-    m_dataString = String();
     m_dataBuffer = std::move(data);
     m_dataBufferSize = size;
   }
@@ -197,14 +172,6 @@
                                const OffscreenCanvasArray&,
                                ExceptionState&);
 
-  // Either:
-  // - |m_dataString| is non-null, and contains the data as a WTF::String which,
-  //   when made 16-bit, is the serialized data (padded to a two-byte boundary),
-  // or
-  // - |m_dataBuffer| is non-null, and |m_dataBufferSize| contains its size;
-  //   unlike |m_dataString|, that size is not guaranteed to be padded to a
-  //   two-byte boundary
-  String m_dataString;
   DataBufferPtr m_dataBuffer;
   size_t m_dataBufferSize = 0;
 

diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
index 11fa5cec..0ccf6f2 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.cpp

@@ -54,10 +54,10 @@
 #include "core/dom/QualifiedName.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkletGlobalScope.h"
 #include "core/xml/XPathNSResolver.h"
@@ -770,18 +770,6 @@
   return toExecutionContext(isolate->GetCurrentContext());
 }
 
-ExecutionContext* enteredExecutionContext(v8::Isolate* isolate) {
-  ExecutionContext* context = toExecutionContext(isolate->GetEnteredContext());
-  if (!context) {
-    // We don't always have an entered execution context, for example during
-    // microtask callbacks from V8 (where the entered context may be the
-    // DOM-in-JS context). In that case, we fall back to the current context.
-    context = currentExecutionContext(isolate);
-    ASSERT(context);
-  }
-  return context;
-}
-
 Frame* toFrameIfNotDetached(v8::Local<v8::Context> context) {
   DOMWindow* window = toDOMWindow(context);
   if (window && window->isCurrentlyDisplayedInFrame())
@@ -823,7 +811,7 @@
   return v8::Local<v8::Context>();
 }
 
-v8::Local<v8::Context> toV8Context(Frame* frame, DOMWrapperWorld& world) {
+v8::Local<v8::Context> toV8Context(LocalFrame* frame, DOMWrapperWorld& world) {
   if (!frame)
     return v8::Local<v8::Context>();
   v8::Local<v8::Context> context = toV8ContextEvenIfDetached(frame, world);
@@ -837,10 +825,10 @@
   return v8::Local<v8::Context>();
 }
 
-v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame* frame,
+v8::Local<v8::Context> toV8ContextEvenIfDetached(LocalFrame* frame,
                                                  DOMWrapperWorld& world) {
   ASSERT(frame);
-  return frame->windowProxy(world)->contextIfInitialized();
+  return frame->script().windowProxy(world)->contextIfInitialized();
 }
 
 bool isValidEnum(const String& value,

diff --git a/third_party/WebKit/Source/bindings/core/v8/V8Binding.h b/third_party/WebKit/Source/bindings/core/v8/V8Binding.h
index 37f5a54..58a6019 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8Binding.h
+++ b/third_party/WebKit/Source/bindings/core/v8/V8Binding.h

@@ -976,7 +976,6 @@
 CORE_EXPORT void registerToExecutionContextForModules(
     ExecutionContext* (*toExecutionContextForModules)(v8::Local<v8::Context>));
 CORE_EXPORT ExecutionContext* currentExecutionContext(v8::Isolate*);
-CORE_EXPORT ExecutionContext* enteredExecutionContext(v8::Isolate*);
 
 // Returns a V8 context associated with a ExecutionContext and a
 // DOMWrapperWorld.  This method returns an empty context if there is no frame
@@ -985,10 +984,10 @@
                                                DOMWrapperWorld&);
 // Returns a V8 context associated with a Frame and a DOMWrapperWorld.
 // This method returns an empty context if the frame is already detached.
-CORE_EXPORT v8::Local<v8::Context> toV8Context(Frame*, DOMWrapperWorld&);
+CORE_EXPORT v8::Local<v8::Context> toV8Context(LocalFrame*, DOMWrapperWorld&);
 // Like toV8Context but also returns the context if the frame is already
 // detached.
-CORE_EXPORT v8::Local<v8::Context> toV8ContextEvenIfDetached(Frame*,
+CORE_EXPORT v8::Local<v8::Context> toV8ContextEvenIfDetached(LocalFrame*,
                                                              DOMWrapperWorld&);
 
 // Returns the frame object of the window object associated with

diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
index b750f26..562b977c 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

@@ -30,11 +30,7 @@
 
 #include "bindings/core/v8/WindowProxy.h"
 
-#include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMWrapper.h"
-#include "bindings/core/v8/V8GCForContextDispose.h"
-#include "bindings/core/v8/V8PagePopupControllerBinding.h"
-#include "core/frame/DOMWindow.h"
 #include "core/frame/Frame.h"
 #include "wtf/Assertions.h"
 #include <utility>
@@ -61,37 +57,6 @@
       m_world(std::move(world)),
       m_lifecycle(Lifecycle::ContextUninitialized) {}
 
-void WindowProxy::disposeContext(GlobalDetachmentBehavior behavior) {
-  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
-
-  if (behavior == DetachGlobal) {
-    v8::Local<v8::Context> context = m_scriptState->context();
-    // Clean up state on the global proxy, which will be reused.
-    if (!m_globalProxy.isEmpty()) {
-      // TODO(yukishiino): This DCHECK failed on Canary (M57) and Dev (M56).
-      // We need to figure out why m_globalProxy != context->Global().
-      DCHECK(m_globalProxy == context->Global());
-      DCHECK_EQ(toScriptWrappable(context->Global()),
-                toScriptWrappable(
-                    context->Global()->GetPrototype().As<v8::Object>()));
-      m_globalProxy.get().SetWrapperClassId(0);
-    }
-    V8DOMWrapper::clearNativeInfo(m_isolate, context->Global());
-    m_scriptState->detachGlobalObject();
-  }
-
-  m_scriptState->disposePerContextData();
-
-  // It's likely that disposing the context has created a lot of
-  // garbage. Notify V8 about this so it'll have a chance of cleaning
-  // it up when idle.
-  V8GCForContextDispose::instance().notifyContextDisposed(
-      m_frame->isMainFrame());
-
-  DCHECK(m_lifecycle == Lifecycle::ContextInitialized);
-  m_lifecycle = Lifecycle::ContextDetached;
-}
-
 void WindowProxy::clearForClose() {
   disposeContext(DoNotDetachGlobal);
 }
@@ -101,20 +66,15 @@
 }
 
 v8::Local<v8::Object> WindowProxy::globalIfNotDetached() {
-  if (m_lifecycle == Lifecycle::ContextInitialized) {
-    DCHECK(m_scriptState->contextIsValid());
-    DCHECK(m_globalProxy == m_scriptState->context()->Global());
+  if (m_lifecycle == Lifecycle::ContextInitialized)
     return m_globalProxy.newLocal(m_isolate);
-  }
   return v8::Local<v8::Object>();
 }
 
 v8::Local<v8::Object> WindowProxy::releaseGlobal() {
   DCHECK(m_lifecycle != Lifecycle::ContextInitialized);
-  // Make sure the global object was detached from the proxy by calling
-  // clearForNavigation().
-  if (m_lifecycle == Lifecycle::ContextDetached)
-    ASSERT(m_scriptState->isGlobalObjectDetached());
+  DLOG_IF(FATAL, m_isGlobalProxyAttached)
+      << "Context not detached by calling clearForNavigation()";
 
   v8::Local<v8::Object> global = m_globalProxy.newLocal(m_isolate);
   m_globalProxy.clear();
@@ -176,71 +136,4 @@
   }
 }
 
-void WindowProxy::setupWindowPrototypeChain() {
-  // Associate the window wrapper object and its prototype chain with the
-  // corresponding native DOMWindow object.
-  // The full structure of the global object's prototype chain is as follows:
-  //
-  // global proxy object [1]
-  //   -- has prototype --> global object (window wrapper object) [2]
-  //   -- has prototype --> Window.prototype
-  //   -- has prototype --> WindowProperties [3]
-  //   -- has prototype --> EventTarget.prototype
-  //   -- has prototype --> Object.prototype
-  //   -- has prototype --> null
-  //
-  // [1] Global proxy object is as known as "outer global object".  It's an
-  //   empty object and remains after navigation.  When navigated, points to
-  //   a different global object as the prototype object.
-  // [2] Global object is as known as "inner global object" or "window wrapper
-  //   object".  The prototype chain between global proxy object and global
-  //   object is NOT observable from user JavaScript code.  All other
-  //   prototype chains are observable.  Global proxy object and global object
-  //   together appear to be the same single JavaScript object.  See also:
-  //     https://wiki.mozilla.org/Gecko:SplitWindow
-  //   global object (= window wrapper object) provides most of Window's DOM
-  //   attributes and operations.  Also global variables defined by user
-  //   JavaScript are placed on this object.  When navigated, a new global
-  //   object is created together with a new v8::Context, but the global proxy
-  //   object doesn't change.
-  // [3] WindowProperties is a named properties object of Window interface.
-
-  DOMWindow* window = m_frame->domWindow();
-  const WrapperTypeInfo* wrapperTypeInfo = window->wrapperTypeInfo();
-  v8::Local<v8::Context> context = m_scriptState->context();
-
-  // The global proxy object.  Note this is not the global object.
-  v8::Local<v8::Object> globalProxy = context->Global();
-  CHECK(m_globalProxy == globalProxy);
-  V8DOMWrapper::setNativeInfo(m_isolate, globalProxy, wrapperTypeInfo, window);
-  // Mark the handle to be traced by Oilpan, since the global proxy has a
-  // reference to the DOMWindow.
-  m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
-
-  // The global object, aka window wrapper object.
-  v8::Local<v8::Object> windowWrapper =
-      globalProxy->GetPrototype().As<v8::Object>();
-  windowWrapper = V8DOMWrapper::associateObjectWithWrapper(
-      m_isolate, window, wrapperTypeInfo, windowWrapper);
-
-  // The prototype object of Window interface.
-  v8::Local<v8::Object> windowPrototype =
-      windowWrapper->GetPrototype().As<v8::Object>();
-  CHECK(!windowPrototype.IsEmpty());
-  V8DOMWrapper::setNativeInfo(m_isolate, windowPrototype, wrapperTypeInfo,
-                              window);
-
-  // The named properties object of Window interface.
-  v8::Local<v8::Object> windowProperties =
-      windowPrototype->GetPrototype().As<v8::Object>();
-  CHECK(!windowProperties.IsEmpty());
-  V8DOMWrapper::setNativeInfo(m_isolate, windowProperties, wrapperTypeInfo,
-                              window);
-
-  // TODO(keishi): Remove installPagePopupController and implement
-  // PagePopupController in another way.
-  V8PagePopupControllerBinding::installPagePopupController(context,
-                                                           windowWrapper);
-}
-
 }  // namespace blink

diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.h b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.h
index 9089f01..294d7eb 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxy.h
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxy.h

@@ -31,35 +31,125 @@
 #ifndef WindowProxy_h
 #define WindowProxy_h
 
+#include <v8.h>
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ScopedPersistent.h"
-#include "bindings/core/v8/ScriptState.h"
+#include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
 #include "wtf/RefPtr.h"
-#include <v8.h>
 
 namespace blink {
 
 class Frame;
-class ScriptController;
 
-// WindowProxy represents all the per-global object state for a Frame that
-// persist between navigations.
+// WindowProxy implements the split window model of a window for a frame. In the
+// HTML standard, the split window model is composed of the Window interface
+// (the inner global object) and the WindowProxy interface (the outer global
+// proxy).
+//
+// The Window interface is backed by the Blink DOMWindow C++ implementation.
+// In contrast, the WindowProxy interface does not have a corresponding
+// C++ implementation in Blink: the WindowProxy class defined here only manages
+// context initialization and detach. Instead, the behavior of the WindowProxy
+// interface is defined by JSGlobalProxy in v8 and the prototype chain set up
+// during context initialization.
+//
+// ====== Inner Global Object ======
+// The inner global object is the global for the script environment of a Frame.
+// Since Window and Document also have a 1:1 relationship, this means that each
+// inner global object has an associated Document which does not change. On
+// navigation, the new Document receives a new inner global object.
+//
+// However, there is one exception to the 1:1 DOMWindow:Document rule. If:
+// - the previous Document is the initial empty document
+// - the new Document is same-origin to the previous Document
+// then the inner global object will be reused for the new Document. This is the
+// only case where the associated Document of an inner global object can change.
+//
+// All methods and attributes defined on the Window interface are exposed via
+// the inner global object. Global variables defined by script running in the
+// Document also live on the inner global object.
+//
+// ====== Outer Global Proxy ====
+// The outer global proxy is reused across navigations. It implements the
+// security checks for same-origin/cross-origin access to the Window interface.
+// When the check passes (i.e. the access is same-origin), the access is
+// forwarded to the inner global object of the active Document in this
+// WindowProxy's Frame).
+//
+// When the security check fails, the access is delegated to the outer global
+// proxy's cross-origin interceptors. The cross-origin interceptors may choose
+// to return a value (if the property is exposed cross-origin) or throw an
+// exception otherwise.
+//
+// Note that the cross-origin interceptors are only used for cross-origin
+// accesses: a same-origin access to a method that is available cross-origin,
+// such as Window.postMessage, will be delegated to the inner global object.
+//
+// ====== LocalWindowProxy vs RemoteWindowProxy ======
+// WindowProxy has two concrete subclasses:
+// - LocalWindowProxy: implements the split window model for a frame in the same
+//   process, i.e. a LocalFrame.
+// - RemoteWindowProxy: implements the split window model for a frame in a
+//   different process, i.e. a RemoteFrame.
+//
+// While having a RemoteFrame implies the frame must be cross-origin, the
+// opposite is not true: a LocalFrame can be same-origin or cross-origin. One
+// additional complexity (which slightly violates the HTML standard): it is
+// possible to have SecurityOrigin::canAccess() return true for a RemoteFrame's
+// security origin; however, it is important to still deny access as if the
+// frame were cross-origin. This is due to complexities in the process
+// allocation model for renderer processes. See https://crbug.com/601629.
+//
+// ====== LocalWindowProxy ======
+// Since a LocalWindowProxy can represent a same-origin or cross-origin frame,
+// the entire prototype chain must be available:
+//
+//   outer global proxy
+//     -- has prototype --> inner global object
+//     -- has prototype --> Window.prototype
+//     -- has prototype --> WindowProperties [1]
+//     -- has prototype --> EventTarget.prototype
+//     -- has prototype --> Object.prototype
+//     -- has prototype --> null
+//
+// [1] WindowProperties is the named properties object of the Window interface.
+//
+// ====== RemoteWindowProxy ======
+// Since a RemoteWindowProxy only represents a cross-origin frame, it has a much
+// simpler prototype chain.
+//
+//   outer global proxy
+//     -- has prototype --> inner global object
+//     -- has prototype --> null
+//
+// Property access to get/set attributes and methods on the outer global proxy
+// are redirected through the cross-origin interceptors, since any access will
+// fail the security check, by definition.
+//
+// However, note that method invocations still use the inner global object as
+// the receiver object. Blink bindings use v8::Signature to perform a strict
+// receiver check, which requires that the FunctionTemplate used to instantiate
+// the receiver object matches exactly. However, when creating a new context,
+// only inner global object is instantiated using Blink's global template, so by
+// definition, it is the only receiver object in the prototype chain that will
+// match.
+//
+// ====== References ======
+// https://wiki.mozilla.org/Gecko:SplitWindow
+// https://whatwg.org/C/browsers.html#the-windowproxy-exotic-object
 class WindowProxy : public GarbageCollectedFinalized<WindowProxy> {
  public:
   virtual ~WindowProxy();
 
   DECLARE_TRACE();
 
-  v8::Local<v8::Context> contextIfInitialized() const {
-    return m_scriptState ? m_scriptState->context() : v8::Local<v8::Context>();
-  }
   void initializeIfNeeded();
 
   void clearForClose();
   void clearForNavigation();
 
-  v8::Local<v8::Object> globalIfNotDetached();
+  CORE_EXPORT v8::Local<v8::Object> globalIfNotDetached();
   v8::Local<v8::Object> releaseGlobal();
   void setGlobal(v8::Local<v8::Object>);
 
@@ -68,10 +158,6 @@
   DOMWrapperWorld& world() { return *m_world; }
 
  protected:
-  // TODO(dcheng): Remove this friend declaration once LocalWindowProxyManager
-  // and ScriptController are merged.
-  friend class ScriptController;
-
   // A valid transition is from ContextUninitialized to ContextInitialized,
   // and then ContextDetached. Other transitions are forbidden.
   enum class Lifecycle {
@@ -85,24 +171,24 @@
   virtual void initialize() = 0;
 
   enum GlobalDetachmentBehavior { DoNotDetachGlobal, DetachGlobal };
-  virtual void disposeContext(GlobalDetachmentBehavior);
-
-  // Associates the window wrapper and its prototype chain with the native
-  // DOMWindow object.  Also does some more Window-specific initialization.
-  void setupWindowPrototypeChain();
+  virtual void disposeContext(GlobalDetachmentBehavior) = 0;
 
   v8::Isolate* isolate() const { return m_isolate; }
   Frame* frame() const { return m_frame.get(); }
-  ScriptState* getScriptState() const { return m_scriptState.get(); }
+
+#if DCHECK_IS_ON()
+  void didAttachGlobalProxy() { m_isGlobalProxyAttached = true; }
+  void didDetachGlobalProxy() { m_isGlobalProxyAttached = false; }
+#endif
 
  private:
   v8::Isolate* const m_isolate;
   const Member<Frame> m_frame;
+#if DCHECK_IS_ON()
+  bool m_isGlobalProxyAttached = false;
+#endif
 
  protected:
-  // TODO(dcheng): Move this to LocalWindowProxy once RemoteWindowProxy uses
-  // remote contexts.
-  RefPtr<ScriptState> m_scriptState;
   // TODO(dcheng): Consider making these private and using getters.
   const RefPtr<DOMWrapperWorld> m_world;
   ScopedPersistent<v8::Object> m_globalProxy;

diff --git a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
index a70c384d..44adedc 100644
--- a/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h
+++ b/third_party/WebKit/Source/bindings/core/v8/WindowProxyManager.h

@@ -54,10 +54,9 @@
 
 template <typename FrameType, typename ProxyType>
 class WindowProxyManagerImplHelper : public WindowProxyManagerBase {
- private:
+ protected:
   using Base = WindowProxyManagerBase;
 
- public:
   FrameType* frame() const { return static_cast<FrameType*>(Base::frame()); }
   ProxyType* mainWorldProxy() const {
     return static_cast<ProxyType*>(Base::mainWorldProxy());
@@ -66,7 +65,6 @@
     return static_cast<ProxyType*>(Base::windowProxy(world));
   }
 
- protected:
   explicit WindowProxyManagerImplHelper(Frame& frame)
       : WindowProxyManagerBase(frame) {}
 };
@@ -98,6 +96,10 @@
   }
 
  private:
+  // TODO(dcheng): Ideally, remove this friend declaration once WindowProxy
+  // initialization details are better encapsulated.
+  friend class RemoteFrame;
+
   explicit RemoteWindowProxyManager(RemoteFrame& frame)
       : WindowProxyManagerImplHelper<RemoteFrame, RemoteWindowProxy>(frame) {}
 };

diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8PerformanceObserverCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8PerformanceObserverCustom.cpp
index af8bf56..36196ace 100644
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8PerformanceObserverCustom.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8PerformanceObserverCustom.cpp

@@ -11,6 +11,7 @@
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8Performance.h"
 #include "bindings/core/v8/V8PrivateProperty.h"
+#include "core/frame/LocalDOMWindow.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/PerformanceObserver.h"
 
@@ -30,7 +31,8 @@
   v8::Local<v8::Object> wrapper = info.Holder();
 
   Performance* performance = nullptr;
-  DOMWindow* window = toDOMWindow(wrapper->CreationContext());
+  LocalDOMWindow* window =
+      toLocalDOMWindow(toDOMWindow(wrapper->CreationContext()));
   if (!window) {
     V8ThrowException::throwTypeError(
         info.GetIsolate(),

diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
index feb1196c..c9bcc047 100644
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp

@@ -51,6 +51,7 @@
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Location.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
@@ -60,7 +61,6 @@
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "platform/LayoutTestSupport.h"
 #include "wtf/Assertions.h"
 

diff --git a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
index 44b9806b2..e2f8ad95 100644
--- a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueDeserializer.cpp

@@ -23,6 +23,34 @@
 
 namespace blink {
 
+namespace {
+
+// The "Blink-side" serialization version, which defines how Blink will behave
+// during the serialization process. The serialization format has two
+// "envelopes": an outer one controlled by Blink and an inner one by V8.
+//
+// They are formatted as follows:
+// [version tag] [Blink version] [version tag] [v8 version] ...
+//
+// Before version 16, there was only a single envelope and the version number
+// for both parts was always equal.
+//
+// See also V8ScriptValueDeserializer.cpp.
+const uint32_t kMinVersionForSeparateEnvelope = 16;
+
+// Check whether the data has a separate Blink envelope.
+// This works even when the version becomes two bytes, because every
+// "continuation byte" in varint encoding is at least 0x80, which is larger than
+// kMinVersionForSeparateEnveloped.
+bool hasSeparateEnvelope(SerializedScriptValue* serializedScriptValue) {
+  const uint8_t* rawData = serializedScriptValue->data();
+  const size_t length = serializedScriptValue->dataLengthInBytes();
+  return length >= 2 && rawData[0] == VersionTag &&
+         rawData[1] >= kMinVersionForSeparateEnvelope;
+}
+
+}  // namespace
+
 V8ScriptValueDeserializer::V8ScriptValueDeserializer(
     RefPtr<ScriptState> scriptState,
     RefPtr<SerializedScriptValue> serializedScriptValue)
@@ -46,11 +74,23 @@
   v8::TryCatch tryCatch(isolate);
   v8::Local<v8::Context> context = m_scriptState->context();
 
+  if (hasSeparateEnvelope(m_serializedScriptValue.get())) {
+    SerializationTag expectedVersionTag;
+    if (!readTag(&expectedVersionTag) || !readUint32(&m_version))
+      return v8::Null(isolate);
+    DCHECK_EQ(expectedVersionTag, VersionTag);
+    DCHECK_GE(m_version, kMinVersionForSeparateEnvelope);
+  }
+
   bool readHeader;
   if (!m_deserializer.ReadHeader(context).To(&readHeader))
     return v8::Null(isolate);
   DCHECK(readHeader);
-  m_version = m_deserializer.GetWireFormatVersion();
+
+  // If there was no Blink envelope earlier, Blink shares the wire format
+  // version from the V8 header.
+  if (!m_version)
+    m_version = m_deserializer.GetWireFormatVersion();
 
   // Prepare to transfer the provided transferables.
   transfer();

diff --git a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializer.cpp b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializer.cpp
index 377090f..e652f77 100644
--- a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializer.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializer.cpp

@@ -25,6 +25,23 @@
 
 namespace blink {
 
+// The "Blink-side" serialization version, which defines how Blink will behave
+// during the serialization process. The serialization format has two
+// "envelopes": an outer one controlled by Blink and an inner one by V8.
+//
+// They are formatted as follows:
+// [version tag] [Blink version] [version tag] [v8 version] ...
+//
+// Before version 16, there was only a single envelope and the version number
+// for both parts was always equal.
+//
+// See also V8ScriptValueDeserializer.cpp.
+//
+// This version number must be incremented whenever any incompatible changes are
+// made to how Blink writes data. Purely V8-side changes do not require an
+// adjustment to this value.
+static const uint32_t kLatestVersion = 16;
+
 V8ScriptValueSerializer::V8ScriptValueSerializer(
     RefPtr<ScriptState> scriptState)
     : m_scriptState(std::move(scriptState)),
@@ -48,9 +65,13 @@
   if (exceptionState.hadException())
     return nullptr;
 
+  // Write out the file header.
+  writeTag(VersionTag);
+  writeUint32(kLatestVersion);
+  m_serializer.WriteHeader();
+
   // Serialize the value and handle errors.
   v8::TryCatch tryCatch(m_scriptState->isolate());
-  m_serializer.WriteHeader();
   bool wroteValue;
   if (!m_serializer.WriteValue(m_scriptState->context(), value)
            .To(&wroteValue)) {

diff --git a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializerTest.cpp b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializerTest.cpp
index 285f31b..3c40725 100644
--- a/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializerTest.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/serialization/V8ScriptValueSerializerTest.cpp

@@ -217,7 +217,7 @@
   EXPECT_EQ(200, newImageData->data()->data()[0]);
 }
 
-TEST(V8ScriptValueSerializerTest, DecodeImageData) {
+TEST(V8ScriptValueSerializerTest, DecodeImageDataV9) {
   // Backward compatibility with existing serialized ImageData objects must be
   // maintained. Add more cases if the format changes; don't remove tests for
   // old versions.
@@ -235,6 +235,21 @@
   EXPECT_EQ(200, newImageData->data()->data()[0]);
 }
 
+TEST(V8ScriptValueSerializerTest, DecodeImageDataV16) {
+  V8TestingScope scope;
+  ScriptState* scriptState = scope.getScriptState();
+  RefPtr<SerializedScriptValue> input =
+      serializedValue({0xff, 0x10, 0xff, 0x0c, 0x23, 0x02, 0x01, 0x08, 0xc8,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
+  v8::Local<v8::Value> result =
+      V8ScriptValueDeserializer(scriptState, input).deserialize();
+  ASSERT_TRUE(V8ImageData::hasInstance(result, scope.isolate()));
+  ImageData* newImageData = V8ImageData::toImpl(result.As<v8::Object>());
+  EXPECT_EQ(IntSize(2, 1), newImageData->size());
+  EXPECT_EQ(8u, newImageData->data()->length());
+  EXPECT_EQ(200, newImageData->data()->data()[0]);
+}
+
 class WebMessagePortChannelImpl final : public WebMessagePortChannel {
  public:
   // WebMessagePortChannel

diff --git a/third_party/WebKit/Source/bindings/scripts/code_generator_web_agent_api.py b/third_party/WebKit/Source/bindings/scripts/code_generator_web_agent_api.py
new file mode 100644
index 0000000..89fa5e2
--- /dev/null
+++ b/third_party/WebKit/Source/bindings/scripts/code_generator_web_agent_api.py

@@ -0,0 +1,190 @@
+# 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.
+
+# pylint: disable=import-error,print-statement,relative-import
+
+"""Generates Web Agent API bindings.
+
+The Web Agent API bindings provide a stable, IDL-generated interface for the
+Web Agents.
+
+The Web Agents are the high-level services like Autofill,
+Autocomplete, Translate, Distiller, Phishing Detector, and others. Web Agents
+typically want to introspec the document and rendering infromation to implement
+browser features.
+
+The bindings are meant to be as simple and as ephemeral as possible, mostly just
+wrapping existing DOM classes. Their primary goal is to avoid leaking the actual
+DOM classes to the Web Agents layer.
+"""
+
+import os
+import posixpath
+
+from code_generator import CodeGeneratorBase, render_template
+# TODO(dglazkov): Move TypedefResolver to code_generator.py
+from code_generator_v8 import TypedefResolver
+from name_style_converter import NameStyleConverter
+
+MODULE_PYNAME = os.path.splitext(os.path.basename(__file__))[0] + '.py'
+
+STRING_INCLUDE_PATH = 'wtf/text/WTFString.h'
+WEB_AGENT_API_IDL_ATTRIBUTE = 'WebAgentAPI'
+
+
+def interface_context(idl_interface, type_resolver):
+    builder = InterfaceContextBuilder(MODULE_PYNAME, type_resolver)
+    builder.set_class_name(idl_interface.name)
+    builder.set_inheritance(idl_interface.parent)
+
+    for idl_attribute in idl_interface.attributes:
+        builder.add_attribute(idl_attribute)
+
+    for idl_operation in idl_interface.operations:
+        builder.add_operation(idl_operation)
+
+    return builder.build()
+
+
+class TypeResolver(object):
+    """Resolves Web IDL types into corresponding C++ types and include paths
+       to the generated and existing files."""
+
+    def __init__(self, interfaces_info):
+        self.interfaces_info = interfaces_info
+
+    def includes_from_interface(self, interface_name):
+        interface_info = self.interfaces_info.get(interface_name)
+        if interface_info is None:
+            raise KeyError('Unknown interface "%s".' % interface_name)
+        return set([interface_info['include_path']])
+
+    def _includes_from_type(self, idl_type):
+        if idl_type.is_void:
+            return set()
+        if idl_type.is_primitive_type:
+            return set()
+        if idl_type.is_string_type:
+            return set([STRING_INCLUDE_PATH])
+
+        # TODO(dglazkov): Handle complex/weird types.
+        return self.includes_from_interface(idl_type.base_type)
+
+    def includes_from_definition(self, idl_definition):
+        return self._includes_from_type(idl_definition.idl_type)
+
+    def type_from_definition(self, idl_definition):
+        # TODO(dglazkov): The output of this method must be a reasonable C++
+        # type that can be used directly in the jinja2 template.
+        return idl_definition.idl_type.base_type
+
+    def base_class_includes(self):
+        return set(['platform/heap/Handle.h'])
+
+
+class InterfaceContextBuilder(object):
+    def __init__(self, code_generator, type_resolver):
+        self.result = {'code_generator': code_generator}
+        self.type_resolver = type_resolver
+
+    def set_class_name(self, class_name):
+        converter = NameStyleConverter(class_name)
+        self.result['class_name'] = converter.to_all_cases()
+        self._ensure_set('cpp_includes').update(
+            self.type_resolver.includes_from_interface(class_name))
+
+    def set_inheritance(self, base_interface):
+        if base_interface is None:
+            self._ensure_set('header_includes').update(
+                self.type_resolver.base_class_includes())
+            return
+        self.result['base_class'] = base_interface
+        self._ensure_set('header_includes').update(
+            self.type_resolver.includes_from_interface(base_interface))
+
+    def _ensure_set(self, name):
+        return self.result.setdefault(name, set())
+
+    def _ensure_list(self, name):
+        return self.result.setdefault(name, [])
+
+    def add_attribute(self, idl_attribute):
+        self._ensure_list('attributes').append(
+            self.create_attribute(idl_attribute))
+        self._ensure_set('cpp_includes').update(
+            self.type_resolver.includes_from_definition(idl_attribute))
+
+    def add_operation(self, idl_operation):
+        if not idl_operation.name:
+            return
+        self._ensure_list('methods').append(
+            self.create_method(idl_operation))
+        self._ensure_set('cpp_includes').update(
+            self.type_resolver.includes_from_definition(idl_operation))
+
+    def create_method(self, idl_operation):
+        name = idl_operation.name
+        return_type = self.type_resolver.type_from_definition(idl_operation)
+        return {
+            'name': name,
+            'return_type': return_type
+        }
+
+    def create_attribute(self, idl_attribute):
+        name = idl_attribute.name
+        return_type = self.type_resolver.type_from_definition(idl_attribute)
+        return {
+            'name': name,
+            'return_type': return_type
+        }
+
+    def build(self):
+        return self.result
+
+
+class CodeGeneratorWebAgentAPI(CodeGeneratorBase):
+    def __init__(self, info_provider, cache_dir, output_dir):
+        CodeGeneratorBase.__init__(self, MODULE_PYNAME, info_provider,
+                                   cache_dir, output_dir)
+        self.type_resolver = TypeResolver(info_provider.interfaces_info)
+        self.typedef_resolver = TypedefResolver(info_provider)
+
+    def get_template(self, file_extension):
+        template_filename = 'web_agent_api_interface.%s.tmpl' % file_extension
+        return self.jinja_env.get_template(template_filename)
+
+    def generate_file(self, template_context, file_extension):
+        template = self.get_template(file_extension)
+        path = posixpath.join(
+            self.output_dir,
+            '%s.%s' % (template_context['class_name']['snake_case'],
+                       file_extension))
+        text = render_template(template, template_context)
+        return (path, text)
+
+    def generate_interface_code(self, interface):
+        # TODO(dglazkov): Implement callback interfaces.
+        # TODO(dglazkov): Make sure partial interfaces are handled.
+        if interface.is_callback or interface.is_partial:
+            raise ValueError('Partial or callback interfaces are not supported')
+
+        template_context = interface_context(interface, self.type_resolver)
+
+        return (
+            self.generate_file(template_context, 'h'),
+            self.generate_file(template_context, 'cc')
+        )
+
+    def generate_code(self, definitions, definition_name):
+        self.typedef_resolver.resolve(definitions, definition_name)
+
+        # TODO(dglazkov): Implement dictionaries
+        if definition_name not in definitions.interfaces:
+            return None
+
+        interface = definitions.interfaces[definition_name]
+        if WEB_AGENT_API_IDL_ATTRIBUTE not in interface.extended_attributes:
+            return None
+
+        return self.generate_interface_code(interface)

diff --git a/third_party/WebKit/Source/bindings/scripts/code_generator_web_module.py b/third_party/WebKit/Source/bindings/scripts/code_generator_web_module.py
deleted file mode 100644
index 11c52e3..0000000
--- a/third_party/WebKit/Source/bindings/scripts/code_generator_web_module.py
+++ /dev/null

@@ -1,190 +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.
-
-# pylint: disable=import-error,print-statement,relative-import
-
-"""Generates Blink Web Module bindings.
-
-The Blink Web Module bindings provide a stable, IDL-generated interface for the
-Web Modules.
-
-The Web Modules are the high-level services like Autofill,
-Autocomplete, Translate, Distiller, Phishing Detector, and others. Web Modules
-typically want to introspec the document and rendering infromation to implement
-browser features.
-
-The bindings are meant to be as simple and as ephemeral as possible, mostly just
-wrapping existing DOM classes. Their primary goal is to avoid leaking the actual
-DOM classes to the Web Modules layer.
-"""
-
-import os
-import posixpath
-
-from code_generator import CodeGeneratorBase, render_template
-# TODO(dglazkov): Move TypedefResolver to code_generator.py
-from code_generator_v8 import TypedefResolver
-from name_style_converter import NameStyleConverter
-
-MODULE_PYNAME = os.path.splitext(os.path.basename(__file__))[0] + '.py'
-
-STRING_INCLUDE_PATH = 'wtf/text/WTFString.h'
-WEB_MODULE_IDL_ATTRIBUTE = 'WebModuleAPI'
-
-
-def interface_context(idl_interface, type_resolver):
-    builder = InterfaceContextBuilder(MODULE_PYNAME, type_resolver)
-    builder.set_class_name(idl_interface.name)
-    builder.set_inheritance(idl_interface.parent)
-
-    for idl_attribute in idl_interface.attributes:
-        builder.add_attribute(idl_attribute)
-
-    for idl_operation in idl_interface.operations:
-        builder.add_operation(idl_operation)
-
-    return builder.build()
-
-
-class TypeResolver(object):
-    """Resolves Web IDL types into corresponding C++ types and include paths
-       to the generated and existing files."""
-
-    def __init__(self, interfaces_info):
-        self.interfaces_info = interfaces_info
-
-    def includes_from_interface(self, interface_name):
-        interface_info = self.interfaces_info.get(interface_name)
-        if interface_info is None:
-            raise KeyError('Unknown interface "%s".' % interface_name)
-        return set([interface_info['include_path']])
-
-    def _includes_from_type(self, idl_type):
-        if idl_type.is_void:
-            return set()
-        if idl_type.is_primitive_type:
-            return set()
-        if idl_type.is_string_type:
-            return set([STRING_INCLUDE_PATH])
-
-        # TODO(dglazkov): Handle complex/weird types.
-        return self.includes_from_interface(idl_type.base_type)
-
-    def includes_from_definition(self, idl_definition):
-        return self._includes_from_type(idl_definition.idl_type)
-
-    def type_from_definition(self, idl_definition):
-        # TODO(dglazkov): The output of this method must be a reasonable C++
-        # type that can be used directly in the jinja2 template.
-        return idl_definition.idl_type.base_type
-
-    def base_class_includes(self):
-        return set(['platform/heap/Handle.h'])
-
-
-class InterfaceContextBuilder(object):
-    def __init__(self, code_generator, type_resolver):
-        self.result = {'code_generator': code_generator}
-        self.type_resolver = type_resolver
-
-    def set_class_name(self, class_name):
-        converter = NameStyleConverter(class_name)
-        self.result['class_name'] = converter.to_all_cases()
-        self._ensure_set('cpp_includes').update(
-            self.type_resolver.includes_from_interface(class_name))
-
-    def set_inheritance(self, base_interface):
-        if base_interface is None:
-            self._ensure_set('header_includes').update(
-                self.type_resolver.base_class_includes())
-            return
-        self.result['base_class'] = base_interface
-        self._ensure_set('header_includes').update(
-            self.type_resolver.includes_from_interface(base_interface))
-
-    def _ensure_set(self, name):
-        return self.result.setdefault(name, set())
-
-    def _ensure_list(self, name):
-        return self.result.setdefault(name, [])
-
-    def add_attribute(self, idl_attribute):
-        self._ensure_list('attributes').append(
-            self.create_attribute(idl_attribute))
-        self._ensure_set('cpp_includes').update(
-            self.type_resolver.includes_from_definition(idl_attribute))
-
-    def add_operation(self, idl_operation):
-        if not idl_operation.name:
-            return
-        self._ensure_list('methods').append(
-            self.create_method(idl_operation))
-        self._ensure_set('cpp_includes').update(
-            self.type_resolver.includes_from_definition(idl_operation))
-
-    def create_method(self, idl_operation):
-        name = idl_operation.name
-        return_type = self.type_resolver.type_from_definition(idl_operation)
-        return {
-            'name': name,
-            'return_type': return_type
-        }
-
-    def create_attribute(self, idl_attribute):
-        name = idl_attribute.name
-        return_type = self.type_resolver.type_from_definition(idl_attribute)
-        return {
-            'name': name,
-            'return_type': return_type
-        }
-
-    def build(self):
-        return self.result
-
-
-class CodeGeneratorWebModule(CodeGeneratorBase):
-    def __init__(self, info_provider, cache_dir, output_dir):
-        CodeGeneratorBase.__init__(self, MODULE_PYNAME, info_provider,
-                                   cache_dir, output_dir)
-        self.type_resolver = TypeResolver(info_provider.interfaces_info)
-        self.typedef_resolver = TypedefResolver(info_provider)
-
-    def get_template(self, file_extension):
-        template_filename = 'web_module_interface.%s.tmpl' % file_extension
-        return self.jinja_env.get_template(template_filename)
-
-    def generate_file(self, template_context, file_extension):
-        template = self.get_template(file_extension)
-        path = posixpath.join(
-            self.output_dir,
-            '%s.%s' % (template_context['class_name']['snake_case'],
-                       file_extension))
-        text = render_template(template, template_context)
-        return (path, text)
-
-    def generate_interface_code(self, interface):
-        # TODO(dglazkov): Implement callback interfaces.
-        # TODO(dglazkov): Make sure partial interfaces are handled.
-        if interface.is_callback or interface.is_partial:
-            raise ValueError('Partial or callback interfaces are not supported')
-
-        template_context = interface_context(interface, self.type_resolver)
-
-        return (
-            self.generate_file(template_context, 'h'),
-            self.generate_file(template_context, 'cc')
-        )
-
-    def generate_code(self, definitions, definition_name):
-        self.typedef_resolver.resolve(definitions, definition_name)
-
-        # TODO(dglazkov): Implement dictionaries
-        if definition_name not in definitions.interfaces:
-            return None
-
-        interface = definitions.interfaces[definition_name]
-        if WEB_MODULE_IDL_ATTRIBUTE not in interface.extended_attributes:
-            return None
-
-        return self.generate_interface_code(interface)

diff --git a/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_api_test.py b/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_api_test.py
new file mode 100644
index 0000000..9baed18
--- /dev/null
+++ b/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_api_test.py

@@ -0,0 +1,151 @@
+# 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.
+
+# pylint: disable=import-error,print-statement,relative-import,protected-access
+
+"""Unit tests for code_generator_web_agent_api.py."""
+
+import unittest
+
+from code_generator_web_agent_api import InterfaceContextBuilder
+from code_generator_web_agent_api import STRING_INCLUDE_PATH
+from code_generator_web_agent_api import TypeResolver
+from idl_definitions import IdlAttribute
+from idl_definitions import IdlOperation
+from idl_types import IdlType
+from idl_types import PRIMITIVE_TYPES
+from idl_types import STRING_TYPES
+
+
+# TODO(dglazkov): Convert to use actual objects, not stubs.
+# See http://crbug.com/673214 for more details.
+class IdlTestingHelper(object):
+    """A collection of stub makers and helper utils to make testing code
+    generation easy."""
+
+    def make_stub_idl_attribute(self, name, return_type):
+        idl_attribute_stub = IdlAttribute()
+        idl_attribute_stub.name = name
+        idl_attribute_stub.idl_type = IdlType(return_type)
+        return idl_attribute_stub
+
+    def make_stub_idl_operation(self, name, return_type):
+        idl_operation_stub = IdlOperation()
+        idl_operation_stub.name = name
+        idl_operation_stub.idl_type = IdlType(return_type)
+        return idl_operation_stub
+
+    def make_stub_idl_type(self, base_type):
+        return IdlType(base_type)
+
+    def make_stub_interfaces_info(self, classes_to_paths):
+        result = {}
+        for class_name, path in classes_to_paths.iteritems():
+            result[class_name] = {'include_path': path}
+        return result
+
+
+class TypeResolverTest(unittest.TestCase):
+
+    def test_includes_from_type_should_filter_primitive_types(self):
+        helper = IdlTestingHelper()
+        type_resolver = TypeResolver({})
+        for primitive_type in PRIMITIVE_TYPES:
+            idl_type = helper.make_stub_idl_type(primitive_type)
+            self.assertEqual(
+                type_resolver._includes_from_type(idl_type), set())
+
+    def test_includes_from_type_should_filter_void(self):
+        type_resolver = TypeResolver({})
+        helper = IdlTestingHelper()
+        idl_type = helper.make_stub_idl_type('void')
+        self.assertEqual(
+            type_resolver._includes_from_type(idl_type), set())
+
+    def test_includes_from_type_should_handle_string(self):
+        type_resolver = TypeResolver({})
+        helper = IdlTestingHelper()
+        for string_type in STRING_TYPES:
+            idl_type = helper.make_stub_idl_type(string_type)
+            self.assertEqual(
+                type_resolver._includes_from_type(idl_type),
+                set([STRING_INCLUDE_PATH]))
+
+
+class InterfaceContextBuilderTest(unittest.TestCase):
+
+    def test_empty(self):
+        builder = InterfaceContextBuilder('test', TypeResolver({}))
+
+        self.assertEqual({'code_generator': 'test'}, builder.build())
+
+    def test_set_name(self):
+        helper = IdlTestingHelper()
+        builder = InterfaceContextBuilder(
+            'test', TypeResolver(helper.make_stub_interfaces_info({
+                'foo': 'path_to_foo',
+            })))
+
+        builder.set_class_name('foo')
+        self.assertEqual({
+            'code_generator': 'test',
+            'cpp_includes': set(['path_to_foo']),
+            'class_name': {
+                'snake_case': 'foo',
+                'macro_case': 'FOO',
+                'upper_camel_case': 'Foo'
+            },
+        }, builder.build())
+
+    def test_set_inheritance(self):
+        helper = IdlTestingHelper()
+        builder = InterfaceContextBuilder(
+            'test', TypeResolver(helper.make_stub_interfaces_info({
+                'foo': 'path_to_foo',
+            })))
+        builder.set_inheritance('foo')
+        self.assertEqual({
+            'base_class': 'foo',
+            'code_generator': 'test',
+            'header_includes': set(['path_to_foo']),
+        }, builder.build())
+
+        builder = InterfaceContextBuilder('test', TypeResolver({}))
+        builder.set_inheritance(None)
+        self.assertEqual({
+            'code_generator': 'test',
+            'header_includes': set(['platform/heap/Handle.h']),
+        }, builder.build())
+
+    def test_add_attribute(self):
+        helper = IdlTestingHelper()
+        builder = InterfaceContextBuilder(
+            'test', TypeResolver(helper.make_stub_interfaces_info({
+                'foo': 'path_to_foo',
+                'bar': 'path_to_bar'
+            })))
+
+        attribute = helper.make_stub_idl_attribute('foo', 'bar')
+        builder.add_attribute(attribute)
+        self.assertEqual({
+            'code_generator': 'test',
+            'cpp_includes': set(['path_to_bar']),
+            'attributes': [{'name': 'foo', 'return_type': 'bar'}],
+        }, builder.build())
+
+    def test_add_method(self):
+        helper = IdlTestingHelper()
+        builder = InterfaceContextBuilder(
+            'test', TypeResolver(helper.make_stub_interfaces_info({
+                'foo': 'path_to_foo',
+                'bar': 'path_to_bar'
+            })))
+
+        operation = helper.make_stub_idl_operation('foo', 'bar')
+        builder.add_operation(operation)
+        self.assertEqual({
+            'code_generator': 'test',
+            'cpp_includes': set(['path_to_bar']),
+            'methods': [{'name': 'foo', 'return_type': 'bar'}],
+        }, builder.build())

diff --git a/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_test.py b/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_test.py
deleted file mode 100644
index 4efa031..0000000
--- a/third_party/WebKit/Source/bindings/scripts/code_generator_web_module_test.py
+++ /dev/null

@@ -1,151 +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.
-
-# pylint: disable=import-error,print-statement,relative-import,protected-access
-
-"""Unit tests for code_generator_web_module.py."""
-
-import unittest
-
-from code_generator_web_module import InterfaceContextBuilder
-from code_generator_web_module import STRING_INCLUDE_PATH
-from code_generator_web_module import TypeResolver
-from idl_definitions import IdlAttribute
-from idl_definitions import IdlOperation
-from idl_types import IdlType
-from idl_types import PRIMITIVE_TYPES
-from idl_types import STRING_TYPES
-
-
-# TODO(dglazkov): Convert to use actual objects, not stubs.
-# See http://crbug.com/673214 for more details.
-class IdlTestingHelper(object):
-    """A collection of stub makers and helper utils to make testing code
-    generation easy."""
-
-    def make_stub_idl_attribute(self, name, return_type):
-        idl_attribute_stub = IdlAttribute()
-        idl_attribute_stub.name = name
-        idl_attribute_stub.idl_type = IdlType(return_type)
-        return idl_attribute_stub
-
-    def make_stub_idl_operation(self, name, return_type):
-        idl_operation_stub = IdlOperation()
-        idl_operation_stub.name = name
-        idl_operation_stub.idl_type = IdlType(return_type)
-        return idl_operation_stub
-
-    def make_stub_idl_type(self, base_type):
-        return IdlType(base_type)
-
-    def make_stub_interfaces_info(self, classes_to_paths):
-        result = {}
-        for class_name, path in classes_to_paths.iteritems():
-            result[class_name] = {'include_path': path}
-        return result
-
-class TypeResolverTest(unittest.TestCase):
-
-    def test_includes_from_type_should_filter_primitive_types(self):
-        helper = IdlTestingHelper()
-        type_resolver = TypeResolver({})
-        for primitive_type in PRIMITIVE_TYPES:
-            idl_type = helper.make_stub_idl_type(primitive_type)
-            self.assertEqual(
-                type_resolver._includes_from_type(idl_type), set())
-
-    def test_includes_from_type_should_filter_void(self):
-        type_resolver = TypeResolver({})
-        helper = IdlTestingHelper()
-        idl_type = helper.make_stub_idl_type('void')
-        self.assertEqual(
-            type_resolver._includes_from_type(idl_type), set())
-
-    def test_includes_from_type_should_handle_string(self):
-        type_resolver = TypeResolver({})
-        helper = IdlTestingHelper()
-        for string_type in STRING_TYPES:
-            idl_type = helper.make_stub_idl_type(string_type)
-            self.assertEqual(
-                type_resolver._includes_from_type(idl_type),
-                set([STRING_INCLUDE_PATH]))
-
-
-class InterfaceContextBuilderTest(unittest.TestCase):
-
-    def test_empty(self):
-        builder = InterfaceContextBuilder('test', TypeResolver({}))
-
-        self.assertEqual({'code_generator': 'test'}, builder.build())
-
-    def test_set_name(self):
-        helper = IdlTestingHelper()
-        builder = InterfaceContextBuilder(
-            'test', TypeResolver(helper.make_stub_interfaces_info({
-                'foo': 'path_to_foo',
-            })))
-
-        builder.set_class_name('foo')
-        self.assertEqual({
-            'code_generator': 'test',
-            'cpp_includes': set(['path_to_foo']),
-            'class_name': {
-                'snake_case': 'foo',
-                'macro_case': 'FOO',
-                'upper_camel_case': 'Foo'
-            },
-        }, builder.build())
-
-    def test_set_inheritance(self):
-        helper = IdlTestingHelper()
-        builder = InterfaceContextBuilder(
-            'test', TypeResolver(helper.make_stub_interfaces_info({
-                'foo': 'path_to_foo',
-            })))
-        builder.set_inheritance('foo')
-        self.assertEqual({
-            'base_class': 'foo',
-            'code_generator': 'test',
-            'header_includes': set(['path_to_foo']),
-        }, builder.build())
-
-        builder = InterfaceContextBuilder('test', TypeResolver({}))
-        builder.set_inheritance(None)
-        self.assertEqual({
-            'code_generator': 'test',
-            'header_includes': set(['platform/heap/Handle.h']),
-        }, builder.build())
-
-
-    def test_add_attribute(self):
-        helper = IdlTestingHelper()
-        builder = InterfaceContextBuilder(
-            'test', TypeResolver(helper.make_stub_interfaces_info({
-                'foo': 'path_to_foo',
-                'bar': 'path_to_bar'
-            })))
-
-        attribute = helper.make_stub_idl_attribute('foo', 'bar')
-        builder.add_attribute(attribute)
-        self.assertEqual({
-            'code_generator': 'test',
-            'cpp_includes': set(['path_to_bar']),
-            'attributes': [{'name': 'foo', 'return_type': 'bar'}],
-        }, builder.build())
-
-    def test_add_method(self):
-        helper = IdlTestingHelper()
-        builder = InterfaceContextBuilder(
-            'test', TypeResolver(helper.make_stub_interfaces_info({
-                'foo': 'path_to_foo',
-                'bar': 'path_to_bar'
-            })))
-
-        operation = helper.make_stub_idl_operation('foo', 'bar')
-        builder.add_operation(operation)
-        self.assertEqual({
-            'code_generator': 'test',
-            'cpp_includes': set(['path_to_bar']),
-            'methods': [{'name': 'foo', 'return_type': 'bar'}],
-        }, builder.build())

diff --git a/third_party/WebKit/Source/bindings/scripts/scripts.gni b/third_party/WebKit/Source/bindings/scripts/scripts.gni
index bdb3205f..ab82c54 100644
--- a/third_party/WebKit/Source/bindings/scripts/scripts.gni
+++ b/third_party/WebKit/Source/bindings/scripts/scripts.gni

@@ -41,7 +41,7 @@
                                      # V8 code generator
                                      "code_generator.py",
                                      "code_generator_v8.py",
-                                     "code_generator_web_module.py",
+                                     "code_generator_web_agent_api.py",
                                      "v8_attributes.py",
                                      "v8_callback_function.py",
                                      "v8_callback_interface.py",

diff --git a/third_party/WebKit/Source/bindings/scripts/v8_methods.py b/third_party/WebKit/Source/bindings/scripts/v8_methods.py
index ee7fb6c..81263b8 100644
--- a/third_party/WebKit/Source/bindings/scripts/v8_methods.py
+++ b/third_party/WebKit/Source/bindings/scripts/v8_methods.py

@@ -370,7 +370,7 @@
     }
 
 
-def v8_value_to_local_cpp_value(method, argument, index, return_promise=False, restricted_float=False):
+def v8_value_to_local_cpp_value(method, argument, index, return_promise=False):
     extended_attributes = argument.extended_attributes
     idl_type = argument.idl_type
     name = argument.name
@@ -378,8 +378,7 @@
         return v8_value_to_local_cpp_variadic_value(method, argument, index, return_promise)
     return idl_type.v8_value_to_local_cpp_value(extended_attributes, 'info[%s]' % index,
                                                 name, index=index, declare_variable=False,
-                                                use_exception_state=method.returns_promise,
-                                                restricted_float=restricted_float)
+                                                use_exception_state=method.returns_promise)
 
 
 ################################################################################

diff --git a/third_party/WebKit/Source/bindings/scripts/v8_types.py b/third_party/WebKit/Source/bindings/scripts/v8_types.py
index aa502e87..58151a9 100644
--- a/third_party/WebKit/Source/bindings/scripts/v8_types.py
+++ b/third_party/WebKit/Source/bindings/scripts/v8_types.py

@@ -545,7 +545,7 @@
 IdlType.v8_conversion_is_trivial = property(v8_conversion_is_trivial)
 
 
-def v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index, isolate, restricted_float=False):
+def v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index, isolate):
     if idl_type.name == 'void':
         return ''
 
@@ -620,13 +620,14 @@
 
 
 # FIXME: this function should be refactored, as this takes too many flags.
-def v8_value_to_local_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index=None, declare_variable=True, isolate='info.GetIsolate()', bailout_return_value=None, use_exception_state=False, restricted_float=False):
+def v8_value_to_local_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index=None, declare_variable=True,
+                                isolate='info.GetIsolate()', bailout_return_value=None, use_exception_state=False):
     """Returns an expression that converts a V8 value to a C++ value and stores it as a local value."""
 
     this_cpp_type = idl_type.cpp_type_args(extended_attributes=extended_attributes, raw_type=True)
     idl_type = idl_type.preprocessed_type
 
-    cpp_value = v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index, isolate, restricted_float=restricted_float)
+    cpp_value = v8_value_to_cpp_value(idl_type, extended_attributes, v8_value, variable_name, index, isolate)
 
     # Optional expression that returns a value to be assigned to the local variable.
     assign_expression = None

diff --git a/third_party/WebKit/Source/bindings/scripts/v8_union.py b/third_party/WebKit/Source/bindings/scripts/v8_union.py
index 84dd56b..1fb6216 100644
--- a/third_party/WebKit/Source/bindings/scripts/v8_union.py
+++ b/third_party/WebKit/Source/bindings/scripts/v8_union.py

@@ -150,5 +150,5 @@
         'type_name': member.name,
         'v8_value_to_local_cpp_value': member.v8_value_to_local_cpp_value(
             {}, 'v8Value', 'cppValue', isolate='isolate',
-            use_exception_state=True, restricted_float=True),
+            use_exception_state=True)
     }

diff --git a/third_party/WebKit/Source/bindings/templates/methods.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/methods.cpp.tmpl
index 266b360b..004c060 100644
--- a/third_party/WebKit/Source/bindings/templates/methods.cpp.tmpl
+++ b/third_party/WebKit/Source/bindings/templates/methods.cpp.tmpl

@@ -78,7 +78,8 @@
   }
   {% endif %}
 
-  {% if 'scriptState' in function_call %}
+  {% set log_activity = world_suffix in method.activity_logging_world_list %}
+  {% if 'scriptState' in function_call or log_activity %}
   {% if method.is_static %}
   ScriptState* scriptState = ScriptState::forFunctionObject(info);
   {% else %}
@@ -86,6 +87,15 @@
   {% endif %}
   {% endif %}
 
+  {% if log_activity %}
+  V8PerContextData* contextData = scriptState->perContextData();
+  if (contextData && contextData->activityLogger()) {
+    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "{{interface_name}}", "{{method.name}}");
+    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
+    contextData->activityLogger()->logMethod("{{interface_name}}.{{method.name}}", info.Length(), loggerArgs.data());
+  }
+  {% endif %}
+
   {% if method.is_custom_element_callbacks %}
   V0CustomElementProcessingStack::CallbackDeliveryScope deliveryScope;
   {% endif %}
@@ -511,19 +521,6 @@
   Deprecation::countDeprecation(currentExecutionContext(info.GetIsolate()), UseCounter::{{method.deprecate_as}});
   {% endif %}
   {% endif %}{# not method.overloads #}
-  {% if world_suffix in method.activity_logging_world_list %}
-  {% if method.is_static %}
-  ScriptState* scriptState = ScriptState::forFunctionObject(info);
-  {% else %}
-  ScriptState* scriptState = ScriptState::forReceiverObject(info);
-  {% endif %}
-  V8PerContextData* contextData = scriptState->perContextData();
-  if (contextData && contextData->activityLogger()) {
-    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "{{interface_name}}", "{{method.name}}");
-    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
-    contextData->activityLogger()->logMethod("{{interface_name}}.{{method.name}}", info.Length(), loggerArgs.data());
-  }
-  {% endif %}
   {% if method.is_ce_reactions %}
   CEReactionsScope ceReactionsScope;
   {% endif %}

diff --git a/third_party/WebKit/Source/bindings/templates/templates.gni b/third_party/WebKit/Source/bindings/templates/templates.gni
index 2a52410..df1c564 100644
--- a/third_party/WebKit/Source/bindings/templates/templates.gni
+++ b/third_party/WebKit/Source/bindings/templates/templates.gni

@@ -3,28 +3,29 @@
 # found in the LICENSE file.
 
 # Paths should be absolute so this file can be imported from anywhere.
-code_generator_template_files = get_path_info([
-                                                "attributes.cpp.tmpl",
-                                                "callback_function.cpp.tmpl",
-                                                "callback_function.h.tmpl",
-                                                "callback_interface.cpp.tmpl",
-                                                "callback_interface.h.tmpl",
-                                                "constants.cpp.tmpl",
-                                                "utilities.cpp.tmpl",
-                                                "copyright_block.txt",
-                                                "dictionary_impl.cpp.tmpl",
-                                                "dictionary_impl.h.tmpl",
-                                                "dictionary_v8.cpp.tmpl",
-                                                "dictionary_v8.h.tmpl",
-                                                "interface_base.cpp.tmpl",
-                                                "interface.cpp.tmpl",
-                                                "interface.h.tmpl",
-                                                "methods.cpp.tmpl",
-                                                "partial_interface.cpp.tmpl",
-                                                "partial_interface.h.tmpl",
-                                                "union_container.cpp.tmpl",
-                                                "union_container.h.tmpl",
-                                                "web_module_interface.cc.tmpl",
-                                                "web_module_interface.h.tmpl",
-                                              ],
-                                              "abspath")
+code_generator_template_files =
+    get_path_info([
+                    "attributes.cpp.tmpl",
+                    "callback_function.cpp.tmpl",
+                    "callback_function.h.tmpl",
+                    "callback_interface.cpp.tmpl",
+                    "callback_interface.h.tmpl",
+                    "constants.cpp.tmpl",
+                    "utilities.cpp.tmpl",
+                    "copyright_block.txt",
+                    "dictionary_impl.cpp.tmpl",
+                    "dictionary_impl.h.tmpl",
+                    "dictionary_v8.cpp.tmpl",
+                    "dictionary_v8.h.tmpl",
+                    "interface_base.cpp.tmpl",
+                    "interface.cpp.tmpl",
+                    "interface.h.tmpl",
+                    "methods.cpp.tmpl",
+                    "partial_interface.cpp.tmpl",
+                    "partial_interface.h.tmpl",
+                    "union_container.cpp.tmpl",
+                    "union_container.h.tmpl",
+                    "web_agent_api_interface.cc.tmpl",
+                    "web_agent_api_interface.h.tmpl",
+                  ],
+                  "abspath")

diff --git a/third_party/WebKit/Source/bindings/templates/web_module_interface.cc.tmpl b/third_party/WebKit/Source/bindings/templates/web_agent_api_interface.cc.tmpl
similarity index 100%
rename from third_party/WebKit/Source/bindings/templates/web_module_interface.cc.tmpl
rename to third_party/WebKit/Source/bindings/templates/web_agent_api_interface.cc.tmpl

diff --git a/third_party/WebKit/Source/bindings/templates/web_module_interface.h.tmpl b/third_party/WebKit/Source/bindings/templates/web_agent_api_interface.h.tmpl
similarity index 100%
rename from third_party/WebKit/Source/bindings/templates/web_module_interface.h.tmpl
rename to third_party/WebKit/Source/bindings/templates/web_agent_api_interface.h.tmpl

diff --git a/third_party/WebKit/Source/bindings/tests/idls/core/TestInterface3.idl b/third_party/WebKit/Source/bindings/tests/idls/core/TestInterface3.idl
index 401dbf1..d36e16b 100644
--- a/third_party/WebKit/Source/bindings/tests/idls/core/TestInterface3.idl
+++ b/third_party/WebKit/Source/bindings/tests/idls/core/TestInterface3.idl

@@ -34,7 +34,7 @@
 // The more *minor* extended attribute should be put in this file.
 
 [
-    WebModuleAPI,
+    WebAgentAPI,
 ] interface TestInterface3 {
     // iterable<V> needs a "length" property accompanying the indexed property
     // getter below.

diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
index ed61d657..c538e35 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

@@ -7050,6 +7050,15 @@
 static void activityLoggingAccessForAllWorldsMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
   TestObject* impl = V8TestObject::toImpl(info.Holder());
 
+  ScriptState* scriptState = ScriptState::forReceiverObject(info);
+
+  V8PerContextData* contextData = scriptState->perContextData();
+  if (contextData && contextData->activityLogger()) {
+    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingAccessForAllWorldsMethod");
+    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
+    contextData->activityLogger()->logMethod("TestObject.activityLoggingAccessForAllWorldsMethod", info.Length(), loggerArgs.data());
+  }
+
   impl->activityLoggingAccessForAllWorldsMethod();
 }
 
@@ -7704,18 +7713,45 @@
 static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
   TestObject* impl = V8TestObject::toImpl(info.Holder());
 
+  ScriptState* scriptState = ScriptState::forReceiverObject(info);
+
+  V8PerContextData* contextData = scriptState->perContextData();
+  if (contextData && contextData->activityLogger()) {
+    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForAllWorldsPerWorldBindingsVoidMethod");
+    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
+    contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
+  }
+
   impl->activityLoggingForAllWorldsPerWorldBindingsVoidMethod();
 }
 
 static void activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& info) {
   TestObject* impl = V8TestObject::toImpl(info.Holder());
 
+  ScriptState* scriptState = ScriptState::forReceiverObject(info);
+
+  V8PerContextData* contextData = scriptState->perContextData();
+  if (contextData && contextData->activityLogger()) {
+    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForAllWorldsPerWorldBindingsVoidMethod");
+    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
+    contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
+  }
+
   impl->activityLoggingForAllWorldsPerWorldBindingsVoidMethod();
 }
 
 static void activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethodMethod(const v8::FunctionCallbackInfo<v8::Value>& info) {
   TestObject* impl = V8TestObject::toImpl(info.Holder());
 
+  ScriptState* scriptState = ScriptState::forReceiverObject(info);
+
+  V8PerContextData* contextData = scriptState->perContextData();
+  if (contextData && contextData->activityLogger()) {
+    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod");
+    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
+    contextData->activityLogger()->logMethod("TestObject.activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
+  }
+
   impl->activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod();
 }
 
@@ -10836,13 +10872,6 @@
 }
 
 void V8TestObject::activityLoggingAccessForAllWorldsMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  ScriptState* scriptState = ScriptState::forReceiverObject(info);
-  V8PerContextData* contextData = scriptState->perContextData();
-  if (contextData && contextData->activityLogger()) {
-    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingAccessForAllWorldsMethod");
-    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
-    contextData->activityLogger()->logMethod("TestObject.activityLoggingAccessForAllWorldsMethod", info.Length(), loggerArgs.data());
-  }
   TestObjectV8Internal::activityLoggingAccessForAllWorldsMethodMethod(info);
 }
 
@@ -10986,35 +11015,14 @@
 }
 
 void V8TestObject::activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  ScriptState* scriptState = ScriptState::forReceiverObject(info);
-  V8PerContextData* contextData = scriptState->perContextData();
-  if (contextData && contextData->activityLogger()) {
-    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForAllWorldsPerWorldBindingsVoidMethod");
-    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
-    contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
-  }
   TestObjectV8Internal::activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethod(info);
 }
 
 void V8TestObject::activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodCallbackForMainWorld(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  ScriptState* scriptState = ScriptState::forReceiverObject(info);
-  V8PerContextData* contextData = scriptState->perContextData();
-  if (contextData && contextData->activityLogger()) {
-    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForAllWorldsPerWorldBindingsVoidMethod");
-    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
-    contextData->activityLogger()->logMethod("TestObject.activityLoggingForAllWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
-  }
   TestObjectV8Internal::activityLoggingForAllWorldsPerWorldBindingsVoidMethodMethodForMainWorld(info);
 }
 
 void V8TestObject::activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethodMethodCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  ScriptState* scriptState = ScriptState::forReceiverObject(info);
-  V8PerContextData* contextData = scriptState->perContextData();
-  if (contextData && contextData->activityLogger()) {
-    ExceptionState exceptionState(info.GetIsolate(), ExceptionState::ExecutionContext, "TestObject", "activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod");
-    Vector<v8::Local<v8::Value>> loggerArgs = toImplArguments<Vector<v8::Local<v8::Value>>>(info, 0, exceptionState);
-    contextData->activityLogger()->logMethod("TestObject.activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethod", info.Length(), loggerArgs.data());
-  }
   TestObjectV8Internal::activityLoggingForIsolatedWorldsPerWorldBindingsVoidMethodMethod(info);
 }
 

diff --git a/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.cc b/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.cc
index 3e47c87..b44e4d7 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.cc
+++ b/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file has been auto-generated by code_generator_web_module.py.
+// This file has been auto-generated by code_generator_web_agent_api.py.
 // DO NOT MODIFY!
 
 // This file has been generated from the Jinja2 template in
-// third_party/WebKit/Source/bindings/templates/web_module_interface.cc.tmpl
+// third_party/WebKit/Source/bindings/templates/web_agent_api_interface.cc.tmpl
 
 // clang-format off
 

diff --git a/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.h b/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.h
index 3855554..ce4b771 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.h
+++ b/third_party/WebKit/Source/bindings/tests/results/core/test_interface_3.h

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file has been auto-generated by code_generator_web_module.py.
+// This file has been auto-generated by code_generator_web_agent_api.py.
 // DO NOT MODIFY!
 
 // This file has been generated from the Jinja2 template in
-// third_party/WebKit/Source/bindings/templates/web_module_interface.h.tmpl
+// third_party/WebKit/Source/bindings/templates/web_agent_api_interface.h.tmpl
 
 // clang-format off
 

diff --git a/third_party/WebKit/Source/core/OWNERS b/third_party/WebKit/Source/core/OWNERS
index 1bbf02a..9e87576e 100644
--- a/third_party/WebKit/Source/core/OWNERS
+++ b/third_party/WebKit/Source/core/OWNERS

@@ -35,6 +35,7 @@
 keishi@chromium.org
 kenneth.r.christiansen@intel.com
 kinuko@chromium.org
+kojii@chromium.org
 kouhei@chromium.org
 meade@chromium.org
 mkwst@chromium.org
@@ -48,6 +49,7 @@
 # rbyers reviews input related changes (eg. event handling, mouse cursors, touch hit testing, scrolling coordinator)
 rbyers@chromium.org
 rob.buis@samsung.com
+robhogan@gmail.com
 # rune reviews core/css and parts of core/rendering
 rune@opera.com
 schenney@chromium.org

diff --git a/third_party/WebKit/Source/core/css/cssom/WindowGetComputedStyle.h b/third_party/WebKit/Source/core/css/cssom/WindowGetComputedStyle.h
index c8f7989..49d044a 100644
--- a/third_party/WebKit/Source/core/css/cssom/WindowGetComputedStyle.h
+++ b/third_party/WebKit/Source/core/css/cssom/WindowGetComputedStyle.h

@@ -14,7 +14,7 @@
   STATIC_ONLY(WindowGetComputedStyle);
 
  public:
-  static StylePropertyMap* getComputedStyleMap(const DOMWindow&,
+  static StylePropertyMap* getComputedStyleMap(const LocalDOMWindow&,
                                                Element* element,
                                                const String& pseudoElement) {
     DCHECK(element);

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
index dc21e25..a757ed1 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

@@ -159,8 +159,9 @@
   style.setPosition(EPosition::kStatic);
 }
 
-void StyleAdjuster::adjustStyleForAlignment(ComputedStyle& style,
-                                            const ComputedStyle& parentStyle) {
+void StyleAdjuster::adjustStyleForAlignment(
+    ComputedStyle& style,
+    const ComputedStyle& layoutParentStyle) {
   // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto'
   // flag to not just mean 'auto' prior to running the StyleAdjuster but also
   // mean 'normal' after running it.
@@ -169,25 +170,25 @@
   // 'auto' computes to the the inherited value.  Otherwise, 'auto' computes to
   // 'normal'.
   if (style.justifyItemsPosition() == ItemPositionAuto) {
-    if (parentStyle.justifyItemsPositionType() == LegacyPosition)
-      style.setJustifyItems(parentStyle.justifyItems());
+    if (layoutParentStyle.justifyItemsPositionType() == LegacyPosition)
+      style.setJustifyItems(layoutParentStyle.justifyItems());
   }
 
   // The 'auto' keyword computes the computed value of justify-items on the
   // parent (minus any legacy keywords), or 'normal' if the box has no parent.
   if (style.justifySelfPosition() == ItemPositionAuto) {
-    if (parentStyle.justifyItemsPositionType() == LegacyPosition)
-      style.setJustifySelfPosition(parentStyle.justifyItemsPosition());
-    else if (parentStyle.justifyItemsPosition() != ItemPositionAuto)
-      style.setJustifySelf(parentStyle.justifyItems());
+    if (layoutParentStyle.justifyItemsPositionType() == LegacyPosition)
+      style.setJustifySelfPosition(layoutParentStyle.justifyItemsPosition());
+    else if (layoutParentStyle.justifyItemsPosition() != ItemPositionAuto)
+      style.setJustifySelf(layoutParentStyle.justifyItems());
   }
 
   // The 'auto' keyword computes the computed value of align-items on the parent
   // or 'normal' if the box has no parent.
   if (style.alignSelfPosition() == ItemPositionAuto &&
-      parentStyle.alignItemsPosition() !=
+      layoutParentStyle.alignItemsPosition() !=
           ComputedStyle::initialDefaultAlignment().position())
-    style.setAlignSelf(parentStyle.alignItems());
+    style.setAlignSelf(layoutParentStyle.alignItems());
 }
 
 static void adjustStyleForHTMLElement(ComputedStyle& style,
@@ -506,7 +507,7 @@
     if (isSVGTextElement(*element))
       style.clearMultiCol();
   }
-  adjustStyleForAlignment(style, parentStyle);
+  adjustStyleForAlignment(style, layoutParentStyle);
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/dom/ContainerNode.cpp b/third_party/WebKit/Source/core/dom/ContainerNode.cpp
index 066f991..f10d8fc 100644
--- a/third_party/WebKit/Source/core/dom/ContainerNode.cpp
+++ b/third_party/WebKit/Source/core/dom/ContainerNode.cpp

@@ -424,7 +424,7 @@
 
   // TODO(tkent): According to the specification, we should remove |newChild|
   // from its parent here, and create a separated mutation record for it.
-  // Refer to imported/wpt/dom/nodes/MutationObserver-childList.html.
+  // Refer to external/wpt/dom/nodes/MutationObserver-childList.html.
 
   // 12. If child’s parent is not null, run these substeps:
   //    1. Set removedNodes to a list solely containing child.

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index b8178d8a..d8fc1a43 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -406,10 +406,11 @@
 }
 
 class Document::NetworkStateObserver final
-    : public GarbageCollected<Document::NetworkStateObserver>,
+    : public GarbageCollectedFinalized<Document::NetworkStateObserver>,
       public NetworkStateNotifier::NetworkStateObserver,
       public ContextLifecycleObserver {
   USING_GARBAGE_COLLECTED_MIXIN(Document::NetworkStateObserver);
+  EAGERLY_FINALIZE();
 
  public:
   explicit NetworkStateObserver(Document& document)
@@ -419,6 +420,9 @@
         TaskRunnerHelper::get(TaskType::Networking, getExecutionContext()));
   }
 
+  // We eagerly finalize, so it's safe to touch getExecutionContext() here.
+  ~NetworkStateObserver() { unregisterAsObserver(getExecutionContext()); }
+
   void onLineStateChange(bool onLine) override {
     AtomicString eventName =
         onLine ? EventTypeNames::online : EventTypeNames::offline;
@@ -430,6 +434,12 @@
   }
 
   void contextDestroyed(ExecutionContext* context) override {
+    unregisterAsObserver(context);
+  }
+
+  void unregisterAsObserver(ExecutionContext* context) {
+    if (!context)
+      return;
     networkStateNotifier().removeOnLineObserver(
         this, TaskRunnerHelper::get(TaskType::Networking, context));
   }
@@ -2629,11 +2639,11 @@
   if (!settings || !settings->getAccessibilityEnabled())
     return 0;
 
-  // The only document that actually has a AXObjectCache is the top-level
-  // document.  This is because we need to be able to get from any
-  // WebCoreAXObject to any other WebCoreAXObject on the same page.  Using a
-  // single cache allows lookups across nested webareas (i.e. multiple
-  // documents).
+  // Every document has its own AXObjectCache if accessibility is enabled,
+  // except for page popups (such as select popups or context menus),
+  // which share the AXObjectCache of their owner.
+  //
+  // See http://crbug.com/532249
   Document& cacheOwner = this->axObjectCacheOwner();
 
   // If the document has already been detached, do not make a new axObjectCache.

diff --git a/third_party/WebKit/Source/core/dom/PendingScript.cpp b/third_party/WebKit/Source/core/dom/PendingScript.cpp
index 7ea0742..cdcf2948 100644
--- a/third_party/WebKit/Source/core/dom/PendingScript.cpp
+++ b/third_party/WebKit/Source/core/dom/PendingScript.cpp

@@ -221,13 +221,19 @@
   MemoryCoordinatorClient::trace(visitor);
 }
 
-ScriptSourceCode PendingScript::getSource(const KURL& documentURL,
-                                          bool& errorOccurred) const {
+NOINLINE ScriptSourceCode PendingScript::getSource(const KURL& documentURL,
+                                                   bool& errorOccurred) const {
   checkState();
 
   errorOccurred = this->errorOccurred();
   if (resource()) {
-    DCHECK(resource()->isLoaded());
+    // For investigating https://crbug.com/692856.
+    CHECK(resource()->isLoaded() ||
+          (resource()->isLoading() && resource()->hasRevalidated()));
+    CHECK(resource()->isLoaded() ||
+          (resource()->isLoading() && resource()->isCacheValidator()));
+    CHECK(resource()->isLoaded());
+
     if (m_streamer && !m_streamer->streamingSuppressed())
       return ScriptSourceCode(m_streamer, resource());
     return ScriptSourceCode(resource());

diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
index e32b451..556fd9b 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

@@ -832,6 +832,7 @@
 void ScriptLoader::pendingScriptFinished(PendingScript* pendingScript) {
   DCHECK(!m_willBeParserExecuted);
   DCHECK_EQ(m_pendingScript, pendingScript);
+  DCHECK_EQ(pendingScript->resource(), m_resource);
 
   // We do not need this script in the memory cache. The primary goals of
   // sending this fetch request are to let the third party server know
@@ -852,9 +853,7 @@
     return;
   }
 
-  DCHECK_EQ(pendingScript->resource(), m_resource);
-
-  if (m_resource->errorOccurred()) {
+  if (errorOccurred()) {
     contextDocument->scriptRunner()->notifyScriptLoadError(this,
                                                            m_asyncExecType);
     detachPendingScript();

diff --git a/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp b/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp
index 7d20faa..b5089bc6 100644
--- a/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp
+++ b/third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp

@@ -181,9 +181,8 @@
                                                       context);
   if (!isImmediateFullPaintInvalidationReason(
           layoutBlockPaintInvalidationReason)) {
-    objectInvalidator.invalidatePaintUsingContainer(
-        *context.paintInvalidationContainer, m_previousVisualRect,
-        PaintInvalidationCaret);
+    objectInvalidator.invalidatePaintRectangleWithContext(
+        m_previousVisualRect, PaintInvalidationCaret);
   }
 
   context.paintingLayer->setNeedsRepaint();

diff --git a/third_party/WebKit/Source/core/editing/DOMSelection.cpp b/third_party/WebKit/Source/core/editing/DOMSelection.cpp
index d835822..b19285eb 100644
--- a/third_party/WebKit/Source/core/editing/DOMSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/DOMSelection.cpp

@@ -588,6 +588,14 @@
   frame()->selection().clearDocumentCachedRange();
 }
 
+void DOMSelection::removeRange(Range* range) {
+  DCHECK(range);
+  if (!isAvailable())
+    return;
+  if (range == primaryRangeOrNull())
+    frame()->selection().clear();
+}
+
 void DOMSelection::removeAllRanges() {
   if (!isAvailable())
     return;

diff --git a/third_party/WebKit/Source/core/editing/DOMSelection.h b/third_party/WebKit/Source/core/editing/DOMSelection.h
index 094a1e0..6dbc02aa 100644
--- a/third_party/WebKit/Source/core/editing/DOMSelection.h
+++ b/third_party/WebKit/Source/core/editing/DOMSelection.h

@@ -90,6 +90,7 @@
   void collapseToStart(ExceptionState&);
   void extend(Node*, unsigned offset, ExceptionState&);
   Range* getRangeAt(unsigned, ExceptionState&) const;
+  void removeRange(Range*);
   void removeAllRanges();
   void addRange(Range*);
   void deleteFromDocument();

diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index 147b10f..99b128a2 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp

@@ -926,9 +926,7 @@
       !passedSelection.extent().isConnected())
     return VisibleSelection();
   DCHECK(!passedSelection.base().document()->needsLayoutTreeUpdate());
-  VisibleSelection correctedSelection = passedSelection;
-  correctedSelection.updateIfNeeded();
-  return correctedSelection;
+  return createVisibleSelection(passedSelection.asSelection());
 }
 
 void Editor::unappliedEditing(UndoStep* cmd) {

diff --git a/third_party/WebKit/Source/core/editing/Selection.idl b/third_party/WebKit/Source/core/editing/Selection.idl
index fe1fd914..1fc68ff 100644
--- a/third_party/WebKit/Source/core/editing/Selection.idl
+++ b/third_party/WebKit/Source/core/editing/Selection.idl

@@ -40,8 +40,7 @@
     [MeasureAs=SelectionType] readonly attribute DOMString type;
     [MeasureAs=SelectionGetRangeAt, RaisesException] Range getRangeAt(unsigned long index);
     [MeasureAs=SelectionAddRange] void addRange(Range range);
-    // TODO(yoichio): Implement removeRange. crbug.com/391673
-    //void removeRange(Range range);
+    void removeRange(Range range);
     [MeasureAs=SelectionRemoveAllRanges] void removeAllRanges();
     [MeasureAs=SelectionEmpty] void empty();
     [MeasureAs=SelectionCollapse, RaisesException] void collapse(Node? node, optional unsigned long offset = 0);

diff --git a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
index b1bba2d6..c3355e4 100644
--- a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp

@@ -562,24 +562,6 @@
          granularity == DocumentBoundary;
 }
 
-static void setSelectionEnd(VisibleSelection* selection,
-                            const VisiblePosition& newEnd) {
-  if (selection->isBaseFirst()) {
-    selection->setExtent(newEnd);
-    return;
-  }
-  selection->setBase(newEnd);
-}
-
-static void setSelectionStart(VisibleSelection* selection,
-                              const VisiblePosition& newStart) {
-  if (selection->isBaseFirst()) {
-    selection->setBase(newStart);
-    return;
-  }
-  selection->setExtent(newStart);
-}
-
 bool SelectionModifier::modify(EAlteration alter,
                                SelectionDirection direction,
                                TextGranularity granularity) {
@@ -663,8 +645,10 @@
         // starting with the caret in the middle of a word and then
         // word-selecting forward, leaving the caret in the same place where it
         // was, instead of directly selecting to the end of the word.
-        VisibleSelection newSelection = m_selection;
-        newSelection.setExtent(position);
+        const VisibleSelection& newSelection = createVisibleSelection(
+            SelectionInDOMTree::Builder(m_selection.asSelection())
+                .extend(position.deepEquivalent())
+                .build());
         if (m_selection.isBaseFirst() != newSelection.isBaseFirst())
           position = m_selection.visibleBase();
       }
@@ -678,17 +662,39 @@
                .behavior()
                .shouldAlwaysGrowSelectionWhenExtendingToBoundary() ||
           m_selection.isCaret() || !isBoundary(granularity)) {
-        m_selection.setExtent(position);
+        m_selection = createVisibleSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(m_selection.base())
+                .extend(position.deepEquivalent())
+                .setIsDirectional(m_selection.isDirectional())
+                .build());
       } else {
         TextDirection textDirection = directionOfEnclosingBlock();
         if (direction == DirectionForward ||
             (textDirection == TextDirection::kLtr &&
              direction == DirectionRight) ||
             (textDirection == TextDirection::kRtl &&
-             direction == DirectionLeft))
-          setSelectionEnd(&m_selection, position);
-        else
-          setSelectionStart(&m_selection, position);
+             direction == DirectionLeft)) {
+          m_selection = createVisibleSelection(
+              SelectionInDOMTree::Builder()
+                  .collapse(m_selection.isBaseFirst()
+                                ? m_selection.base()
+                                : position.deepEquivalent())
+                  .extend(m_selection.isBaseFirst() ? position.deepEquivalent()
+                                                    : m_selection.extent())
+                  .setIsDirectional(m_selection.isDirectional())
+                  .build());
+        } else {
+          m_selection = createVisibleSelection(
+              SelectionInDOMTree::Builder()
+                  .collapse(m_selection.isBaseFirst()
+                                ? position.deepEquivalent()
+                                : m_selection.base())
+                  .extend(m_selection.isBaseFirst() ? m_selection.extent()
+                                                    : position.deepEquivalent())
+                  .setIsDirectional(m_selection.isDirectional())
+                  .build());
+        }
       }
       break;
   }
@@ -787,9 +793,13 @@
               .setIsDirectional(m_selection.isDirectional())
               .build());
       break;
-    case FrameSelection::AlterationExtend:
-      m_selection.setExtent(result);
+    case FrameSelection::AlterationExtend: {
+      m_selection = createVisibleSelection(SelectionInDOMTree::Builder()
+                                               .collapse(m_selection.base())
+                                               .extend(result.deepEquivalent())
+                                               .build());
       break;
+    }
   }
 
   m_selection.setIsDirectional(shouldAlwaysUseDirectionalSelection(frame()) ||

diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
index 60dde507..32c09d2 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelection.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.cpp

@@ -724,19 +724,6 @@
 }
 
 template <typename Strategy>
-void VisibleSelectionTemplate<Strategy>::updateIfNeeded() {
-  Document* document = m_base.document();
-  if (!document)
-    return;
-  DCHECK(!document->needsLayoutTreeUpdate());
-  const bool hasTrailingWhitespace = m_hasTrailingWhitespace;
-  validate(m_granularity);
-  if (!hasTrailingWhitespace)
-    return;
-  appendTrailingWhitespace();
-}
-
-template <typename Strategy>
 static bool equalSelectionsAlgorithm(
     const VisibleSelectionTemplate<Strategy>& selection1,
     const VisibleSelectionTemplate<Strategy>& selection2) {

diff --git a/third_party/WebKit/Source/core/editing/VisibleSelection.h b/third_party/WebKit/Source/core/editing/VisibleSelection.h
index d5b0fab..d7fa3bb 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelection.h
+++ b/third_party/WebKit/Source/core/editing/VisibleSelection.h

@@ -138,8 +138,6 @@
 
   DECLARE_TRACE();
 
-  void updateIfNeeded();
-
 #ifndef NDEBUG
   void showTreeForThis() const;
 #endif

diff --git a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
index b7b0415..0b2fe466 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp

@@ -479,7 +479,7 @@
   document().updateStyleAndLayout();
 
   // Simulates to restore selection from undo stack.
-  selection.updateIfNeeded();
+  selection = createVisibleSelection(selection.asSelection());
   EXPECT_EQ(Position(sample->firstChild(), 0), selection.start());
 }
 

diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp
index b0924e7..b18b3fd8 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.cpp

@@ -132,15 +132,13 @@
 DocumentMarker::DocumentMarker(MarkerType type,
                                unsigned startOffset,
                                unsigned endOffset,
-                               const String& description,
-                               uint32_t hash)
+                               const String& description)
     : m_type(type),
       m_startOffset(startOffset),
       m_endOffset(endOffset),
       m_details(description.isEmpty()
                     ? nullptr
-                    : DocumentMarkerDescription::create(description)),
-      m_hash(hash) {}
+                    : DocumentMarkerDescription::create(description)) {}
 
 DocumentMarker::DocumentMarker(unsigned startOffset,
                                unsigned endOffset,
@@ -148,8 +146,7 @@
     : m_type(DocumentMarker::TextMatch),
       m_startOffset(startOffset),
       m_endOffset(endOffset),
-      m_details(DocumentMarkerTextMatch::create(activeMatch)),
-      m_hash(0) {}
+      m_details(DocumentMarkerTextMatch::create(activeMatch)) {}
 
 DocumentMarker::DocumentMarker(unsigned startOffset,
                                unsigned endOffset,
@@ -161,15 +158,13 @@
       m_endOffset(endOffset),
       m_details(TextCompositionMarkerDetails::create(underlineColor,
                                                      thick,
-                                                     backgroundColor)),
-      m_hash(0) {}
+                                                     backgroundColor)) {}
 
 DocumentMarker::DocumentMarker(const DocumentMarker& marker)
     : m_type(marker.type()),
       m_startOffset(marker.startOffset()),
       m_endOffset(marker.endOffset()),
-      m_details(marker.details()),
-      m_hash(marker.hash()) {}
+      m_details(marker.details()) {}
 
 void DocumentMarker::shiftOffsets(int delta) {
   m_startOffset += delta;

diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
index 06f90d4..7db49d1 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarker.h

@@ -44,7 +44,6 @@
     SpellingMarkerIndex = 0,
     GrammarMarkerIndex,
     TextMatchMarkerIndex,
-    InvisibleSpellcheckMarkerIndex,
     CompositionMarkerIndex,
     MarkerTypeIndexesCount
   };
@@ -53,7 +52,6 @@
     Spelling = 1 << SpellingMarkerIndex,
     Grammar = 1 << GrammarMarkerIndex,
     TextMatch = 1 << TextMatchMarkerIndex,
-    InvisibleSpellcheck = 1 << InvisibleSpellcheckMarkerIndex,
     Composition = 1 << CompositionMarkerIndex,
   };
 
@@ -80,9 +78,7 @@
 
   class AllMarkers : public MarkerTypes {
    public:
-    AllMarkers()
-        : MarkerTypes(Spelling | Grammar | TextMatch | InvisibleSpellcheck |
-                      Composition) {}
+    AllMarkers() : MarkerTypes(Spelling | Grammar | TextMatch | Composition) {}
   };
 
   class MisspellingMarkers : public MarkerTypes {
@@ -92,15 +88,13 @@
 
   class SpellCheckClientMarkers : public MarkerTypes {
    public:
-    SpellCheckClientMarkers()
-        : MarkerTypes(Spelling | Grammar | InvisibleSpellcheck) {}
+    SpellCheckClientMarkers() : MarkerTypes(Spelling | Grammar) {}
   };
 
   DocumentMarker(MarkerType,
                  unsigned startOffset,
                  unsigned endOffset,
-                 const String& description,
-                 uint32_t hash);
+                 const String& description);
   DocumentMarker(unsigned startOffset, unsigned endOffset, bool activeMatch);
   DocumentMarker(unsigned startOffset,
                  unsigned endOffset,
@@ -113,7 +107,6 @@
   MarkerType type() const { return m_type; }
   unsigned startOffset() const { return m_startOffset; }
   unsigned endOffset() const { return m_endOffset; }
-  uint32_t hash() const { return m_hash; }
 
   const String& description() const;
   bool activeMatch() const;
@@ -145,7 +138,6 @@
   unsigned m_startOffset;
   unsigned m_endOffset;
   Member<DocumentMarkerDetails> m_details;
-  uint32_t m_hash;
 };
 
 using DocumentMarkerVector = HeapVector<Member<DocumentMarker>>;

diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
index a9761462..0db8cc87 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

@@ -67,8 +67,6 @@
       return DocumentMarker::GrammarMarkerIndex;
     case DocumentMarker::TextMatch:
       return DocumentMarker::TextMatchMarkerIndex;
-    case DocumentMarker::InvisibleSpellcheck:
-      return DocumentMarker::InvisibleSpellcheckMarkerIndex;
     case DocumentMarker::Composition:
       return DocumentMarker::CompositionMarkerIndex;
   }
@@ -95,16 +93,15 @@
 void DocumentMarkerController::addMarker(const Position& start,
                                          const Position& end,
                                          DocumentMarker::MarkerType type,
-                                         const String& description,
-                                         uint32_t hash) {
+                                         const String& description) {
   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator markedText(start, end); !markedText.atEnd();
        markedText.advance()) {
-    addMarker(markedText.currentContainer(),
-              DocumentMarker(type, markedText.startOffsetInCurrentContainer(),
-                             markedText.endOffsetInCurrentContainer(),
-                             description, hash));
+    addMarker(
+        markedText.currentContainer(),
+        DocumentMarker(type, markedText.startOffsetInCurrentContainer(),
+                       markedText.endOffsetInCurrentContainer(), description));
   }
 }
 

diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
index 34d0f267..08b2e643 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h

@@ -63,8 +63,7 @@
   void addMarker(const Position& start,
                  const Position& end,
                  DocumentMarker::MarkerType,
-                 const String& description = emptyString,
-                 uint32_t hash = 0);
+                 const String& description = emptyString);
   void addTextMatchMarker(const EphemeralRange&, bool activeMatch);
   void addCompositionMarker(const Position& start,
                             const Position& end,

diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
index ad21bad1..2f92d76 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp

@@ -38,20 +38,14 @@
 
 namespace blink {
 
-SpellCheckRequest::SpellCheckRequest(
-    Range* checkingRange,
-    const String& text,
-    const Vector<uint32_t>& documentMarkersInRange,
-    const Vector<unsigned>& documentMarkerOffsets,
-    int requestNumber)
+SpellCheckRequest::SpellCheckRequest(Range* checkingRange,
+                                     const String& text,
+                                     int requestNumber)
     : m_requester(nullptr),
       m_checkingRange(checkingRange),
       m_rootEditableElement(
           blink::rootEditableElement(*m_checkingRange->startContainer())),
-      m_requestData(unrequestedTextCheckingSequence,
-                    text,
-                    documentMarkersInRange,
-                    documentMarkerOffsets),
+      m_requestData(unrequestedTextCheckingSequence, text),
       m_requestNumber(requestNumber) {
   DCHECK(m_checkingRange);
   DCHECK(m_checkingRange->isConnected());
@@ -91,18 +85,7 @@
 
   Range* checkingRangeObject = createRange(checkingRange);
 
-  const DocumentMarkerVector& markers =
-      checkingRangeObject->ownerDocument().markers().markersInRange(
-          checkingRange, DocumentMarker::SpellCheckClientMarkers());
-  Vector<uint32_t> hashes(markers.size());
-  Vector<unsigned> offsets(markers.size());
-  for (size_t i = 0; i < markers.size(); ++i) {
-    hashes[i] = markers[i]->hash();
-    offsets[i] = markers[i]->startOffset();
-  }
-
-  return new SpellCheckRequest(checkingRangeObject, text, hashes, offsets,
-                               requestNumber);
+  return new SpellCheckRequest(checkingRangeObject, text, requestNumber);
 }
 
 const TextCheckingRequestData& SpellCheckRequest::data() const {

diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h
index b7d819b..4fd4c54 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h

@@ -66,11 +66,7 @@
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  SpellCheckRequest(Range* checkingRange,
-                    const String&,
-                    const Vector<uint32_t>& documentMarkersInRange,
-                    const Vector<unsigned>& documentMarkerOffsets,
-                    int requestNumber);
+  SpellCheckRequest(Range* checkingRange, const String&, int requestNumber);
 
   Member<SpellCheckRequester> m_requester;
   Member<Range> m_checkingRange;

diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
index 1e962464..ac588cc2 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

@@ -76,12 +76,16 @@
 static bool isSpellCheckingEnabledFor(const Position& position) {
   if (position.isNull())
     return false;
-  // TODO(tkent): The following password type check should be done in
-  // HTMLElement::spellcheck(). crbug.com/371567
   if (TextControlElement* textControl = enclosingTextControl(position)) {
-    if (isHTMLInputElement(textControl) &&
-        toHTMLInputElement(textControl)->type() == InputTypeNames::password)
-      return false;
+    if (isHTMLInputElement(textControl)) {
+      HTMLInputElement& input = toHTMLInputElement(*textControl);
+      // TODO(tkent): The following password type check should be done in
+      // HTMLElement::spellcheck(). crbug.com/371567
+      if (input.type() == InputTypeNames::password)
+        return false;
+      if (!input.isFocusedElementInDocument())
+        return false;
+    }
   }
   if (HTMLElement* element =
           Traversal<HTMLElement>::firstAncestorOrSelf(*position.anchorNode())) {
@@ -590,8 +594,7 @@
                       DocumentMarker::MarkerType type,
                       int location,
                       int length,
-                      const String& description,
-                      uint32_t hash) {
+                      const String& description) {
   DCHECK_GT(length, 0);
   DCHECK_GE(location, 0);
   const EphemeralRange& rangeToMark =
@@ -601,8 +604,7 @@
   if (!isSpellCheckingEnabledFor(rangeToMark.endPosition()))
     return;
   document->markers().addMarker(rangeToMark.startPosition(),
-                                rangeToMark.endPosition(), type, description,
-                                hash);
+                                rangeToMark.endPosition(), type, description);
 }
 
 void SpellChecker::markAndReplaceFor(
@@ -691,7 +693,7 @@
           continue;
         addMarker(frame().document(), paragraph.checkingRange(),
                   DocumentMarker::Spelling, resultLocation, resultLength,
-                  result.replacement, result.hash);
+                  result.replacement);
         continue;
 
       case TextDecorationTypeGrammar:
@@ -707,18 +709,9 @@
             continue;
           addMarker(frame().document(), paragraph.checkingRange(),
                     DocumentMarker::Grammar, resultLocation + detail.location,
-                    detail.length, result.replacement, result.hash);
+                    detail.length, result.replacement);
         }
         continue;
-
-      case TextDecorationTypeInvisibleSpellcheck:
-        if (resultLocation < paragraph.checkingStart() ||
-            resultLocation + resultLength > spellingRangeEndOffset)
-          continue;
-        addMarker(frame().document(), paragraph.checkingRange(),
-                  DocumentMarker::InvisibleSpellcheck, resultLocation,
-                  resultLength, result.replacement, result.hash);
-        continue;
     }
     NOTREACHED();
   }

diff --git a/third_party/WebKit/Source/core/frame/Deprecation.cpp b/third_party/WebKit/Source/core/frame/Deprecation.cpp
index 86fb5c4..f5bf16d 100644
--- a/third_party/WebKit/Source/core/frame/Deprecation.cpp
+++ b/third_party/WebKit/Source/core/frame/Deprecation.cpp

@@ -423,6 +423,13 @@
              "https://www.chromestatus.com/features/6680566019653632 for more "
              "details.";
 
+    case UseCounter::SubtleCryptoOnlyStrictSecureContextCheckFailed:
+      return String::format(
+          "Web Crypto API usage inside secure frames with non-secure ancestors "
+          "is deprecated. The API will no longer be exposed in these contexts "
+          "as of %s. See https://www.chromestatus.com/features/5030265697075200"
+          " for more details.", milestoneString(M59));
+
     // Features that aren't deprecated don't have a deprecation message.
     default:
       return String();

diff --git a/third_party/WebKit/Source/core/frame/Frame.cpp b/third_party/WebKit/Source/core/frame/Frame.cpp
index dd7e0fe5..5343878 100644
--- a/third_party/WebKit/Source/core/frame/Frame.cpp
+++ b/third_party/WebKit/Source/core/frame/Frame.cpp

@@ -42,7 +42,6 @@
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/loader/EmptyClients.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 333d17d..5bf6441 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -51,6 +51,7 @@
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Location.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/PerformanceMonitor.h"
@@ -86,7 +87,6 @@
 #include "core/layout/svg/LayoutSVGRoot.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
@@ -1400,16 +1400,17 @@
 FloatSize FrameView::viewportSizeForViewportUnits() const {
   float zoom = frame().pageZoomFactor();
 
-  FloatSize layoutSize;
-
   LayoutViewItem layoutViewItem = this->layoutViewItem();
   if (layoutViewItem.isNull())
-    return layoutSize;
+    return FloatSize();
 
+  FloatSize layoutSize;
   layoutSize.setWidth(layoutViewItem.viewWidth(IncludeScrollbars) / zoom);
   layoutSize.setHeight(layoutViewItem.viewHeight(IncludeScrollbars) / zoom);
 
-  if (RuntimeEnabledFeatures::inertTopControlsEnabled()) {
+  BrowserControls& browserControls = m_frame->host()->browserControls();
+  if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
+      browserControls.permittedState() != WebBrowserControlsHidden) {
     // We use the layoutSize rather than frameRect to calculate viewport units
     // so that we get correct results on mobile where the page is laid out into
     // a rect that may be larger than the viewport (e.g. the 980px fallback
@@ -1417,7 +1418,6 @@
     // be the viewport with browser controls showing, we add the browser
     // controls height, compensating for page scale as well, since we want to
     // use the viewport with browser controls hidden for vh (to match Safari).
-    BrowserControls& browserControls = m_frame->host()->browserControls();
     int viewportWidth = m_frame->host()->visualViewport().size().width();
     if (m_frame->isMainFrame() && layoutSize.width() && viewportWidth) {
       float pageScaleAtLayoutWidth = viewportWidth / layoutSize.width();
@@ -1965,11 +1965,20 @@
   if (!hasViewportConstrainedObjects())
     return;
 
-  // Update sticky position objects which are stuck to the viewport.
+  // Update sticky position objects which are stuck to the viewport. In order to
+  // correctly compute the sticky position offsets the layers must be visited
+  // top-down, so start at the 'root' sticky elements and recurse downwards.
   for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
     LayoutObject* layoutObject = viewportConstrainedObject;
+    if (layoutObject->style()->position() != EPosition::kSticky)
+      continue;
+
     PaintLayer* layer = toLayoutBoxModelObject(layoutObject)->layer();
-    if (layoutObject->style()->position() == EPosition::kSticky) {
+    StickyConstraintsMap constraintsMap = layer->ancestorOverflowLayer()
+                                              ->getScrollableArea()
+                                              ->stickyConstraintsMap();
+    if (constraintsMap.contains(layer) &&
+        !constraintsMap.at(layer).hasAncestorStickyElement()) {
       // TODO(skobes): Resolve circular dependency between scroll offset and
       // compositing state, and remove this disabler. https://crbug.com/420741
       DisableCompositingQueryAsserts disabler;

diff --git a/third_party/WebKit/Source/core/frame/History.cpp b/third_party/WebKit/Source/core/frame/History.cpp
index 05fb85a9..fe2d997a 100644
--- a/third_party/WebKit/Source/core/frame/History.cpp
+++ b/third_party/WebKit/Source/core/frame/History.cpp

@@ -29,9 +29,9 @@
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/HistoryItem.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/Page.h"

diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
index 9d7afb2..85a05ad 100644
--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp

@@ -58,6 +58,7 @@
 #include "core/frame/FrameView.h"
 #include "core/frame/History.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/Navigator.h"
 #include "core/frame/Screen.h"
 #include "core/frame/ScrollToOptions.h"
@@ -70,7 +71,6 @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/DocumentLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/appcache/ApplicationCache.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/CreateWindow.h"

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 6d585396..5c03337 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp

@@ -50,6 +50,7 @@
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/PerformanceMonitor.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
@@ -64,7 +65,6 @@
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/loader/FrameLoadRequest.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
@@ -260,7 +260,7 @@
 
 template class CORE_TEMPLATE_EXPORT Supplement<LocalFrame>;
 
-LocalFrame* LocalFrame::create(FrameLoaderClient* client,
+LocalFrame* LocalFrame::create(LocalFrameClient* client,
                                FrameHost* host,
                                FrameOwner* owner,
                                InterfaceProvider* interfaceProvider,
@@ -438,7 +438,7 @@
 
   client()->willBeDetached();
   // Notify ScriptController that the frame is closing, since its cleanup ends
-  // up calling back to FrameLoaderClient via WindowProxy.
+  // up calling back to LocalFrameClient via WindowProxy.
   script().clearForClose();
   setView(nullptr);
 
@@ -672,9 +672,10 @@
     if (FrameView* view = this->view()) {
       // Update the scroll position when doing a full page zoom, so the content
       // stays in relatively the same position.
-      ScrollOffset scrollOffset = view->getScrollOffset();
+      ScrollableArea* scrollableArea = view->layoutViewportScrollableArea();
+      ScrollOffset scrollOffset = scrollableArea->getScrollOffset();
       float percentDifference = (pageZoomFactor / m_pageZoomFactor);
-      view->setScrollOffset(
+      scrollableArea->setScrollOffset(
           ScrollOffset(scrollOffset.width() * percentDifference,
                        scrollOffset.height() * percentDifference),
           ProgrammaticScroll);
@@ -848,7 +849,7 @@
   return view() && view()->shouldThrottleRendering();
 }
 
-inline LocalFrame::LocalFrame(FrameLoaderClient* client,
+inline LocalFrame::LocalFrame(LocalFrameClient* client,
                               FrameHost* host,
                               FrameOwner* owner,
                               InterfaceProvider* interfaceProvider,
@@ -891,8 +892,8 @@
   page()->animator().scheduleVisualUpdate(this);
 }
 
-FrameLoaderClient* LocalFrame::client() const {
-  return static_cast<FrameLoaderClient*>(Frame::client());
+LocalFrameClient* LocalFrame::client() const {
+  return static_cast<LocalFrameClient*>(Frame::client());
 }
 
 PluginData* LocalFrame::pluginData() const {

diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h
index ed6da879..2336c92 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.h
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.h

@@ -122,6 +122,7 @@
   void printNavigationWarning(const String&) override;
   bool prepareForCommit() override;
   void didChangeVisibilityState() override;
+  WindowProxyManagerBase* getWindowProxyManager() const override;
 
   void detachChildren();
   void documentAttached();
@@ -234,8 +235,6 @@
              InterfaceProvider*,
              InterfaceRegistry*);
 
-  // Internal Frame helper overrides:
-  WindowProxyManagerBase* getWindowProxyManager() const override;
   // Intentionally private to prevent redundant checks when the type is
   // already LocalFrame.
   bool isLocalFrame() const override { return true; }

diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.h b/third_party/WebKit/Source/core/frame/RemoteFrame.h
index 4c108d0..ab54b3d 100644
--- a/third_party/WebKit/Source/core/frame/RemoteFrame.h
+++ b/third_party/WebKit/Source/core/frame/RemoteFrame.h

@@ -41,6 +41,7 @@
   void printNavigationWarning(const String&) override {}
   bool prepareForCommit() override;
   bool shouldClose() override;
+  WindowProxyManagerBase* getWindowProxyManager() const override;
 
   // FIXME: Remove this method once we have input routing in the browser
   // process. See http://crbug.com/339659.
@@ -61,9 +62,6 @@
  private:
   RemoteFrame(RemoteFrameClient*, FrameHost*, FrameOwner*);
 
-  // Internal Frame helper overrides:
-  WindowProxyManagerBase* getWindowProxyManager() const override;
-
   // Intentionally private to prevent redundant checks when the type is
   // already RemoteFrame.
   bool isLocalFrame() const override { return false; }

diff --git a/third_party/WebKit/Source/core/frame/Settings.json5 b/third_party/WebKit/Source/core/frame/Settings.json5
index f72c8b4..c32d7ef 100644
--- a/third_party/WebKit/Source/core/frame/Settings.json5
+++ b/third_party/WebKit/Source/core/frame/Settings.json5

@@ -240,6 +240,11 @@
     },
 
     {
+      name: "embeddedMediaExperienceEnabled",
+      initial: false,
+    },
+
+    {
       name: "scrollAnimatorEnabled",
       initial: true,
     },

diff --git a/third_party/WebKit/Source/core/frame/VisualViewport.cpp b/third_party/WebKit/Source/core/frame/VisualViewport.cpp
index 9203358..d8fa942e 100644
--- a/third_party/WebKit/Source/core/frame/VisualViewport.cpp
+++ b/third_party/WebKit/Source/core/frame/VisualViewport.cpp

@@ -30,11 +30,13 @@
 
 #include "core/frame/VisualViewport.h"
 
+#include <memory>
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/PageScaleConstraints.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/RootFrameViewport.h"
@@ -42,7 +44,6 @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/layout/TextAutosizer.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
@@ -57,7 +58,6 @@
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebScrollbar.h"
 #include "public/platform/WebScrollbarLayer.h"
-#include <memory>
 
 namespace blink {
 

diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
index f9f6bd3c..c343ea4a1 100644
--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

@@ -38,6 +38,7 @@
 #include "core/frame/FrameClient.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/LocalFrameClient.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/CSPDirectiveList.h"
 #include "core/frame/csp/CSPSource.h"
@@ -47,7 +48,6 @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/DocumentLoader.h"
-#include "core/loader/FrameLoaderClient.h"
 #include "core/loader/PingLoader.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/RuntimeEnabledFeatures.h"
@@ -157,15 +157,11 @@
   DCHECK(m_executionContext &&
          m_executionContext->securityContext().getSecurityOrigin());
 
+  setupSelf(*m_executionContext->securityContext().getSecurityOrigin());
 
   // If we're in a Document, set mixed content checking and sandbox
   // flags, then dump all the parsing error messages, then poke at histograms.
   if (Document* document = this->document()) {
-    // We use the origin of the document's base URL in order to deal correctly
-    // with things like 'about:srcdoc' and 'about:blank', which look to their
-    // parents for a reasonable URL.
-    setupSelf(*SecurityOrigin::create(document->baseURL()));
-
     if (m_sandboxMask != SandboxNone) {
       UseCounter::count(document, UseCounter::SandboxViaCSP);
       document->enforceSandboxFlags(m_sandboxMask);
@@ -190,9 +186,6 @@
       if (policy->allowDynamic())
         UseCounter::count(*document, UseCounter::CSPWithStrictDynamic);
     }
-  } else {
-    // If we're not in a document, set up 'self' with the Worker's origin:
-    setupSelf(*m_executionContext->securityContext().getSecurityOrigin());
   }
 
   // We disable 'eval()' even in the case of report-only policies, and rely on
@@ -326,7 +319,7 @@
 }
 
 void ContentSecurityPolicy::reportAccumulatedHeaders(
-    FrameLoaderClient* client) const {
+    LocalFrameClient* client) const {
   // Notify the embedder about headers that have accumulated before the
   // navigation got committed.  See comments in
   // addAndReportPolicyFromHeaderValue for more details and context.

diff --git a/third_party/WebKit/Source/core/frame/csp/SourceListDirectiveTest.cpp b/third_party/WebKit/Source/core/frame/csp/SourceListDirectiveTest.cpp
index 0a596c56..643f57dd 100644
--- a/third_party/WebKit/Source/core/frame/csp/SourceListDirectiveTest.cpp
+++ b/third_party/WebKit/Source/core/frame/csp/SourceListDirectiveTest.cpp

@@ -33,7 +33,6 @@
     KURL secureURL(ParsedURLString, "https://example.test/image.png");
     RefPtr<SecurityOrigin> secureOrigin(SecurityOrigin::create(secureURL));
     document = Document::create();
-    document->setURL(secureURL);
     document->setSecurityOrigin(secureOrigin);
     csp->bindToExecutionContext(document.get());
   }
@@ -42,7 +41,6 @@
     KURL secureURL(ParsedURLString, origin);
     RefPtr<SecurityOrigin> secureOrigin(SecurityOrigin::create(secureURL));
     Document* document = Document::create();
-    document->setURL(secureURL);
     document->setSecurityOrigin(secureOrigin);
     ContentSecurityPolicy* csp = ContentSecurityPolicy::create();
     csp->bindToExecutionContext(document);

diff --git a/third_party/WebKit/Source/core/html/MediaDocument.cpp b/third_party/WebKit/Source/core/html/MediaDocument.cpp
index 5d36b40c..b5bd08e 100644
--- a/third_party/WebKit/Source/core/html/MediaDocument.cpp
+++ b/third_party/WebKit/Source/core/html/MediaDocument.cpp

@@ -27,6 +27,7 @@
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
+#include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/RawDataDocumentParser.h"
 #include "core/dom/shadow/ShadowRoot.h"
@@ -34,6 +35,7 @@
 #include "core/events/EventListener.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLBodyElement.h"
@@ -50,6 +52,7 @@
 #include "core/loader/FrameLoaderClient.h"
 #include "platform/Histogram.h"
 #include "platform/KeyboardCodes.h"
+#include "platform/UserGestureIndicator.h"
 #include "platform/text/PlatformLocale.h"
 
 namespace blink {
@@ -113,6 +116,31 @@
   bool m_clicked;
 };
 
+class MediaLoadedEventListener final : public EventListener {
+  WTF_MAKE_NONCOPYABLE(MediaLoadedEventListener);
+
+ public:
+  static MediaLoadedEventListener* create() {
+    return new MediaLoadedEventListener();
+  }
+
+  bool operator==(const EventListener& other) const override {
+    return this == &other;
+  }
+
+ private:
+  MediaLoadedEventListener() : EventListener(CPPEventListenerType) {}
+
+  void handleEvent(ExecutionContext* context, Event* event) override {
+    HTMLVideoElement* media =
+        static_cast<HTMLVideoElement*>(event->target()->toNode());
+    UserGestureIndicator gesture(
+        DocumentUserGestureToken::create(&media->document()));
+    media->webkitEnterFullscreen();
+    media->play();
+  }
+};
+
 void MediaDocumentParser::createDocumentStructure() {
   DCHECK(document());
   HTMLHtmlElement* rootElement = HTMLHtmlElement::create(*document());
@@ -163,6 +191,17 @@
   HTMLContentElement* content = HTMLContentElement::create(*document());
   div->appendChild(content);
 
+  if (document()->settings() &&
+      document()->settings()->getEmbeddedMediaExperienceEnabled()) {
+    EventListener* listener = MediaLoadedEventListener::create();
+    AddEventListenerOptions options;
+    options.setOnce(true);
+    AddEventListenerOptionsOrBoolean optionsOrBoolean;
+    optionsOrBoolean.setAddEventListenerOptions(options);
+    media->addEventListener(EventTypeNames::loadedmetadata, listener,
+                            optionsOrBoolean);
+  }
+
   if (RuntimeEnabledFeatures::mediaDocumentDownloadButtonEnabled()) {
     HTMLAnchorElement* anchor = HTMLAnchorElement::create(*document());
     anchor->setAttribute(downloadAttr, "");

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
index a4b809f4..99d80457 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp

@@ -4,6 +4,7 @@
 
 #include "core/html/canvas/CanvasAsyncBlobCreator.h"
 
+#include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/fileapi/Blob.h"
@@ -478,8 +479,8 @@
                    WTF::bind(&BlobCallback::handleEvent,
                              wrapPersistent(m_callback.get()), nullptr));
   } else {
-    Blob* blob = nullptr;
-    m_scriptPromiseResolver->reject(blob);
+    m_scriptPromiseResolver->reject(DOMException::create(
+        EncodingError, "Encoding of the source image has failed."));
   }
   // Avoid unwanted retention, see dispose().
   dispose();
@@ -492,10 +493,10 @@
   if (!ImageDataBuffer(m_size, m_data->data())
            .encodeImage("image/webp", quality, m_encodedImage.get())) {
     m_parentFrameTaskRunner->get(TaskType::CanvasBlobSerialization)
-        ->postTask(BLINK_FROM_HERE,
-                   crossThreadBind(&BlobCallback::handleEvent,
-                                   wrapCrossThreadPersistent(m_callback.get()),
-                                   nullptr));
+        ->postTask(
+            BLINK_FROM_HERE,
+            crossThreadBind(&CanvasAsyncBlobCreator::createNullAndReturnResult,
+                            wrapCrossThreadPersistent(this)));
     return;
   }
 

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributes.idl b/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributes.idl
index 5063c92..752714c 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributes.idl
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasContextCreationAttributes.idl

@@ -21,14 +21,28 @@
 //
 // N.B.: Web IDL doesn't support multiple inheritance of dictionaries.
 
+enum CanvasColorSpace {
+    "srgb", // default
+    "rec2020",
+    "p3",
+};
 
-enum CanvasColorSpace { "legacy-srgb", "srgb", "linear-rgb", "rec-2020", "p3"};
+enum CanvasPixelFormat {
+    "8-8-8-8", // default
+    "10-10-10-2",
+    "12-12-12-12",
+    "float16",
+};
 
 [PermissiveDictionaryConversion]
 dictionary CanvasContextCreationAttributes {
     // Canvas 2D attributes
     boolean alpha = true;  // Also used for WebGL.
+    // TODO(crbug.com/637288): Do we keep "legacy-srgb" as the default?
+    // Must decide before shipping.
     [RuntimeEnabled=ExperimentalCanvasFeatures] CanvasColorSpace colorSpace = "legacy-srgb";
+    [RuntimeEnabled=ExperimentalCanvasFeatures] CanvasPixelFormat pixelFormat = "8-8-8-8";
+    [RuntimeEnabled=ExperimentalCanvasFeatures] boolean linearPixelMath = false;
 
     // WebGL attributes
     boolean depth = true;

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
index 5db6d54..77bedfa4 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

@@ -33,10 +33,14 @@
 
 constexpr const char* kLegacyCanvasColorSpaceName = "legacy-srgb";
 constexpr const char* kSRGBCanvasColorSpaceName = "srgb";
-constexpr const char* kLinearRGBCanvasColorSpaceName = "linear-rgb";
-constexpr const char* kRec2020CanvasColorSpaceName = "rec-2020";
+constexpr const char* kRec2020CanvasColorSpaceName = "rec2020";
 constexpr const char* kP3CanvasColorSpaceName = "p3";
 
+constexpr const char* kRGBA8CanvasPixelFormatName = "8-8-8-8";
+constexpr const char* kRGB10A2CanvasPixelFormatName = "10-10-10-2";
+constexpr const char* kRGBA12CanvasPixelFormatName = "12-12-12-12";
+constexpr const char* kF16CanvasPixelFormatName = "float16";
+
 namespace blink {
 
 CanvasRenderingContext::CanvasRenderingContext(
@@ -46,22 +50,34 @@
     : m_canvas(canvas),
       m_offscreenCanvas(offscreenCanvas),
       m_colorSpace(kLegacyCanvasColorSpace),
+      m_pixelFormat(kRGBA8CanvasPixelFormat),
+      m_linearPixelMath(false),
       m_creationAttributes(attrs) {
   if (RuntimeEnabledFeatures::experimentalCanvasFeaturesEnabled() &&
       RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
-    if (m_creationAttributes.colorSpace() == kSRGBCanvasColorSpaceName)
-      m_colorSpace = kSRGBCanvasColorSpace;
-    else if (m_creationAttributes.colorSpace() ==
-             kLinearRGBCanvasColorSpaceName)
-      m_colorSpace = kLinearRGBCanvasColorSpace;
-    else if (m_creationAttributes.colorSpace() == kRec2020CanvasColorSpaceName)
+    // Set the default color space to SRGB and continue
+    m_colorSpace = kSRGBCanvasColorSpace;
+    if (m_creationAttributes.colorSpace() == kRec2020CanvasColorSpaceName)
       m_colorSpace = kRec2020CanvasColorSpace;
     else if (m_creationAttributes.colorSpace() == kP3CanvasColorSpaceName)
       m_colorSpace = kP3CanvasColorSpace;
+
+    // For now, we only support RGBA8 (for SRGB) and F16 (for all). Everything
+    // else falls back to SRGB + RGBA8.
+    if (m_creationAttributes.pixelFormat() == kF16CanvasPixelFormatName) {
+      m_pixelFormat = kF16CanvasPixelFormat;
+      m_linearPixelMath = true;
+    } else {
+      m_colorSpace = kSRGBCanvasColorSpace;
+      m_pixelFormat = kRGBA8CanvasPixelFormat;
+    }
   }
-  // Make m_creationAttributes reflect the effective colorSpace rather than the
-  // requested one
+
+  // Make m_creationAttributes reflect the effective colorSpace, pixelFormat and
+  // linearPixelMath rather than the requested one.
   m_creationAttributes.setColorSpace(colorSpaceAsString());
+  m_creationAttributes.setPixelFormat(pixelFormatAsString());
+  m_creationAttributes.setLinearPixelMath(linearPixelMath());
 }
 
 WTF::String CanvasRenderingContext::colorSpaceAsString() const {
@@ -70,8 +86,6 @@
       return kLegacyCanvasColorSpaceName;
     case kSRGBCanvasColorSpace:
       return kSRGBCanvasColorSpaceName;
-    case kLinearRGBCanvasColorSpace:
-      return kLinearRGBCanvasColorSpaceName;
     case kRec2020CanvasColorSpace:
       return kRec2020CanvasColorSpaceName;
     case kP3CanvasColorSpace:
@@ -81,13 +95,29 @@
   return "";
 }
 
+WTF::String CanvasRenderingContext::pixelFormatAsString() const {
+  switch (m_pixelFormat) {
+    case kRGBA8CanvasPixelFormat:
+      return kRGBA8CanvasPixelFormatName;
+    case kRGB10A2CanvasPixelFormat:
+      return kRGB10A2CanvasPixelFormatName;
+    case kRGBA12CanvasPixelFormat:
+      return kRGBA12CanvasPixelFormatName;
+    case kF16CanvasPixelFormat:
+      return kF16CanvasPixelFormatName;
+  };
+  CHECK(false);
+  return "";
+}
+
 gfx::ColorSpace CanvasRenderingContext::gfxColorSpace() const {
   switch (m_colorSpace) {
     case kLegacyCanvasColorSpace:
-    case kSRGBCanvasColorSpace:
       return gfx::ColorSpace::CreateSRGB();
-    case kLinearRGBCanvasColorSpace:
-      return gfx::ColorSpace::CreateSCRGBLinear();
+    case kSRGBCanvasColorSpace:
+      if (m_pixelFormat == kF16CanvasPixelFormat)
+        return gfx::ColorSpace::CreateSCRGBLinear();
+      return gfx::ColorSpace::CreateSRGB();
     case kRec2020CanvasColorSpace:
       return gfx::ColorSpace(gfx::ColorSpace::PrimaryID::BT2020,
                              gfx::ColorSpace::TransferID::IEC61966_2_1);
@@ -117,14 +147,9 @@
 }
 
 SkColorType CanvasRenderingContext::colorType() const {
-  switch (m_colorSpace) {
-    case kLinearRGBCanvasColorSpace:
-    case kRec2020CanvasColorSpace:
-    case kP3CanvasColorSpace:
-      return kRGBA_F16_SkColorType;
-    default:
-      return kN32_SkColorType;
-  }
+  if (m_pixelFormat == kF16CanvasPixelFormat)
+    return kRGBA_F16_SkColorType;
+  return kN32_SkColorType;
 }
 
 void CanvasRenderingContext::dispose() {

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
index a7bc7ddc..6186c7f 100644
--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h
+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.h

@@ -50,11 +50,17 @@
 enum CanvasColorSpace {
   kLegacyCanvasColorSpace,
   kSRGBCanvasColorSpace,
-  kLinearRGBCanvasColorSpace,
   kRec2020CanvasColorSpace,
   kP3CanvasColorSpace,
 };
 
+enum CanvasPixelFormat {
+  kRGBA8CanvasPixelFormat,
+  kRGB10A2CanvasPixelFormat,
+  kRGBA12CanvasPixelFormat,
+  kF16CanvasPixelFormat,
+};
+
 class CORE_EXPORT CanvasRenderingContext
     : public GarbageCollectedFinalized<CanvasRenderingContext>,
       public ScriptWrappable,
@@ -88,6 +94,10 @@
 
   CanvasColorSpace colorSpace() const { return m_colorSpace; };
   WTF::String colorSpaceAsString() const;
+  CanvasPixelFormat pixelFormat() const { return m_pixelFormat; };
+  WTF::String pixelFormatAsString() const;
+  bool linearPixelMath() const { return m_linearPixelMath; };
+
   // The color space in which the the content should be interpreted by the
   // compositor. This is always defined.
   gfx::ColorSpace gfxColorSpace() const;
@@ -209,6 +219,8 @@
   HashSet<String> m_cleanURLs;
   HashSet<String> m_dirtyURLs;
   CanvasColorSpace m_colorSpace;
+  CanvasPixelFormat m_pixelFormat;
+  bool m_linearPixelMath = false;
   CanvasContextCreationAttributes m_creationAttributes;
   bool m_finalizeFrameScheduled = false;
 };

diff --git a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.idl b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.idl
index 58e5c79..bb39f1c6 100644
--- a/third_party/WebKit/Source/core/html/track/vtt/VTTCue.idl
+++ b/third_party/WebKit/Source/core/html/track/vtt/VTTCue.idl

@@ -33,7 +33,7 @@
 enum DirectionSetting { "" /* horizontal */, "rl", "lr" };
 // enum LineAlignSetting { "start", "middle", "end" };
 // enum PositionAlignSetting { "start", "middle", "end", "auto" };
-enum AlignSetting { "start", "middle", "end", "left", "right" };
+enum AlignSetting { "start", "center", "end", "left", "right" };
 
 [
     Constructor(double startTime, double endTime, DOMString text),

diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
index b2db6fe..21d29b5 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.cpp

@@ -596,13 +596,15 @@
     unsigned long identifier,
     double finishTime,
     bool didFail,
-    int64_t encodedDataLength) {
+    int64_t encodedDataLength,
+    int64_t decodedBodyLength) {
   String requestId = IdentifiersFactory::requestId(identifier);
 
   std::unique_ptr<TracedValue> value = TracedValue::create();
   value->setString("requestId", requestId);
   value->setBoolean("didFail", didFail);
   value->setDouble("encodedDataLength", encodedDataLength);
+  value->setDouble("decodedBodyLength", decodedBodyLength);
   if (finishTime)
     value->setDouble("finishTime", finishTime);
   return value;

diff --git a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
index b120539..b0d6478 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorTraceEvents.h

@@ -218,7 +218,8 @@
 std::unique_ptr<TracedValue> data(unsigned long identifier,
                                   double finishTime,
                                   bool didFail,
-                                  int64_t encodedDataLength);
+                                  int64_t encodedDataLength,
+                                  int64_t decodedBodyLength);
 }
 
 namespace InspectorTimerInstallEvent {

diff --git a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp
index 7e0d22a..e009c7b 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.cpp

@@ -57,7 +57,7 @@
 
 Response InspectorWorkerAgent::disable() {
   if (autoAttachEnabled()) {
-    disconnectFromAllProxies();
+    disconnectFromAllProxies(false);
     m_instrumentingAgents->removeInspectorWorkerAgent(this);
   }
   m_state->setBoolean(WorkerAgentState::autoAttach, false);
@@ -77,7 +77,7 @@
     m_instrumentingAgents->addInspectorWorkerAgent(this);
     connectToAllProxies();
   } else {
-    disconnectFromAllProxies();
+    disconnectFromAllProxies(true);
     m_instrumentingAgents->removeInspectorWorkerAgent(this);
   }
   return Response::OK();
@@ -135,9 +135,12 @@
   }
 }
 
-void InspectorWorkerAgent::disconnectFromAllProxies() {
-  for (auto& idProxy : m_connectedProxies)
+void InspectorWorkerAgent::disconnectFromAllProxies(bool reportToFrontend) {
+  for (auto& idProxy : m_connectedProxies) {
+    if (reportToFrontend)
+      frontend()->detachedFromTarget(idProxy.key);
     idProxy.value->disconnectFromInspector(this);
+  }
   m_connectedProxies.clear();
 }
 

diff --git a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
index 971b562..5728eea 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h
+++ b/third_party/WebKit/Source/core/inspector/InspectorWorkerAgent.h

@@ -71,7 +71,7 @@
  private:
   bool autoAttachEnabled();
   void connectToAllProxies();
-  void disconnectFromAllProxies();
+  void disconnectFromAllProxies(bool reportToFrontend);
   void connectToProxy(WorkerInspectorProxy*, bool waitingForDebugger);
 
   // WorkerInspectorProxy::PageInspector implementation.

diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index 2f08838..e091137 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

@@ -46,6 +46,47 @@
 
 namespace blink {
 
+namespace {
+inline bool isOutOfFlowPositionedWithImplicitHeight(
+    const LayoutBoxModelObject* child) {
+  return child->isOutOfFlowPositioned() &&
+         !child->style()->logicalTop().isAuto() &&
+         !child->style()->logicalBottom().isAuto();
+}
+
+StickyPositionScrollingConstraints* stickyConstraintsForLayoutObject(
+    const LayoutBoxModelObject* obj,
+    const PaintLayer* ancestorOverflowLayer) {
+  if (!obj)
+    return nullptr;
+
+  PaintLayerScrollableArea* scrollableArea =
+      ancestorOverflowLayer->getScrollableArea();
+  auto it = scrollableArea->stickyConstraintsMap().find(obj->layer());
+  if (it == scrollableArea->stickyConstraintsMap().end())
+    return nullptr;
+
+  return &it->value;
+}
+
+// Inclusive of |from|, exclusive of |to|.
+LayoutBoxModelObject* findFirstStickyBetween(LayoutObject* from,
+                                             LayoutObject* to) {
+  LayoutObject* maybeStickyAncestor = from;
+  while (maybeStickyAncestor && maybeStickyAncestor != to) {
+    if (maybeStickyAncestor->isStickyPositioned()) {
+      return toLayoutBoxModelObject(maybeStickyAncestor);
+    }
+
+    maybeStickyAncestor =
+        maybeStickyAncestor->isLayoutInline()
+            ? maybeStickyAncestor->containingBlock()
+            : toLayoutBox(maybeStickyAncestor)->locationContainer();
+  }
+  return nullptr;
+}
+}  // namespace
+
 class FloatStateForStyleChange {
  public:
   static void setWasFloating(LayoutBoxModelObject* boxModelObject,
@@ -662,13 +703,6 @@
   setHorizontalWritingMode(styleToUse.isHorizontalWritingMode());
 }
 
-static inline bool isOutOfFlowPositionedWithImplicitHeight(
-    const LayoutBoxModelObject* child) {
-  return child->isOutOfFlowPositioned() &&
-         !child->style()->logicalTop().isAuto() &&
-         !child->style()->logicalBottom().isAuto();
-}
-
 LayoutBlock* LayoutBoxModelObject::containingBlockForAutoHeightDetection(
     Length logicalHeight) const {
   // For percentage heights: The percentage is calculated with respect to the
@@ -836,14 +870,13 @@
   FloatSize skippedContainersOffset;
   LayoutBlock* containingBlock = this->containingBlock();
   // The location container for boxes is not always the containing block.
-  LayoutBox* locationContainer = isLayoutInline()
-                                     ? containingBlock
-                                     : toLayoutBox(this)->locationContainer();
+  LayoutObject* locationContainer =
+      isLayoutInline() ? container() : toLayoutBox(this)->locationContainer();
   // Skip anonymous containing blocks.
   while (containingBlock->isAnonymous()) {
     containingBlock = containingBlock->containingBlock();
   }
-  MapCoordinatesFlags flags = 0;
+  MapCoordinatesFlags flags = IgnoreStickyOffset;
   skippedContainersOffset =
       toFloatSize(locationContainer
                       ->localToAncestorQuadWithoutTransforms(
@@ -923,6 +956,7 @@
   FloatRect stickyBoxRect =
       isLayoutInline() ? FloatRect(toLayoutInline(this)->linesBoundingBox())
                        : FloatRect(toLayoutBox(this)->frameRect());
+
   FloatRect flippedStickyBoxRect = stickyBoxRect;
   containingBlock->flipForWritingMode(flippedStickyBoxRect);
   FloatPoint stickyLocation =
@@ -941,6 +975,19 @@
                     toFloatSize(stickyLocation),
                 flippedStickyBoxRect.size()));
 
+  // To correctly compute the offsets, the constraints need to know about any
+  // nested position:sticky elements between themselves and their
+  // containingBlock, and between the containingBlock and their scrollAncestor.
+  //
+  // The respective search ranges are [container, containingBlock) and
+  // [containingBlock, scrollAncestor).
+  constraints.setNearestStickyBoxShiftingStickyBox(
+      findFirstStickyBetween(locationContainer, containingBlock));
+  // We cannot use |scrollAncestor| here as it disregards the root
+  // ancestorOverflowLayer(), which we should include.
+  constraints.setNearestStickyBoxShiftingContainingBlock(findFirstStickyBetween(
+      containingBlock, &layer()->ancestorOverflowLayer()->layoutObject()));
+
   // We skip the right or top sticky offset if there is not enough space to
   // honor both the left/right or top/bottom offsets.
   LayoutUnit horizontalOffsets =
@@ -1035,19 +1082,28 @@
   // compositing inputs have been computed?
   if (!ancestorOverflowLayer)
     return LayoutSize();
-  FloatRect constrainingRect = computeStickyConstrainingRect();
-  PaintLayerScrollableArea* scrollableArea =
-      ancestorOverflowLayer->getScrollableArea();
+
+  StickyPositionScrollingConstraints* constraints =
+      stickyConstraintsForLayoutObject(this, ancestorOverflowLayer);
+  if (!constraints)
+    return LayoutSize();
+
+  StickyPositionScrollingConstraints* shiftingStickyBoxConstraints =
+      stickyConstraintsForLayoutObject(
+          constraints->nearestStickyBoxShiftingStickyBox(),
+          ancestorOverflowLayer);
+
+  StickyPositionScrollingConstraints* shiftingContainingBlockConstraints =
+      stickyConstraintsForLayoutObject(
+          constraints->nearestStickyBoxShiftingContainingBlock(),
+          ancestorOverflowLayer);
 
   // The sticky offset is physical, so we can just return the delta computed in
   // absolute coords (though it may be wrong with transforms).
-  // TODO: Force compositing input update if we ask for offset with stale
-  // compositing inputs.
-  if (!scrollableArea->stickyConstraintsMap().contains(layer()))
-    return LayoutSize();
-  return LayoutSize(
-      scrollableArea->stickyConstraintsMap().at(layer()).computeStickyOffset(
-          constrainingRect));
+  FloatRect constrainingRect = computeStickyConstrainingRect();
+  return LayoutSize(constraints->computeStickyOffset(
+      constrainingRect, shiftingStickyBoxConstraints,
+      shiftingContainingBlockConstraints));
 }
 
 LayoutPoint LayoutBoxModelObject::adjustedPositionRelativeTo(

diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObjectTest.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObjectTest.cpp
index 3359eef6..2075455 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObjectTest.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObjectTest.cpp

@@ -328,4 +328,587 @@
                 .x());
 }
 
+// Verifies that the correct sticky-box shifting ancestor is found when
+// computing the sticky constraints. Any such ancestor is the first sticky
+// element between you and your containing block (exclusive).
+//
+// In most cases, this pointer should be null since your parent is normally your
+// containing block. However there are cases where this is not true, including
+// inline blocks and tables. The latter is currently irrelevant since only table
+// cells can be sticky in CSS2.1, but we can test the former.
+TEST_F(LayoutBoxModelObjectTest,
+       StickyPositionFindsCorrectStickyBoxShiftingAncestor) {
+  setBodyInnerHTML(
+      "<style>#stickyOuterDiv { position: sticky; }"
+      "#stickyOuterInline { position: sticky; display: inline; }"
+      "#stickyInnerInline { position: sticky; display: inline; }</style>"
+      "<div id='stickyOuterDiv'><div id='stickyOuterInline'>"
+      "<div id='stickyInnerInline'></div></div></div>");
+
+  LayoutBoxModelObject* stickyOuterDiv =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyOuterDiv"));
+  LayoutBoxModelObject* stickyOuterInline =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyOuterInline"));
+  LayoutBoxModelObject* stickyInnerInline =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyInnerInline"));
+
+  PaintLayerScrollableArea* scrollableArea =
+      stickyOuterDiv->layer()->ancestorOverflowLayer()->getScrollableArea();
+  ASSERT_TRUE(scrollableArea);
+  StickyConstraintsMap constraintsMap = scrollableArea->stickyConstraintsMap();
+
+  ASSERT_TRUE(constraintsMap.contains(stickyOuterDiv->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyOuterInline->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyInnerInline->layer()));
+
+  // The outer block element trivially has no sticky-box shifting ancestor.
+  EXPECT_FALSE(constraintsMap.at(stickyOuterDiv->layer())
+                   .nearestStickyBoxShiftingStickyBox());
+
+  // Neither does the outer inline element, as its parent element is also its
+  // containing block.
+  EXPECT_FALSE(constraintsMap.at(stickyOuterInline->layer())
+                   .nearestStickyBoxShiftingStickyBox());
+
+  // However the inner inline element does have a sticky-box shifting ancestor,
+  // as its containing block is the ancestor block element, not its parent.
+  EXPECT_EQ(stickyOuterInline,
+            constraintsMap.at(stickyInnerInline->layer())
+                .nearestStickyBoxShiftingStickyBox());
+}
+
+// Verifies that the correct containing-block shifting ancestor is found when
+// computing the sticky constraints. Any such ancestor is the first sticky
+// element between your containing block (inclusive) and your ancestor overflow
+// layer (exclusive).
+TEST_F(LayoutBoxModelObjectTest,
+       StickyPositionFindsCorrectContainingBlockShiftingAncestor) {
+  // We make the scroller itself sticky in order to check that elements do not
+  // detect it as their containing-block shifting ancestor.
+  setBodyInnerHTML(
+      "<style>#scroller { overflow-y: scroll; position: sticky; }"
+      "#stickyParent { position: sticky; }"
+      "#stickyChild { position: sticky; }"
+      "#stickyNestedChild { position: sticky; }</style>"
+      "<div id='scroller'><div id='stickyParent'><div id='stickyChild'></div>"
+      "<div><div id='stickyNestedChild'></div></div></div></div>");
+
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyChild"));
+  LayoutBoxModelObject* stickyNestedChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyNestedChild"));
+
+  PaintLayerScrollableArea* scrollableArea =
+      scroller->layer()->getScrollableArea();
+  ASSERT_TRUE(scrollableArea);
+  StickyConstraintsMap constraintsMap = scrollableArea->stickyConstraintsMap();
+
+  ASSERT_FALSE(constraintsMap.contains(scroller->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyParent->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyChild->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyNestedChild->layer()));
+
+  // The outer <div> should not detect the scroller as its containing-block
+  // shifting ancestor.
+  EXPECT_FALSE(constraintsMap.at(stickyParent->layer())
+                   .nearestStickyBoxShiftingContainingBlock());
+
+  // Both inner children should detect the parent <div> as their
+  // containing-block shifting ancestor.
+  EXPECT_EQ(stickyParent,
+            constraintsMap.at(stickyChild->layer())
+                .nearestStickyBoxShiftingContainingBlock());
+  EXPECT_EQ(stickyParent,
+            constraintsMap.at(stickyNestedChild->layer())
+                .nearestStickyBoxShiftingContainingBlock());
+}
+
+// Verifies that the correct containing-block shifting ancestor is found when
+// computing the sticky constraints, in the case where the overflow ancestor is
+// the page itself. This is a special-case version of the test above, as we
+// often treat the root page as special when it comes to scroll logic. It should
+// not make a difference for containing-block shifting ancestor calculations.
+TEST_F(LayoutBoxModelObjectTest,
+       StickyPositionFindsCorrectContainingBlockShiftingAncestorRoot) {
+  setBodyInnerHTML(
+      "<style>#stickyParent { position: sticky; }"
+      "#stickyGrandchild { position: sticky; }</style>"
+      "<div id='stickyParent'><div><div id='stickyGrandchild'></div></div>"
+      "</div>");
+
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyGrandchild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyGrandchild"));
+
+  PaintLayerScrollableArea* scrollableArea =
+      stickyParent->layer()->ancestorOverflowLayer()->getScrollableArea();
+  ASSERT_TRUE(scrollableArea);
+  StickyConstraintsMap constraintsMap = scrollableArea->stickyConstraintsMap();
+
+  ASSERT_TRUE(constraintsMap.contains(stickyParent->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyGrandchild->layer()));
+
+  // The grandchild sticky should detect the parent as its containing-block
+  // shifting ancestor.
+  EXPECT_EQ(stickyParent,
+            constraintsMap.at(stickyGrandchild->layer())
+                .nearestStickyBoxShiftingContainingBlock());
+}
+
+// Verifies that the correct containing-block shifting ancestor is found when
+// computing the sticky constraints, in the case of tables. Tables are unusual
+// because the containing block for all table elements is the <table> itself, so
+// we have to skip over elements to find the correct ancestor.
+TEST_F(LayoutBoxModelObjectTest,
+       StickyPositionFindsCorrectContainingBlockShiftingAncestorTable) {
+  setBodyInnerHTML(
+      "<style>#scroller { overflow-y: scroll; }"
+      "#stickyOuter { position: sticky; }"
+      "#stickyTh { position: sticky; }</style>"
+      "<div id='scroller'><div id='stickyOuter'><table><thead><tr>"
+      "<th id='stickyTh'></th></tr></thead></table></div></div>");
+
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  LayoutBoxModelObject* stickyOuter =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyOuter"));
+  LayoutBoxModelObject* stickyTh =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyTh"));
+
+  PaintLayerScrollableArea* scrollableArea =
+      scroller->layer()->getScrollableArea();
+  ASSERT_TRUE(scrollableArea);
+  StickyConstraintsMap constraintsMap = scrollableArea->stickyConstraintsMap();
+
+  ASSERT_FALSE(constraintsMap.contains(scroller->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyOuter->layer()));
+  ASSERT_TRUE(constraintsMap.contains(stickyTh->layer()));
+
+  // The table cell should detect the outer <div> as its containing-block
+  // shifting ancestor.
+  EXPECT_EQ(stickyOuter,
+            constraintsMap.at(stickyTh->layer())
+                .nearestStickyBoxShiftingContainingBlock());
+}
+
+// Verifies that the calculated position:sticky offsets are correct when we have
+// a simple case of nested sticky elements.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionNested) {
+  setBodyInnerHTML(
+      "<style>#scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px }"
+      "#stickyParent { position: sticky; top: 0; height: 50px; }"
+      "#stickyChild { position: sticky; top: 0; height: 25px; }"
+      "#postPadding { height: 200px }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='stickyParent'>"
+      "<div id='stickyChild'></div></div><div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyChild"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // Both the parent and child sticky divs are attempting to place themselves at
+  // the top of the scrollable area. To achieve this the parent must offset on
+  // the y-axis against its starting position. The child is offset relative to
+  // its parent so should not move at all.
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), stickyChild->stickyPositionOffset());
+
+  stickyParent->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+
+  stickyChild->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), stickyChild->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct when the
+// child has a larger edge constraint value than the parent.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionChildHasLargerTop) {
+  setBodyInnerHTML(
+      "<style>#scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px }"
+      "#stickyParent { position: sticky; top: 0; height: 50px; }"
+      "#stickyChild { position: sticky; top: 25px; height: 25px; }"
+      "#postPadding { height: 200px }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='stickyParent'>"
+      "<div id='stickyChild'></div></div><div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyChild"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // The parent is attempting to place itself at the top of the scrollable area,
+  // whilst the child is attempting to be 25 pixels from the top. To achieve
+  // this both must offset on the y-axis against their starting positions, but
+  // note the child is offset relative to the parent.
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), stickyChild->stickyPositionOffset());
+
+  stickyParent->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+
+  stickyChild->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), stickyChild->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct when the
+// child has a smaller edge constraint value than the parent.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionParentHasLargerTop) {
+  setBodyInnerHTML(
+      "<style>#scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px }"
+      "#stickyParent { position: sticky; top: 25px; height: 50px; }"
+      "#stickyChild { position: sticky; top: 0; height: 25px; }"
+      "#postPadding { height: 200px }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='stickyParent'>"
+      "<div id='stickyChild'></div></div><div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyChild"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // The parent is attempting to place itself 25 pixels from the top of the
+  // scrollable area, whilst the child is attempting to be at the top. However,
+  // the child must stay contained within the parent, so it should be pushed
+  // down to the same height. As always, the child offset is relative.
+  EXPECT_EQ(LayoutSize(0, 75), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), stickyChild->stickyPositionOffset());
+
+  stickyParent->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 75), stickyParent->stickyPositionOffset());
+
+  stickyChild->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 75), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), stickyChild->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct when the
+// child has a large enough edge constraint value to push outside of its parent.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionChildPushingOutsideParent) {
+  setBodyInnerHTML(
+      "<style> #scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px; }"
+      "#stickyParent { position: sticky; top: 0; height: 50px; }"
+      "#stickyChild { position: sticky; top: 50px; height: 25px; }"
+      "#postPadding { height: 200px }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='stickyParent'>"
+      "<div id='stickyChild'></div></div><div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* stickyParent =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyParent"));
+  LayoutBoxModelObject* stickyChild =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyChild"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // The parent is attempting to place itself at the top of the scrollable area,
+  // whilst the child is attempting to be 50 pixels from the top. However, there
+  // is only 25 pixels of space for the child to move into, so it should be
+  // capped by that offset. As always, the child offset is relative.
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), stickyChild->stickyPositionOffset());
+
+  stickyParent->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+
+  stickyChild->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), stickyParent->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), stickyChild->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct in the case
+// of triple nesting. Triple (or more) nesting must be tested as the grandchild
+// sticky must correct both its sticky box constraint rect and its containing
+// block constaint rect.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionTripleNestedDiv) {
+  setBodyInnerHTML(
+      "<style>#scroller { height: 200px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px; }"
+      "#outmostSticky { position: sticky; top: 0; height: 100px; }"
+      "#middleSticky { position: sticky; top: 0; height: 75px; }"
+      "#innerSticky { position: sticky; top: 25px; height: 25px; }"
+      "#postPadding { height: 400px }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='outmostSticky'>"
+      "<div id='middleSticky'><div id='innerSticky'></div></div></div>"
+      "<div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* outmostSticky =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("outmostSticky"));
+  LayoutBoxModelObject* middleSticky =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("middleSticky"));
+  LayoutBoxModelObject* innerSticky =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("innerSticky"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // The grandparent and parent divs are attempting to place themselves at the
+  // top of the scrollable area. The child div is attempting to place itself at
+  // an offset of 25 pixels to the top of the scrollable area. The result of
+  // this sticky offset calculation is quite simple, but internally the child
+  // offset has to offset both its sticky box constraint rect and its containing
+  // block constraint rect.
+  EXPECT_EQ(LayoutSize(0, 50), outmostSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), middleSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerSticky->stickyPositionOffset());
+
+  outmostSticky->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), outmostSticky->stickyPositionOffset());
+
+  middleSticky->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), outmostSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), middleSticky->stickyPositionOffset());
+
+  innerSticky->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 50), outmostSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), middleSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerSticky->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct in the case
+// of tables. Tables are special as the containing block for table elements is
+// always the root level <table>.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionNestedStickyTable) {
+  setBodyInnerHTML(
+      "<style>table { border-collapse: collapse; }"
+      "td, th { height: 25px; width: 25px; padding: 0; }"
+      "#scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px; }"
+      "#stickyDiv { position: sticky; top: 0; height: 200px; }"
+      "#stickyTh { position: sticky; top: 0; }"
+      "#postPadding { height: 200px; }</style>"
+      "<div id='scroller'><div id='prePadding'></div><div id='stickyDiv'>"
+      "<table><thead><tr><th id='stickyTh'></th></tr></thead><tbody><tr><td>"
+      "</td></tr><tr><td></td></tr><tr><td></td></tr><tr><td></td></tr></tbody>"
+      "</table></div><div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* stickyDiv =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyDiv"));
+  LayoutBoxModelObject* stickyTh =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("stickyTh"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 150));
+  ASSERT_EQ(150.0, scrollableArea->scrollPosition().y());
+
+  // All sticky elements are attempting to stick to the top of the scrollable
+  // area. For the root sticky div, this requires an offset. All the other
+  // descendant sticky elements are positioned relatively so don't need offset.
+  EXPECT_EQ(LayoutSize(0, 100), stickyDiv->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 0), stickyTh->stickyPositionOffset());
+
+  // If we now scroll to the point where the overall sticky div starts to move,
+  // the table headers should continue to stick to the top of the scrollable
+  // area until they run out of <table> space to move in.
+
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 275));
+  ASSERT_EQ(275.0, scrollableArea->scrollPosition().y());
+
+  EXPECT_EQ(LayoutSize(0, 200), stickyDiv->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), stickyTh->stickyPositionOffset());
+
+  // Finally, if we scroll so that the table is off the top of the page, the
+  // sticky header should travel as far as it can (i.e. the table height) then
+  // move off the top with it.
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 350));
+  ASSERT_EQ(350.0, scrollableArea->scrollPosition().y());
+
+  EXPECT_EQ(LayoutSize(0, 200), stickyDiv->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 100), stickyTh->stickyPositionOffset());
+
+  stickyDiv->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 200), stickyDiv->stickyPositionOffset());
+
+  stickyTh->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 200), stickyDiv->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 100), stickyTh->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct in the case
+// where a particular position:sticky element is used both as a sticky-box
+// shifting ancestor as well as a containing-block shifting ancestor.
+//
+// This is a rare case that can be replicated by nesting tables so that a sticky
+// cell contains another table that has sticky elements. See the HTML below.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionComplexTableNesting) {
+  setBodyInnerHTML(
+      "<style>table { border-collapse: collapse; }"
+      "td, th { height: 25px; width: 25px; padding: 0; }"
+      "#scroller { height: 100px; width: 100px; overflow-y: auto; }"
+      "#prePadding { height: 50px; }"
+      "#outerStickyTh { height: 50px; position: sticky; top: 0; }"
+      "#innerStickyTh { position: sticky; top: 25px; }"
+      "#postPadding { height: 200px; }</style>"
+      "<div id='scroller'><div id='prePadding'></div>"
+      "<table><thead><tr><th id='outerStickyTh'><table><thead><tr>"
+      "<th id='innerStickyTh'></th></tr></thead><tbody><tr><td></td></tr>"
+      "</tbody></table></th></tr></thead><tbody><tr><td></td></tr><tr><td></td>"
+      "</tr><tr><td></td></tr><tr><td></td></tr></tbody></table>"
+      "<div id='postPadding'></div></div>");
+
+  LayoutBoxModelObject* outerStickyTh =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("outerStickyTh"));
+  LayoutBoxModelObject* innerStickyTh =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("innerStickyTh"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 150));
+  ASSERT_EQ(150.0, scrollableArea->scrollPosition().y());
+
+  EXPECT_EQ(LayoutSize(0, 100), outerStickyTh->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerStickyTh->stickyPositionOffset());
+
+  outerStickyTh->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 100), outerStickyTh->stickyPositionOffset());
+
+  innerStickyTh->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 100), outerStickyTh->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerStickyTh->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct in the case
+// of nested inline elements.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionNestedInlineElements) {
+  setBodyInnerHTML(
+      "<style>#scroller { width: 100px; height: 100px; overflow-y: scroll; }"
+      "#paddingBefore { height: 50px; }"
+      "#outerInline { display: inline; position: sticky; top: 0; }"
+      "#innerInline { display: inline; position: sticky; top: 25px; }"
+      "#paddingAfter { height: 200px; }</style>"
+      "<div id='scroller'><div id='paddingBefore'></div><div id='outerInline'>"
+      "<div id='innerInline'></div></div><div id='paddingAfter'></div></div>");
+
+  LayoutBoxModelObject* outerInline =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("outerInline"));
+  LayoutBoxModelObject* innerInline =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("innerInline"));
+
+  // Scroll the page down.
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 50));
+  ASSERT_EQ(50.0, scrollableArea->scrollPosition().y());
+
+  EXPECT_EQ(LayoutSize(0, 0), outerInline->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerInline->stickyPositionOffset());
+}
+
+// Verifies that the calculated position:sticky offsets are correct in the case
+// of an intermediate position:fixed element.
+TEST_F(LayoutBoxModelObjectTest, StickyPositionNestedFixedPos) {
+  setBodyInnerHTML(
+      "<style>body { margin: 0; }"
+      "#scroller { height: 200px; width: 100px; overflow-y: auto; }"
+      "#outerSticky { position: sticky; top: 0; height: 50px; }"
+      "#fixedDiv { position: fixed; top: 0; left: 300px; height: 100px; "
+      "width: 100px; }"
+      "#innerSticky { position: sticky; top: 25px; height: 25px; }"
+      "#padding { height: 400px }</style>"
+      "<div id='scroller'><div id='outerSticky'><div id='fixedDiv'>"
+      "<div id='innerSticky'></div></div></div><div id='padding'></div></div>");
+
+  LayoutBoxModelObject* outerSticky =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("outerSticky"));
+  LayoutBoxModelObject* innerSticky =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("innerSticky"));
+
+  LayoutBoxModelObject* scroller =
+      toLayoutBoxModelObject(getLayoutObjectByElementId("scroller"));
+  PaintLayerScrollableArea* scrollableArea = scroller->getScrollableArea();
+
+  StickyConstraintsMap constraintsMap = scrollableArea->stickyConstraintsMap();
+  ASSERT_TRUE(constraintsMap.contains(outerSticky->layer()));
+  ASSERT_TRUE(constraintsMap.contains(innerSticky->layer()));
+
+  // The inner sticky should not detect the outer one as any sort of ancestor.
+  EXPECT_FALSE(constraintsMap.at(innerSticky->layer())
+                   .nearestStickyBoxShiftingStickyBox());
+  EXPECT_FALSE(constraintsMap.at(innerSticky->layer())
+                   .nearestStickyBoxShiftingContainingBlock());
+
+  // Scroll the page down.
+  scrollableArea->scrollToAbsolutePosition(
+      FloatPoint(scrollableArea->scrollPosition().x(), 100));
+  ASSERT_EQ(100.0, scrollableArea->scrollPosition().y());
+
+  // TODO(smcgruer): Until http://crbug.com/686164 is fixed, we need to update
+  // the constraints here before calculations will be correct.
+  innerSticky->updateStickyPositionConstraints();
+
+  EXPECT_EQ(LayoutSize(0, 100), outerSticky->stickyPositionOffset());
+  EXPECT_EQ(LayoutSize(0, 25), innerSticky->stickyPositionOffset());
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index ac03b02..6e66dce 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp

@@ -2076,6 +2076,13 @@
   }
 
   LayoutSize containerOffset = offsetFromContainer(container);
+
+  // TODO(smcgruer): This is inefficient. Instead we should avoid including
+  // offsetForInFlowPosition in offsetFromContainer when ignoring sticky.
+  if (mode & IgnoreStickyOffset && isStickyPositioned()) {
+    containerOffset -= toLayoutBoxModelObject(this)->offsetForInFlowPosition();
+  }
+
   if (isLayoutFlowThread()) {
     // So far the point has been in flow thread coordinates (i.e. as if
     // everything in the fragmentation context lived in one tall single column).

diff --git a/third_party/WebKit/Source/core/layout/MapCoordinatesFlags.h b/third_party/WebKit/Source/core/layout/MapCoordinatesFlags.h
index 23b2425..80369349 100644
--- a/third_party/WebKit/Source/core/layout/MapCoordinatesFlags.h
+++ b/third_party/WebKit/Source/core/layout/MapCoordinatesFlags.h

@@ -25,6 +25,10 @@
   // disables view clipping and scroll offset adjustment.
   // TODO(wangxianzhu): Remove this when root-layer-scrolls launches.
   InputIsInFrameCoordinates = 1 << 4,
+
+  // Ignore offset adjustments caused by position:sticky calculations when
+  // walking the chain.
+  IgnoreStickyOffset = 1 << 5,
 };
 typedef unsigned MapCoordinatesFlags;
 

diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index dcbc965..3babc9d 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

@@ -345,6 +345,7 @@
         enclosingIntRect(constraints.scrollContainerRelativeStickyBoxRect());
     webConstraint.scrollContainerRelativeContainingBlockRect = enclosingIntRect(
         constraints.scrollContainerRelativeContainingBlockRect());
+    // TODO(smcgruer): Copy fields for nested sticky in cc (crbug.com/672710)
   }
 
   m_graphicsLayer->setStickyPositionConstraint(webConstraint);

diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp
index d9d504b..a241925f 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinder.cpp

@@ -231,8 +231,21 @@
   // container rather than the enclosing frame.
   if (layer->sticksToViewport())
     return m_layoutView.frameView()->isScrollable();
-  return layer->layoutObject().style()->position() == EPosition::kSticky &&
-         layer->ancestorOverflowLayer()->scrollsOverflow();
+
+  if (layer->layoutObject().style()->position() != EPosition::kSticky)
+    return false;
+
+  // Don't promote nested sticky elements; the compositor can't handle them.
+  // TODO(smcgruer): Add cc nested sticky support (http://crbug.com/672710)
+  PaintLayerScrollableArea* scrollableArea =
+      layer->ancestorOverflowLayer()->getScrollableArea();
+  DCHECK(scrollableArea->stickyConstraintsMap().contains(
+      const_cast<PaintLayer*>(layer)));
+
+  return layer->ancestorOverflowLayer()->scrollsOverflow() &&
+         !scrollableArea->stickyConstraintsMap()
+              .at(const_cast<PaintLayer*>(layer))
+              .hasAncestorStickyElement();
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp
index 49f8ffe7..932784d7 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositingReasonFinderTest.cpp

@@ -271,4 +271,36 @@
       CompositingReasonFinder::requiresCompositingForEffectAnimation(*style));
 }
 
+TEST_F(CompositingReasonFinderTest, DoNotCompositeNestedSticky) {
+  ScopedCompositeFixedPositionForTest compositeFixedPosition(true);
+
+  setBodyInnerHTML(
+      "<style>.scroller { overflow: scroll; height: 200px; width: 100px; }"
+      ".container { height: 500px; }"
+      ".opaque { background-color: white; contain: paint; }"
+      "#outerSticky { height: 50px; position: sticky; top: 0px; }"
+      "#innerSticky { height: 20px; position: sticky; top: 25px; }</style>"
+      "<div class='scroller'>"
+      "  <div class='container'>"
+      "    <div id='outerSticky' class='opaque'>"
+      "      <div id='innerSticky' class='opaque'></div>"
+      "    </div>"
+      "  </div>"
+      "</div>");
+  document().view()->updateAllLifecyclePhases();
+
+  Element* outerSticky = document().getElementById("outerSticky");
+  PaintLayer* outerStickyLayer =
+      toLayoutBoxModelObject(outerSticky->layoutObject())->layer();
+  ASSERT_TRUE(outerStickyLayer);
+
+  Element* innerSticky = document().getElementById("innerSticky");
+  PaintLayer* innerStickyLayer =
+      toLayoutBoxModelObject(innerSticky->layoutObject())->layer();
+  ASSERT_TRUE(innerStickyLayer);
+
+  EXPECT_EQ(PaintsIntoOwnBacking, outerStickyLayer->compositingState());
+  EXPECT_EQ(NotComposited, innerStickyLayer->compositingState());
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
index 050b9bd..06084a6 100644
--- a/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp
+++ b/third_party/WebKit/Source/core/layout/line/InlineFlowBox.cpp

@@ -1161,6 +1161,41 @@
   logicalLayoutOverflow.unite(childLogicalLayoutOverflow);
 }
 
+static void computeGlyphOverflow(
+    InlineTextBox* text,
+    const LineLayoutText& layoutText,
+    GlyphOverflowAndFallbackFontsMap& textBoxDataMap) {
+  HashSet<const SimpleFontData*> fallbackFonts;
+  FloatRect glyphBounds;
+  GlyphOverflow glyphOverflow;
+  float measuredWidth =
+      layoutText.width(text->start(), text->len(), LayoutUnit(),
+                       text->direction(), false, &fallbackFonts, &glyphBounds);
+  const Font& font = layoutText.style()->font();
+  const SimpleFontData* fontData = font.primaryFont();
+  DCHECK(fontData);
+  glyphOverflow.setFromBounds(
+      glyphBounds, fontData ? fontData->getFontMetrics().floatAscent() : 0,
+      fontData ? fontData->getFontMetrics().floatDescent() : 0, measuredWidth);
+  if (!fallbackFonts.isEmpty()) {
+    GlyphOverflowAndFallbackFontsMap::ValueType* it =
+        textBoxDataMap
+            .insert(text, std::make_pair(Vector<const SimpleFontData*>(),
+                                         GlyphOverflow()))
+            .storedValue;
+    DCHECK(it->value.first.isEmpty());
+    copyToVector(fallbackFonts, it->value.first);
+  }
+  if (!glyphOverflow.isApproximatelyZero()) {
+    GlyphOverflowAndFallbackFontsMap::ValueType* it =
+        textBoxDataMap
+            .insert(text, std::make_pair(Vector<const SimpleFontData*>(),
+                                         GlyphOverflow()))
+            .storedValue;
+    it->value.second = glyphOverflow;
+  }
+}
+
 void InlineFlowBox::computeOverflow(
     LayoutUnit lineTop,
     LayoutUnit lineBottom,
@@ -1196,7 +1231,15 @@
       if (rt.isBR())
         continue;
       LayoutRect textBoxOverflow(text->logicalFrameRect());
-      addTextBoxVisualOverflow(text, textBoxDataMap, textBoxOverflow);
+      if (textBoxDataMap.isEmpty()) {
+        // An empty glyph map means that we're computing overflow without
+        // a layout, so calculate the glyph overflow on the fly.
+        GlyphOverflowAndFallbackFontsMap glyphOverflowForText;
+        computeGlyphOverflow(text, rt, glyphOverflowForText);
+        addTextBoxVisualOverflow(text, glyphOverflowForText, textBoxOverflow);
+      } else {
+        addTextBoxVisualOverflow(text, textBoxDataMap, textBoxOverflow);
+      }
       logicalVisualOverflow.unite(textBoxOverflow);
     } else if (curr->getLineLayoutItem().isLayoutInline()) {
       InlineFlowBox* flow = toInlineFlowBox(curr);

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
index 9a7fda3..edc7d660 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

@@ -41,52 +41,46 @@
          child_style.isFloating() || !is_in_parallel_flow;
 }
 
-// Updates the fragment's BFC offset if it's not already set.
-void UpdateFragmentBfcOffset(const NGLogicalOffset& offset,
-                             NGFragmentBuilder* builder) {
-  if (!builder->BfcOffset())
-    builder->SetBfcOffset(offset);
+// Returns max of 2 {@code WTF::Optional} values.
+template <typename T>
+WTF::Optional<T> OptionalMax(const WTF::Optional<T>& value1,
+                             const WTF::Optional<T>& value2) {
+  if (value1 && value2) {
+    return std::max(value1.value(), value2.value());
+  } else if (value1) {
+    return value1;
+  }
+  return value2;
 }
 
-// Adjusts content_size to respect the CSS "clear" property.
-// Picks up the maximum between left/right exclusions and content_size depending
-// on the value of style.clear() property.
-void AdjustToClearance(const std::shared_ptr<NGExclusions>& exclusions,
-                       const ComputedStyle& style,
-                       const NGLogicalOffset& from_offset,
-                       LayoutUnit* content_size) {
-  DCHECK(content_size) << "content_size cannot be null here";
+WTF::Optional<LayoutUnit> GetClearanceOffset(
+    const std::shared_ptr<NGExclusions>& exclusions,
+    const ComputedStyle& style) {
   const NGExclusion* right_exclusion = exclusions->last_right_float;
   const NGExclusion* left_exclusion = exclusions->last_left_float;
 
-  LayoutUnit left_block_end_offset = *content_size;
+  WTF::Optional<LayoutUnit> left_offset;
   if (left_exclusion) {
-    left_block_end_offset = std::max(
-        left_exclusion->rect.BlockEndOffset() - from_offset.block_offset,
-        *content_size);
+    left_offset = left_exclusion->rect.BlockEndOffset();
   }
-  LayoutUnit right_block_end_offset = *content_size;
+  WTF::Optional<LayoutUnit> right_offset;
   if (right_exclusion) {
-    right_block_end_offset = std::max(
-        right_exclusion->rect.BlockEndOffset() - from_offset.block_offset,
-        *content_size);
+    right_offset = right_exclusion->rect.BlockEndOffset();
   }
 
   switch (style.clear()) {
     case EClear::kNone:
-      return;  // nothing to do here.
+      return WTF::nullopt;  // nothing to do here.
     case EClear::kLeft:
-      *content_size = left_block_end_offset;
-      break;
+      return left_offset;
     case EClear::kRight:
-      *content_size = right_block_end_offset;
-      break;
+      return right_offset;
     case EClear::kBoth:
-      *content_size = std::max(left_block_end_offset, right_block_end_offset);
-      break;
+      return OptionalMax<LayoutUnit>(left_offset, right_offset);
     default:
       ASSERT_NOT_REACHED();
   }
+  return WTF::nullopt;
 }
 
 // Creates an exclusion from the fragment that will be placed in the provided
@@ -356,6 +350,18 @@
   return {inline_offset, block_offset};
 }
 
+void NGBlockLayoutAlgorithm::UpdateFragmentBfcOffset(
+    const NGLogicalOffset& offset) {
+  if (!builder_->BfcOffset()) {
+    NGLogicalOffset bfc_offset = offset;
+    if (ConstraintSpace().ClearanceOffset()) {
+      bfc_offset.block_offset = std::max(
+          ConstraintSpace().ClearanceOffset().value(), offset.block_offset);
+    }
+    builder_->SetBfcOffset(bfc_offset);
+  }
+}
+
 RefPtr<NGLayoutResult> NGBlockLayoutAlgorithm::Layout() {
   WTF::Optional<MinAndMaxContentSizes> sizes;
   if (NeedMinAndMaxContentSizes(ConstraintSpace(), Style()))
@@ -417,7 +423,7 @@
   //   border/padding between them.
   if (border_and_padding_.block_start) {
     curr_bfc_offset_.block_offset += curr_margin_strut_.Sum();
-    UpdateFragmentBfcOffset(curr_bfc_offset_, builder_.get());
+    UpdateFragmentBfcOffset(curr_bfc_offset_);
     curr_margin_strut_ = NGMarginStrut();
   }
 
@@ -425,7 +431,7 @@
   // If a new formatting context hits the if branch above then the BFC offset is
   // still {} as the margin strut from the constraint space must also be empty.
   if (ConstraintSpace().IsNewFormattingContext()) {
-    UpdateFragmentBfcOffset(curr_bfc_offset_, builder_.get());
+    UpdateFragmentBfcOffset(curr_bfc_offset_);
     DCHECK_EQ(builder_->BfcOffset().value(), NGLogicalOffset());
     DCHECK_EQ(curr_margin_strut_, NGMarginStrut());
   }
@@ -485,7 +491,7 @@
   // Non-empty blocks always know their position in space:
   if (block_size) {
     curr_bfc_offset_.block_offset += curr_margin_strut_.Sum();
-    UpdateFragmentBfcOffset(curr_bfc_offset_, builder_.get());
+    UpdateFragmentBfcOffset(curr_bfc_offset_);
     PositionPendingFloats(curr_bfc_offset_.block_offset, ConstraintSpace(),
                           builder_.get());
   }
@@ -577,7 +583,7 @@
     bfc_offset.value().block_offset += curr_margin_strut_.Sum();
   }
   if (bfc_offset) {
-    UpdateFragmentBfcOffset(curr_bfc_offset_, builder_.get());
+    UpdateFragmentBfcOffset(curr_bfc_offset_);
     PositionPendingFloats(curr_bfc_offset_.block_offset, ConstraintSpace(),
                           builder_.get());
   }
@@ -799,14 +805,12 @@
   space_builder_->SetFragmentainerSpaceAvailable(space_available);
 
   // Clearance :
-  // - Collapse margins
-  // - Update curr_bfc_offset and parent BFC offset if needed.
-  // - Position all pending floats as position is known now.
-  // TODO(glebl): Fix the use case with clear: left and an intruding right.
-  // https://software.hixie.ch/utilities/js/live-dom-viewer/saved/4847
+  // - *Always* collapse margins and update *container*'s BFC offset.
+  // - Position all pending floats since the fragment's BFC offset is known.
+  // - Set the clearance offset on the constraint space's builder.
   if (current_child_style.clear() != EClear::kNone) {
     curr_bfc_offset_.block_offset += curr_margin_strut_.Sum();
-    UpdateFragmentBfcOffset(curr_bfc_offset_, builder_.get());
+    UpdateFragmentBfcOffset(curr_bfc_offset_);
     // Only collapse margins if it's an adjoining block with clearance.
     if (!content_size_) {
       curr_margin_strut_ = NGMarginStrut();
@@ -814,8 +818,9 @@
     }
     PositionPendingFloats(curr_bfc_offset_.block_offset, ConstraintSpace(),
                           builder_.get());
-    AdjustToClearance(constraint_space_->Exclusions(), current_child_style,
-                      builder_->BfcOffset().value(), &content_size_);
+    WTF::Optional<LayoutUnit> clearance_offset = GetClearanceOffset(
+        constraint_space_->Exclusions(), current_child_style);
+    space_builder_->SetClearanceOffset(clearance_offset);
   }
 
   // Set estimated BFC offset to the next child's constraint space.
@@ -841,5 +846,4 @@
   return space_builder_->ToConstraintSpace(
       FromPlatformWritingMode(current_child_style.getWritingMode()));
 }
-
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
index 4eaeda5..36fa8435 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

@@ -101,6 +101,9 @@
   NGLogicalOffset CalculateLogicalOffset(
       const WTF::Optional<NGLogicalOffset>& known_fragment_offset);
 
+  // Updates the fragment's BFC offset if it's not already set.
+  void UpdateFragmentBfcOffset(const NGLogicalOffset& offset);
+
   NGLogicalOffset GetChildSpaceOffset() const {
     return NGLogicalOffset(border_and_padding_.inline_start, content_size_);
   }

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
index 8b3ba8b..11912e2a 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm_test.cc

@@ -2096,5 +2096,83 @@
               empty_block2->Offset());
 }
 
+// Verifies that we can correctly position blocks with clearance and
+// intruding floats.
+TEST_F(NGBlockLayoutAlgorithmTest,
+       PositionBlocksWithClearanceAndIntrudingFloats) {
+  setBodyInnerHTML(R"HTML(
+    <!DOCTYPE html>
+    <style>
+    body { margin: 80px; }
+    #left-float {
+      background: green;
+      float: left;
+      width: 50px;
+      height: 50px;
+    }
+    #right-float {
+      background: red;
+      float: right;
+      margin: 0 80px 0 10px;
+      width: 50px;
+      height: 80px;
+    }
+    #block1 {
+      outline: purple solid;
+      height: 30px;
+      margin: 130px 0 20px 0;
+    }
+    #zero {
+     margin-top: 30px;
+    }
+    #container-clear {
+      clear: left;
+      outline: orange solid;
+    }
+    #clears-right {
+      clear: right;
+      height: 20px;
+      background: lightblue;
+    }
+    </style>
+
+    <div id="left-float"></div>
+    <div id="right-float"></div>
+    <div id="block1"></div>
+    <div id="container-clear">
+      <div id="zero"></div>
+      <div id="clears-right"></div>
+    </div>
+  )HTML");
+
+  // Run LayoutNG algorithm.
+  RefPtr<NGPhysicalBoxFragment> html_fragment;
+  std::tie(html_fragment, std::ignore) = RunBlockLayoutAlgorithmForElement(
+      document().getElementsByTagName("html")->item(0));
+  auto* body_fragment =
+      toNGPhysicalBoxFragment(html_fragment->Children()[0].get());
+  ASSERT_EQ(2UL, body_fragment->Children().size());
+
+  // Verify #container-clear block
+  auto* container_clear_fragment =
+      toNGPhysicalBoxFragment(body_fragment->Children()[1].get());
+  // 60 = block1's height 30 + std::max(block1's margin 20, zero's margin 30)
+  EXPECT_THAT(NGPhysicalOffset(LayoutUnit(0), LayoutUnit(60)),
+              container_clear_fragment->Offset());
+  Element* container_clear = document().getElementById("container-clear");
+  // 190 = block1's margin 130 + block1's height 30 +
+  //       std::max(block1's margin 20, zero's margin 30)
+  EXPECT_THAT(container_clear->offsetTop(), 190);
+
+  // Verify #clears-right block
+  ASSERT_EQ(2UL, container_clear_fragment->Children().size());
+  auto* clears_right_fragment =
+      toNGPhysicalBoxFragment(container_clear_fragment->Children()[1].get());
+  // 20 = right-float's block end offset (130 + 80) -
+  //      container_clear->offsetTop() 190
+  EXPECT_THAT(NGPhysicalOffset(LayoutUnit(0), LayoutUnit(20)),
+              clears_right_fragment->Offset());
+}
+
 }  // namespace
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
index 0d36522..67a3326 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_node.cc

@@ -32,7 +32,16 @@
 
   DCHECK(layout_box->parent()) << "Should be called on children only.";
 
-  layout_box->setX(fragment.LeftOffset());
+  // LegacyLayout flips vertical-rl horizontal coordinates before paint.
+  // NGLayout flips X location for LegacyLayout compatibility.
+  LayoutBlock* containing_block = layout_box->containingBlock();
+  if (containing_block->styleRef().isFlippedBlocksWritingMode()) {
+    LayoutUnit container_width = containing_block->size().width();
+    layout_box->setX(container_width - fragment.LeftOffset() -
+                     fragment.Width());
+  } else {
+    layout_box->setX(fragment.LeftOffset());
+  }
   layout_box->setY(fragment.TopOffset());
 }
 

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
index 40b7ad0..4cc561f 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.cc

@@ -27,7 +27,8 @@
     bool is_new_fc,
     const NGMarginStrut& margin_strut,
     const NGLogicalOffset& bfc_offset,
-    const std::shared_ptr<NGExclusions>& exclusions)
+    const std::shared_ptr<NGExclusions>& exclusions,
+    const WTF::Optional<LayoutUnit>& clearance_offset)
     : available_size_(available_size),
       percentage_resolution_size_(percentage_resolution_size),
       initial_containing_block_size_(initial_containing_block_size),
@@ -45,7 +46,8 @@
       direction_(static_cast<unsigned>(direction)),
       margin_strut_(margin_strut),
       bfc_offset_(bfc_offset),
-      exclusions_(exclusions) {}
+      exclusions_(exclusions),
+      clearance_offset_(clearance_offset) {}
 
 NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
     const LayoutBox& box) {
@@ -129,12 +131,17 @@
 }
 
 String NGConstraintSpace::ToString() const {
-  return String::format("Offset: %s,%s Size: %sx%s MarginStrut: %s",
-                        bfc_offset_.inline_offset.toString().ascii().data(),
-                        bfc_offset_.block_offset.toString().ascii().data(),
-                        AvailableSize().inline_size.toString().ascii().data(),
-                        AvailableSize().block_size.toString().ascii().data(),
-                        margin_strut_.ToString().ascii().data());
+  return String::format(
+      "Offset: %s,%s Size: %sx%s MarginStrut: %s"
+      " Clearance: %s",
+      bfc_offset_.inline_offset.toString().ascii().data(),
+      bfc_offset_.block_offset.toString().ascii().data(),
+      AvailableSize().inline_size.toString().ascii().data(),
+      AvailableSize().block_size.toString().ascii().data(),
+      margin_strut_.ToString().ascii().data(),
+      clearance_offset_.has_value()
+          ? clearance_offset_.value().toString().ascii().data()
+          : "none");
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
index 9488259c..c9c5576 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space.h

@@ -112,6 +112,10 @@
 
   NGLogicalOffset BfcOffset() const { return bfc_offset_; }
 
+  WTF::Optional<LayoutUnit> ClearanceOffset() const {
+    return clearance_offset_;
+  }
+
   DEFINE_INLINE_VIRTUAL_TRACE() {}
 
   String ToString() const;
@@ -134,7 +138,8 @@
                     bool is_new_fc,
                     const NGMarginStrut& margin_strut,
                     const NGLogicalOffset& bfc_offset,
-                    const std::shared_ptr<NGExclusions>& exclusions);
+                    const std::shared_ptr<NGExclusions>& exclusions,
+                    const WTF::Optional<LayoutUnit>& clearance_offset);
 
   NGPhysicalSize InitialContainingBlockSize() const {
     return initial_containing_block_size_;
@@ -166,6 +171,7 @@
   NGMarginStrut margin_strut_;
   NGLogicalOffset bfc_offset_;
   const std::shared_ptr<NGExclusions> exclusions_;
+  WTF::Optional<LayoutUnit> clearance_offset_;
 };
 
 inline std::ostream& operator<<(std::ostream& stream,

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc
index 3fafff0..e37eece 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc

@@ -71,6 +71,18 @@
   return *this;
 }
 
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetBfcOffset(
+    const NGLogicalOffset& offset) {
+  bfc_offset_ = offset;
+  return *this;
+}
+
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetClearanceOffset(
+    const WTF::Optional<LayoutUnit>& clearance_offset) {
+  clearance_offset_ = clearance_offset;
+  return *this;
+}
+
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeInline(
     bool is_fixed_size_inline) {
   is_fixed_size_inline_ = is_fixed_size_inline;
@@ -153,11 +165,13 @@
     }
   }
 
-  // Exclusions do not pass the formatting context boundary.
+  // Reset things that do not pass the Formatting Context boundary.
   std::shared_ptr<NGExclusions> exclusions(
       is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_);
   NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
   NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_;
+  WTF::Optional<LayoutUnit> clearance_offset =
+      is_new_fc_ ? WTF::nullopt : clearance_offset_;
 
   if (is_in_parallel_flow) {
     return new NGConstraintSpace(
@@ -169,7 +183,7 @@
         is_inline_direction_triggers_scrollbar_,
         is_block_direction_triggers_scrollbar_,
         static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
-        margin_strut, bfc_offset, exclusions);
+        margin_strut, bfc_offset, exclusions, clearance_offset);
   }
   return new NGConstraintSpace(
       out_writing_mode, static_cast<TextDirection>(text_direction_),
@@ -179,7 +193,7 @@
       is_block_direction_triggers_scrollbar_,
       is_inline_direction_triggers_scrollbar_,
       static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
-      margin_strut, bfc_offset, exclusions);
+      margin_strut, bfc_offset, exclusions, clearance_offset);
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h
index 61549af0..526ce6c 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.h

@@ -7,6 +7,7 @@
 
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_units.h"
+#include "wtf/Optional.h"
 
 namespace blink {
 
@@ -46,10 +47,10 @@
 
   NGConstraintSpaceBuilder& SetMarginStrut(const NGMarginStrut& margin_strut);
 
-  NGConstraintSpaceBuilder& SetBfcOffset(const NGLogicalOffset& offset) {
-    bfc_offset_ = offset;
-    return *this;
-  }
+  NGConstraintSpaceBuilder& SetBfcOffset(const NGLogicalOffset& offset);
+
+  NGConstraintSpaceBuilder& SetClearanceOffset(
+      const WTF::Optional<LayoutUnit>& clearance_offset);
 
   // Creates a new constraint space. This may be called multiple times, for
   // example the constraint space will be different for a child which:
@@ -84,6 +85,7 @@
   NGMarginStrut margin_strut_;
   NGLogicalOffset bfc_offset_;
   std::shared_ptr<NGExclusions> exclusions_;
+  WTF::Optional<LayoutUnit> clearance_offset_;
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_units.h b/third_party/WebKit/Source/core/layout/ng/ng_units.h
index cc2dd51..c3ed32c3 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_units.h
+++ b/third_party/WebKit/Source/core/layout/ng/ng_units.h

@@ -120,6 +120,11 @@
   }
 };
 
+CORE_EXPORT inline std::ostream& operator<<(std::ostream& os,
+                                            const NGPhysicalOffset& value) {
+  return os << value.ToString();
+}
+
 struct CORE_EXPORT NGPhysicalSize {
   NGPhysicalSize() {}
   NGPhysicalSize(LayoutUnit width, LayoutUnit height)

diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
index 468915d..9c4a02e 100644
--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

@@ -349,7 +349,7 @@
   ResourceRequest crossOriginRequest(request);
   ResourceLoaderOptions crossOriginOptions(m_resourceLoaderOptions);
 
-  crossOriginRequest.removeCredentials();
+  crossOriginRequest.removeUserAndPassFromURL();
 
   crossOriginRequest.setAllowStoredCredentials(effectiveAllowCredentials() ==
                                                AllowStoredCredentials);

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
index fa4b189..fafeadd 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

@@ -491,10 +491,12 @@
 
 void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier,
                                                  double finishTime,
-                                                 int64_t encodedDataLength) {
-  TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
-               InspectorResourceFinishEvent::data(identifier, finishTime, false,
-                                                  encodedDataLength));
+                                                 int64_t encodedDataLength,
+                                                 int64_t decodedBodyLength) {
+  TRACE_EVENT1(
+      "devtools.timeline", "ResourceFinish", "data",
+      InspectorResourceFinishEvent::data(identifier, finishTime, false,
+                                         encodedDataLength, decodedBodyLength));
   frame()->loader().progress().completeProgress(identifier);
   InspectorInstrumentation::didFinishLoading(frame(), identifier, finishTime,
                                              encodedDataLength);
@@ -508,7 +510,7 @@
                                         bool isInternalRequest) {
   TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                InspectorResourceFinishEvent::data(identifier, 0, true,
-                                                  encodedDataLength));
+                                                  encodedDataLength, 0));
   frame()->loader().progress().completeProgress(identifier);
   InspectorInstrumentation::didFailLoading(frame(), identifier, error);
   // Notification to FrameConsole should come AFTER InspectorInstrumentation
@@ -542,7 +544,8 @@
   if (resource->encodedSize() > 0)
     dispatchDidReceiveData(identifier, 0, resource->encodedSize());
 
-  dispatchDidFinishLoading(identifier, 0, 0);
+  dispatchDidFinishLoading(identifier, 0, 0,
+                           resource->response().decodedBodyLength());
 }
 
 bool FrameFetchContext::shouldLoadNewResource(Resource::Type type) const {

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.h b/third_party/WebKit/Source/core/loader/FrameFetchContext.h
index b88644f..28be0ce 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.h
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.h

@@ -107,7 +107,8 @@
                                int encodedDataLength) override;
   void dispatchDidFinishLoading(unsigned long identifier,
                                 double finishTime,
-                                int64_t encodedDataLength) override;
+                                int64_t encodedDataLength,
+                                int64_t decodedBodyLength) override;
   void dispatchDidFail(unsigned long identifier,
                        const ResourceError&,
                        int64_t encodedDataLength,

diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 1b97f12..23cfc31 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp

@@ -864,6 +864,10 @@
   // If we have a provisional request for a different document, a fragment
   // scroll should cancel it.
   detachDocumentLoader(m_provisionalDocumentLoader);
+
+  // PlzNavigate: A fragment scroll should clear ongoing client navigations.
+  clearNavigationHandledByClient();
+
   if (!m_frame->host())
     return;
   saveScrollState();

diff --git a/third_party/WebKit/Source/core/loader/PingLoader.cpp b/third_party/WebKit/Source/core/loader/PingLoader.cpp
index 6afde83..e1b53f990 100644
--- a/third_party/WebKit/Source/core/loader/PingLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/PingLoader.cpp

@@ -342,8 +342,9 @@
 
 void PingLoaderImpl::didReceiveResponse(const WebURLResponse& response) {
   if (frame()) {
-    TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
-                 InspectorResourceFinishEvent::data(m_identifier, 0, true, 0));
+    TRACE_EVENT1(
+        "devtools.timeline", "ResourceFinish", "data",
+        InspectorResourceFinishEvent::data(m_identifier, 0, true, 0, 0));
     const ResourceResponse& resourceResponse = response.toResourceResponse();
     InspectorInstrumentation::didReceiveResourceResponse(
         frame(), m_identifier, 0, resourceResponse, 0);
@@ -354,9 +355,9 @@
 
 void PingLoaderImpl::didReceiveData(const char*, int dataLength) {
   if (frame()) {
-    TRACE_EVENT1(
-        "devtools.timeline", "ResourceFinish", "data",
-        InspectorResourceFinishEvent::data(m_identifier, 0, true, dataLength));
+    TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
+                 InspectorResourceFinishEvent::data(m_identifier, 0, true,
+                                                    dataLength, 0));
     didFailLoading(frame());
   }
   dispose();
@@ -368,7 +369,7 @@
   if (frame()) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true,
-                                                    encodedDataLength));
+                                                    encodedDataLength, 0));
     didFailLoading(frame());
   }
   dispose();
@@ -380,7 +381,7 @@
   if (frame()) {
     TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
                  InspectorResourceFinishEvent::data(m_identifier, 0, true,
-                                                    encodedDataLength));
+                                                    encodedDataLength, 0));
     didFailLoading(frame());
   }
   dispose();
@@ -388,8 +389,9 @@
 
 void PingLoaderImpl::timeout(TimerBase*) {
   if (frame()) {
-    TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
-                 InspectorResourceFinishEvent::data(m_identifier, 0, true, 0));
+    TRACE_EVENT1(
+        "devtools.timeline", "ResourceFinish", "data",
+        InspectorResourceFinishEvent::data(m_identifier, 0, true, 0, 0));
     didFailLoading(frame());
   }
   dispose();
@@ -523,9 +525,14 @@
                                      ViolationReportType type) {
   ResourceRequest request(reportURL);
   request.setHTTPMethod(HTTPNames::POST);
-  request.setHTTPContentType(type == ContentSecurityPolicyViolationReport
-                                 ? "application/csp-report"
-                                 : "application/json");
+  switch (type) {
+    case ContentSecurityPolicyViolationReport:
+      request.setHTTPContentType("application/csp-report");
+      break;
+    case XSSAuditorViolationReport:
+      request.setHTTPContentType("application/xss-auditor-report");
+      break;
+  }
   request.setHTTPBody(std::move(report));
   finishPingRequestInitialization(request, frame,
                                   WebURLRequest::RequestContextCSPReport);

diff --git a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
index 6f23acd..240f0b2 100644
--- a/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp
+++ b/third_party/WebKit/Source/core/loader/ThreadableLoaderTest.cpp

@@ -239,12 +239,13 @@
     m_securityOrigin = document().getSecurityOrigin();
     m_parentFrameTaskRunners =
         ParentFrameTaskRunners::create(&m_dummyPageHolder->frame());
-    m_workerThread = WTF::wrapUnique(new WorkerThreadForTest(
-        this, *m_mockWorkerReportingProxy, m_parentFrameTaskRunners.get()));
+    m_workerThread = WTF::wrapUnique(
+        new WorkerThreadForTest(this, *m_mockWorkerReportingProxy));
 
     expectWorkerLifetimeReportingCalls();
     m_workerThread->startWithSourceCode(m_securityOrigin.get(),
-                                        "//fake source code");
+                                        "//fake source code",
+                                        m_parentFrameTaskRunners.get());
     m_workerThread->waitForInit();
   }
 

diff --git a/third_party/WebKit/Source/core/loader/resource/ScriptResource.cpp b/third_party/WebKit/Source/core/loader/resource/ScriptResource.cpp
index d3be9db..9e77ec4 100644
--- a/third_party/WebKit/Source/core/loader/resource/ScriptResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/ScriptResource.cpp

@@ -83,8 +83,11 @@
       dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
 }
 
-const String& ScriptResource::script() {
-  DCHECK(isLoaded());
+NOINLINE const String& ScriptResource::script() {
+  // For investigating https://crbug.com/692856.
+  CHECK(isLoaded() || (isLoading() && hasRevalidated()));
+  CHECK(isLoaded() || (isLoading() && isCacheValidator()));
+  CHECK(isLoaded());
 
   if (m_script.isNull() && data()) {
     String script = decodedText();

diff --git a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp
index ea7dd1d0..a41f0c6 100644
--- a/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp
+++ b/third_party/WebKit/Source/core/offscreencanvas/OffscreenCanvas.cpp

@@ -305,7 +305,9 @@
     imageData = this->renderingContext()->toImageData(SnapshotReasonUnknown);
   }
   if (!imageData) {
-    return ScriptPromise();
+    exceptionState.throwDOMException(
+        InvalidStateError, "OffscreenCanvas object has no rendering contexts");
+    return exceptionState.reject(scriptState);
   }
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

diff --git a/third_party/WebKit/Source/core/page/PrintContextTest.cpp b/third_party/WebKit/Source/core/page/PrintContextTest.cpp
index a6612f2..17cad95 100644
--- a/third_party/WebKit/Source/core/page/PrintContextTest.cpp
+++ b/third_party/WebKit/Source/core/page/PrintContextTest.cpp

@@ -37,7 +37,7 @@
   }
 };
 
-class MockCanvas : public PaintCanvas {
+class MockCanvas : public SkCanvas {
  public:
   enum OperationType { DrawRect, DrawPoint };
 
@@ -46,7 +46,7 @@
     SkRect rect;
   };
 
-  MockCanvas() : PaintCanvas(kPageWidth, kPageHeight) {}
+  MockCanvas() : SkCanvas(kPageWidth, kPageHeight) {}
 
   void onDrawAnnotation(const SkRect& rect,
                         const char key[],
@@ -88,7 +88,7 @@
     document().body()->setInnerHTML(bodyContent);
   }
 
-  void printSinglePage(PaintCanvas& canvas) {
+  void printSinglePage(MockCanvas& canvas) {
     IntRect pageRect(0, 0, kPageWidth, kPageHeight);
     printContext().begin(pageRect.width(), pageRect.height());
     document().view()->updateAllLifecyclePhases();

diff --git a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
index d0c2d01..8d547e9e 100644
--- a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.cpp

@@ -7,16 +7,34 @@
 namespace blink {
 
 FloatSize StickyPositionScrollingConstraints::computeStickyOffset(
-    const FloatRect& viewportRect) const {
-  FloatRect boxRect = m_scrollContainerRelativeStickyBoxRect;
+    const FloatRect& viewportRect,
+    const StickyPositionScrollingConstraints* ancestorStickyBoxConstraints,
+    const StickyPositionScrollingConstraints*
+        ancestorContainingBlockConstraints) {
+  // Adjust the constraint rect locations based on our ancestor sticky elements
+  // These adjustments are necessary to avoid double offsetting in the case of
+  // nested sticky elements.
+  FloatSize ancestorStickyBoxOffset =
+      ancestorStickyBoxConstraints
+          ? ancestorStickyBoxConstraints->getTotalStickyBoxStickyOffset()
+          : FloatSize();
+  FloatSize ancestorContainingBlockOffset =
+      ancestorContainingBlockConstraints
+          ? ancestorContainingBlockConstraints
+                ->getTotalContainingBlockStickyOffset()
+          : FloatSize();
+  FloatRect stickyBoxRect = m_scrollContainerRelativeStickyBoxRect;
+  FloatRect containingBlockRect = m_scrollContainerRelativeContainingBlockRect;
+  stickyBoxRect.move(ancestorStickyBoxOffset + ancestorContainingBlockOffset);
+  containingBlockRect.move(ancestorContainingBlockOffset);
+
+  FloatRect boxRect = stickyBoxRect;
 
   if (hasAnchorEdge(AnchorEdgeRight)) {
     float rightLimit = viewportRect.maxX() - m_rightOffset;
-    float rightDelta = std::min<float>(
-        0, rightLimit - m_scrollContainerRelativeStickyBoxRect.maxX());
+    float rightDelta = std::min<float>(0, rightLimit - stickyBoxRect.maxX());
     float availableSpace =
-        std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.x() -
-                               m_scrollContainerRelativeStickyBoxRect.x());
+        std::min<float>(0, containingBlockRect.x() - stickyBoxRect.x());
     if (rightDelta < availableSpace)
       rightDelta = availableSpace;
 
@@ -25,11 +43,9 @@
 
   if (hasAnchorEdge(AnchorEdgeLeft)) {
     float leftLimit = viewportRect.x() + m_leftOffset;
-    float leftDelta = std::max<float>(
-        0, leftLimit - m_scrollContainerRelativeStickyBoxRect.x());
+    float leftDelta = std::max<float>(0, leftLimit - stickyBoxRect.x());
     float availableSpace =
-        std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxX() -
-                               m_scrollContainerRelativeStickyBoxRect.maxX());
+        std::max<float>(0, containingBlockRect.maxX() - stickyBoxRect.maxX());
     if (leftDelta > availableSpace)
       leftDelta = availableSpace;
 
@@ -38,11 +54,9 @@
 
   if (hasAnchorEdge(AnchorEdgeBottom)) {
     float bottomLimit = viewportRect.maxY() - m_bottomOffset;
-    float bottomDelta = std::min<float>(
-        0, bottomLimit - m_scrollContainerRelativeStickyBoxRect.maxY());
+    float bottomDelta = std::min<float>(0, bottomLimit - stickyBoxRect.maxY());
     float availableSpace =
-        std::min<float>(0, m_scrollContainerRelativeContainingBlockRect.y() -
-                               m_scrollContainerRelativeStickyBoxRect.y());
+        std::min<float>(0, containingBlockRect.y() - stickyBoxRect.y());
     if (bottomDelta < availableSpace)
       bottomDelta = availableSpace;
 
@@ -51,18 +65,22 @@
 
   if (hasAnchorEdge(AnchorEdgeTop)) {
     float topLimit = viewportRect.y() + m_topOffset;
-    float topDelta = std::max<float>(
-        0, topLimit - m_scrollContainerRelativeStickyBoxRect.y());
+    float topDelta = std::max<float>(0, topLimit - stickyBoxRect.y());
     float availableSpace =
-        std::max<float>(0, m_scrollContainerRelativeContainingBlockRect.maxY() -
-                               m_scrollContainerRelativeStickyBoxRect.maxY());
+        std::max<float>(0, containingBlockRect.maxY() - stickyBoxRect.maxY());
     if (topDelta > availableSpace)
       topDelta = availableSpace;
 
     boxRect.move(0, topDelta);
   }
 
-  return boxRect.location() - m_scrollContainerRelativeStickyBoxRect.location();
+  FloatSize stickyOffset = boxRect.location() - stickyBoxRect.location();
+
+  m_totalStickyBoxStickyOffset = ancestorStickyBoxOffset + stickyOffset;
+  m_totalContainingBlockStickyOffset =
+      ancestorStickyBoxOffset + ancestorContainingBlockOffset + stickyOffset;
+
+  return stickyOffset;
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h
index e376872..84dab3cc 100644
--- a/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h
+++ b/third_party/WebKit/Source/core/page/scrolling/StickyPositionScrollingConstraints.h

@@ -6,9 +6,12 @@
 #define StickyPositionScrollingConstraints_h
 
 #include "platform/geometry/FloatRect.h"
+#include "platform/geometry/FloatSize.h"
 
 namespace blink {
 
+class LayoutBoxModelObject;
+
 class StickyPositionScrollingConstraints final {
  public:
   enum AnchorEdgeFlags {
@@ -24,7 +27,9 @@
         m_leftOffset(0),
         m_rightOffset(0),
         m_topOffset(0),
-        m_bottomOffset(0) {}
+        m_bottomOffset(0),
+        m_nearestStickyBoxShiftingStickyBox(nullptr),
+        m_nearestStickyBoxShiftingContainingBlock(nullptr) {}
 
   StickyPositionScrollingConstraints(
       const StickyPositionScrollingConstraints& other)
@@ -36,9 +41,25 @@
         m_scrollContainerRelativeContainingBlockRect(
             other.m_scrollContainerRelativeContainingBlockRect),
         m_scrollContainerRelativeStickyBoxRect(
-            other.m_scrollContainerRelativeStickyBoxRect) {}
+            other.m_scrollContainerRelativeStickyBoxRect),
+        m_nearestStickyBoxShiftingStickyBox(
+            other.m_nearestStickyBoxShiftingStickyBox),
+        m_nearestStickyBoxShiftingContainingBlock(
+            other.m_nearestStickyBoxShiftingContainingBlock),
+        m_totalStickyBoxStickyOffset(other.m_totalStickyBoxStickyOffset),
+        m_totalContainingBlockStickyOffset(
+            other.m_totalContainingBlockStickyOffset) {}
 
-  FloatSize computeStickyOffset(const FloatRect& viewportRect) const;
+  FloatSize computeStickyOffset(
+      const FloatRect& viewportRect,
+      const StickyPositionScrollingConstraints* ancestorStickyBoxConstraints,
+      const StickyPositionScrollingConstraints*
+          ancestorContainingBlockConstraints);
+
+  bool hasAncestorStickyElement() const {
+    return m_nearestStickyBoxShiftingStickyBox ||
+           m_nearestStickyBoxShiftingContainingBlock;
+  }
 
   AnchorEdges anchorEdges() const { return m_anchorEdges; }
   bool hasAnchorEdge(AnchorEdgeFlags flag) const {
@@ -71,6 +92,27 @@
     return m_scrollContainerRelativeStickyBoxRect;
   }
 
+  void setNearestStickyBoxShiftingStickyBox(LayoutBoxModelObject* layer) {
+    m_nearestStickyBoxShiftingStickyBox = layer;
+  }
+  LayoutBoxModelObject* nearestStickyBoxShiftingStickyBox() const {
+    return m_nearestStickyBoxShiftingStickyBox;
+  }
+
+  void setNearestStickyBoxShiftingContainingBlock(LayoutBoxModelObject* layer) {
+    m_nearestStickyBoxShiftingContainingBlock = layer;
+  }
+  LayoutBoxModelObject* nearestStickyBoxShiftingContainingBlock() const {
+    return m_nearestStickyBoxShiftingContainingBlock;
+  }
+
+  const FloatSize& getTotalStickyBoxStickyOffset() const {
+    return m_totalStickyBoxStickyOffset;
+  }
+  const FloatSize& getTotalContainingBlockStickyOffset() const {
+    return m_totalContainingBlockStickyOffset;
+  }
+
   bool operator==(const StickyPositionScrollingConstraints& other) const {
     return m_leftOffset == other.m_leftOffset &&
            m_rightOffset == other.m_rightOffset &&
@@ -79,7 +121,14 @@
            m_scrollContainerRelativeContainingBlockRect ==
                other.m_scrollContainerRelativeContainingBlockRect &&
            m_scrollContainerRelativeStickyBoxRect ==
-               other.m_scrollContainerRelativeStickyBoxRect;
+               other.m_scrollContainerRelativeStickyBoxRect &&
+           m_nearestStickyBoxShiftingStickyBox ==
+               other.m_nearestStickyBoxShiftingStickyBox &&
+           m_nearestStickyBoxShiftingContainingBlock ==
+               other.m_nearestStickyBoxShiftingContainingBlock &&
+           m_totalStickyBoxStickyOffset == other.m_totalStickyBoxStickyOffset &&
+           m_totalContainingBlockStickyOffset ==
+               other.m_totalContainingBlockStickyOffset;
   }
 
   bool operator!=(const StickyPositionScrollingConstraints& other) const {
@@ -94,6 +143,26 @@
   float m_bottomOffset;
   FloatRect m_scrollContainerRelativeContainingBlockRect;
   FloatRect m_scrollContainerRelativeStickyBoxRect;
+
+  // In order to properly compute the stickyOffset, we need to know if we have
+  // any sticky ancestors both between ourselves and our containing block and
+  // between our containing block and the viewport. These ancestors are needed
+  // to properly shift our constraining rects with regards to the containing
+  // block and viewport.
+  LayoutBoxModelObject* m_nearestStickyBoxShiftingStickyBox;
+  LayoutBoxModelObject* m_nearestStickyBoxShiftingContainingBlock;
+
+  // For performance we cache our accumulated sticky offset to allow descendant
+  // sticky elements to offset their constraint rects. Because we can either
+  // affect the sticky box constraint rect or the containing block constraint
+  // rect, we need to accumulate both.
+  //
+  // The case where we can affect both the sticky box constraint rect and the
+  // constraining block constriant rect for different sticky descendants is
+  // quite complex. See the StickyPositionComplexTableNesting test in
+  // LayoutBoxModelObjectTest.cpp.
+  FloatSize m_totalStickyBoxStickyOffset;
+  FloatSize m_totalContainingBlockStickyOffset;
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp
index b4a5f0d3..f4a3e11 100644
--- a/third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/BoxPaintInvalidator.cpp

@@ -66,11 +66,11 @@
   if (rightDelta.isEmpty() && bottomDelta.isEmpty())
     return false;
 
-  ObjectPaintInvalidator objectPaintInvalidator(m_box);
-  objectPaintInvalidator.invalidatePaintUsingContainer(
-      *m_context.paintInvalidationContainer, rightDelta, reason);
-  objectPaintInvalidator.invalidatePaintUsingContainer(
-      *m_context.paintInvalidationContainer, bottomDelta, reason);
+  ObjectPaintInvalidatorWithContext objectPaintInvalidator(m_box, m_context);
+  objectPaintInvalidator.invalidatePaintRectangleWithContext(rightDelta,
+                                                             reason);
+  objectPaintInvalidator.invalidatePaintRectangleWithContext(bottomDelta,
+                                                             reason);
   return true;
 }
 

diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
index d8d4210..4e3abb4 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp

@@ -455,15 +455,54 @@
   // the other.
   if (!newVisualRect.contains(oldVisualRect)) {
     LayoutRect invalidationRect = oldVisualRect;
-    invalidatePaintUsingContainer(*m_context.paintInvalidationContainer,
-                                  invalidationRect, reason);
+    invalidatePaintRectangleWithContext(invalidationRect, reason);
 
     if (invalidationRect.contains(newVisualRect))
       return;
   }
 
-  invalidatePaintUsingContainer(*m_context.paintInvalidationContainer,
-                                newVisualRect, reason);
+  invalidatePaintRectangleWithContext(newVisualRect, reason);
+}
+
+bool ObjectPaintInvalidatorWithContext::parentFullyInvalidatedOnSameBacking() {
+  if (!m_object.parent() || !m_context.parentContext)
+    return false;
+
+  if (!isImmediateFullPaintInvalidationReason(
+          m_object.parent()->fullPaintInvalidationReason()))
+    return false;
+
+  // Parent and child should have the same paint invalidation container.
+  if (m_context.parentContext->paintInvalidationContainer !=
+      m_context.paintInvalidationContainer)
+    return false;
+
+  // Both parent and child are contents of the paint invalidation container,
+  // so they are on the same backing.
+  if (m_object.parent() != m_context.paintInvalidationContainer)
+    return true;
+
+  // If the paint invalidation container (i.e. parent) uses composited
+  // scrolling, parent and child might be on different backing (scrolling
+  // container vs scrolling contents).
+  return !m_context.paintInvalidationContainer->usesCompositedScrolling();
+}
+
+void ObjectPaintInvalidatorWithContext::invalidatePaintRectangleWithContext(
+    const LayoutRect& rect,
+    PaintInvalidationReason reason) {
+  if (rect.isEmpty())
+    return;
+
+  // If the parent has fully invalidated and its visual rect covers this object
+  // on the same backing, skip the invalidation.
+  if (parentFullyInvalidatedOnSameBacking() &&
+      (m_context.parentContext->oldVisualRect.contains(rect) ||
+       m_context.parentContext->newVisualRect.contains(rect)))
+    return;
+
+  invalidatePaintUsingContainer(*m_context.paintInvalidationContainer, rect,
+                                reason);
 }
 
 DISABLE_CFI_PERF

diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h
index 61ca4f8..80f339a6 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.h

@@ -112,8 +112,12 @@
                             const LayoutRect& oldVisualRect,
                             const LayoutRect& newVisualRect);
 
+  void invalidatePaintRectangleWithContext(const LayoutRect&,
+                                           PaintInvalidationReason);
+
  private:
   void invalidateSelectionIfNeeded(PaintInvalidationReason);
+  bool parentFullyInvalidatedOnSameBacking();
 
   const PaintInvalidatorContext& m_context;
 };

diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.h b/third_party/WebKit/Source/core/paint/PaintInvalidator.h
index d97b3ff4..ad68294 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.h
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.h

@@ -20,12 +20,13 @@
 struct PaintInvalidatorContext {
   PaintInvalidatorContext(
       const PaintPropertyTreeBuilderContext& treeBuilderContext)
-      : treeBuilderContext(treeBuilderContext) {}
+      : treeBuilderContext(treeBuilderContext), parentContext(nullptr) {}
 
   PaintInvalidatorContext(
       const PaintPropertyTreeBuilderContext& treeBuilderContext,
       const PaintInvalidatorContext& parentContext)
       : treeBuilderContext(treeBuilderContext),
+        parentContext(&parentContext),
         forcedSubtreeInvalidationFlags(
             parentContext.forcedSubtreeInvalidationFlags),
         paintInvalidationContainer(parentContext.paintInvalidationContainer),
@@ -39,6 +40,7 @@
                                                       LayoutRect&) const;
 
   const PaintPropertyTreeBuilderContext& treeBuilderContext;
+  const PaintInvalidatorContext* parentContext;
 
   enum ForcedSubtreeInvalidationFlag {
     ForcedSubtreeInvalidationChecking = 1 << 0,

diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
index 7569593..8e234784 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp

@@ -91,15 +91,12 @@
     if (box.isPositioned())
       clipRects.setPosClipRect(
           intersection(newOverflowClip, clipRects.posClipRect()));
-    if (box.isLayoutView() || box.hasTransformRelatedProperty())
+    if (box.canContainFixedPositionObjects())
       clipRects.setFixedClipRect(
           intersection(newOverflowClip, clipRects.fixedClipRect()));
-    if (box.styleRef().containsPaint()) {
+    if (box.styleRef().containsPaint())
       clipRects.setPosClipRect(
           intersection(newOverflowClip, clipRects.posClipRect()));
-      clipRects.setFixedClipRect(
-          intersection(newOverflowClip, clipRects.fixedClipRect()));
-    }
   }
   if (box.hasClip()) {
     LayoutRect newClip = box.clipRect(offset);

diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
index 848d763..9e1233a 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.cpp

@@ -156,23 +156,17 @@
     const AttributeModificationParams& params) {
   if (params.name == SVGNames::attributeTypeAttr) {
     setAttributeType(params.newValue);
+    animationAttributeChanged();
+    return;
+  }
+  if (params.name == SVGNames::attributeNameAttr) {
+    setAttributeName(constructQualifiedName(*this, params.newValue));
+    animationAttributeChanged();
     return;
   }
   SVGAnimationElement::parseAttribute(params);
 }
 
-void SVGAnimateElement::svgAttributeChanged(const QualifiedName& attrName) {
-  if (attrName == SVGNames::attributeTypeAttr) {
-  } else if (attrName == SVGNames::attributeNameAttr) {
-    setAttributeName(constructQualifiedName(
-        *this, fastGetAttribute(SVGNames::attributeNameAttr)));
-  } else {
-    SVGAnimationElement::svgAttributeChanged(attrName);
-    return;
-  }
-  animationAttributeChanged();
-}
-
 void SVGAnimateElement::resolveTargetProperty() {
   DCHECK(targetElement());
   m_targetProperty = targetElement()->propertyFromAttribute(attributeName());

diff --git a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
index 5f40cd3..6392522 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimateElement.h
+++ b/third_party/WebKit/Source/core/svg/SVGAnimateElement.h

@@ -74,7 +74,6 @@
   bool isAdditive() final;
 
   void parseAttribute(const AttributeModificationParams&) override;
-  void svgAttributeChanged(const QualifiedName&) override;
 
   void setTargetElement(SVGElement*) final;
   void setAttributeName(const QualifiedName&);

diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp
index a282154..1dd30a6 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.cpp

@@ -30,6 +30,8 @@
 
 #include "core/svg/SVGAnimatedPath.h"
 
+#include "core/css/CSSIdentifierValue.h"
+
 namespace blink {
 
 SVGAnimatedPath::SVGAnimatedPath(SVGElement* contextElement,
@@ -42,4 +44,11 @@
 
 SVGAnimatedPath::~SVGAnimatedPath() {}
 
+const CSSValue* SVGAnimatedPath::cssValue() const {
+  const CSSPathValue* pathValue = currentValue()->pathValue();
+  if (pathValue->stylePath()->byteStream().isEmpty())
+    return CSSIdentifierValue::create(CSSValueNone);
+  return pathValue;
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.h b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.h
index 4502c6b..e590453 100644
--- a/third_party/WebKit/Source/core/svg/SVGAnimatedPath.h
+++ b/third_party/WebKit/Source/core/svg/SVGAnimatedPath.h

@@ -47,6 +47,8 @@
     return new SVGAnimatedPath(contextElement, attributeName, cssPropertyId);
   }
 
+  const CSSValue* cssValue() const;
+
  protected:
   SVGAnimatedPath(SVGElement*,
                   const QualifiedName&,

diff --git a/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp b/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp
index 42bd6a8..162c2431 100644
--- a/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGCircleElement.cpp

@@ -83,13 +83,13 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_cx) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyCx,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_cx->cssValue());
   } else if (property == m_cy) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyCy,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_cy->cssValue());
   } else if (property == m_r) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyR,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_r->cssValue());
   } else {
     SVGGeometryElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp b/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
index 7421058..e3c75954 100644
--- a/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGEllipseElement.cpp

@@ -96,16 +96,16 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_cx) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyCx,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_cx->cssValue());
   } else if (property == m_cy) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyCy,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_cy->cssValue());
   } else if (property == m_rx) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyRx,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_rx->cssValue());
   } else if (property == m_ry) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyRy,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_ry->cssValue());
   } else {
     SVGGeometryElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp b/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp
index daf86ff..54a8bd3 100644
--- a/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGForeignObjectElement.cpp

@@ -71,16 +71,16 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_width) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_width->cssValue());
   } else if (property == m_height) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_height->cssValue());
   } else if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else {
     SVGGraphicsElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/SVGGraphicsElement.idl b/third_party/WebKit/Source/core/svg/SVGGraphicsElement.idl
index 773aa51..508de310 100644
--- a/third_party/WebKit/Source/core/svg/SVGGraphicsElement.idl
+++ b/third_party/WebKit/Source/core/svg/SVGGraphicsElement.idl

@@ -33,12 +33,15 @@
 interface SVGGraphicsElement : SVGElement {
     [Measure] readonly attribute SVGAnimatedTransformList transform;
 
-    [MeasureAs=SVGLocatableNearestViewportElement] readonly attribute SVGElement nearestViewportElement;
-    [MeasureAs=SVGLocatableFarthestViewportElement] readonly attribute SVGElement farthestViewportElement;
-
     [ImplementedAs=getBBoxFromJavascript] SVGRect getBBox();
     [ImplementedAs=getCTMFromJavascript] SVGMatrix getCTM();
     [ImplementedAs=getScreenCTMFromJavascript] SVGMatrix getScreenCTM();
+
+    // The following two properties existed on SVGLocatable in SVG
+    // 1.1, but was removed in SVG2.
+    // https://www.w3.org/TR/SVG11/types.html#InterfaceSVGLocatable
+    [MeasureAs=SVGLocatableNearestViewportElement] readonly attribute SVGElement nearestViewportElement;
+    [MeasureAs=SVGLocatableFarthestViewportElement] readonly attribute SVGElement farthestViewportElement;
 };
 
 SVGGraphicsElement implements SVGTests;

diff --git a/third_party/WebKit/Source/core/svg/SVGImageElement.cpp b/third_party/WebKit/Source/core/svg/SVGImageElement.cpp
index 4dc7f4e..99f083ea 100644
--- a/third_party/WebKit/Source/core/svg/SVGImageElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGImageElement.cpp

@@ -91,16 +91,16 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_width) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_width->cssValue());
   } else if (property == m_height) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_height->cssValue());
   } else if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else {
     SVGGraphicsElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
index eadc802..11a3e61 100644
--- a/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGMaskElement.cpp

@@ -94,16 +94,16 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else if (property == m_width) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_width->cssValue());
   } else if (property == m_height) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_height->cssValue());
   } else {
     SVGElement::collectStyleForPresentationAttribute(name, value, style);

diff --git a/third_party/WebKit/Source/core/svg/SVGPathElement.cpp b/third_party/WebKit/Source/core/svg/SVGPathElement.cpp
index c2bd58a4..481e10e 100644
--- a/third_party/WebKit/Source/core/svg/SVGPathElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGPathElement.cpp

@@ -20,7 +20,6 @@
 
 #include "core/svg/SVGPathElement.h"
 
-#include "core/css/CSSIdentifierValue.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/layout/svg/LayoutSVGPath.h"
 #include "core/svg/SVGMPathElement.h"
@@ -120,14 +119,8 @@
     // geometry sharing.
     if (const SVGElement* element = correspondingElement())
       path = toSVGPathElement(element)->path();
-
-    CSSPathValue* pathValue = path->currentValue()->pathValue();
-    if (pathValue->stylePath()->byteStream().isEmpty()) {
-      addPropertyToPresentationAttributeStyle(
-          style, CSSPropertyD, CSSIdentifierValue::create(CSSValueNone));
-      return;
-    }
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyD, pathValue);
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
+                                            path->cssValue());
     return;
   }
   SVGGeometryElement::collectStyleForPresentationAttribute(name, value, style);

diff --git a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
index 4320bcb..0d7360d 100644
--- a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp

@@ -122,22 +122,22 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else if (property == m_width) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_width->cssValue());
   } else if (property == m_height) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_height->cssValue());
   } else if (property == m_rx) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyRx,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_rx->cssValue());
   } else if (property == m_ry) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyRy,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_ry->cssValue());
   } else {
     SVGGeometryElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp b/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp
index 5cdb55aa..eec5eb4 100644
--- a/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGSVGElement.cpp

@@ -230,18 +230,18 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else if (isOutermostSVGSVGElement() &&
              (property == m_width || property == m_height)) {
     if (property == m_width) {
-      addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+      addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                               m_width->cssValue());
     } else if (property == m_height) {
-      addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+      addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                               m_height->cssValue());
     }
   } else {

diff --git a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
index 947e974..9d99cfd4 100644
--- a/third_party/WebKit/Source/core/svg/SVGUseElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGUseElement.cpp

@@ -180,10 +180,10 @@
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
   if (property == m_x) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_x->cssValue());
   } else if (property == m_y) {
-    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+    addPropertyToPresentationAttributeStyle(style, property->cssPropertyId(),
                                             m_y->cssValue());
   } else {
     SVGGraphicsElement::collectStyleForPresentationAttribute(name, value,

diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
index b7f10aa..cbf3a6d 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

@@ -124,15 +124,10 @@
   m_animation->handleConditionEvent(event, m_condition);
 }
 
-void SVGSMILElement::Condition::setEventListener(
-    ConditionEventListener* eventListener) {
-  m_eventListener = eventListener;
-}
-
 SVGSMILElement::Condition::Condition(Type type,
                                      BeginOrEnd beginOrEnd,
-                                     const String& baseID,
-                                     const String& name,
+                                     const AtomicString& baseID,
+                                     const AtomicString& name,
                                      SMILTime offset,
                                      int repeat)
     : m_type(type),
@@ -142,6 +137,76 @@
       m_offset(offset),
       m_repeat(repeat) {}
 
+SVGSMILElement::Condition::~Condition() = default;
+
+DEFINE_TRACE(SVGSMILElement::Condition) {
+  visitor->trace(m_syncBase);
+  visitor->trace(m_eventListener);
+}
+
+void SVGSMILElement::Condition::connectSyncBase(SVGSMILElement& timedElement) {
+  DCHECK(!m_baseID.isEmpty());
+  Element* element = timedElement.treeScope().getElementById(m_baseID);
+  if (!element || !isSVGSMILElement(*element)) {
+    m_syncBase = nullptr;
+    return;
+  }
+  m_syncBase = toSVGSMILElement(element);
+  m_syncBase->addSyncBaseDependent(timedElement);
+}
+
+void SVGSMILElement::Condition::disconnectSyncBase(
+    SVGSMILElement& timedElement) {
+  if (!m_syncBase)
+    return;
+  m_syncBase->removeSyncBaseDependent(timedElement);
+  m_syncBase = nullptr;
+}
+
+SVGElement* SVGSMILElement::Condition::lookupEventBase(
+    SVGSMILElement& timedElement) const {
+  Element* eventBase = m_baseID.isEmpty()
+                           ? timedElement.targetElement()
+                           : timedElement.treeScope().getElementById(m_baseID);
+  if (!eventBase || !eventBase->isSVGElement())
+    return nullptr;
+  return toSVGElement(eventBase);
+}
+
+void SVGSMILElement::Condition::connectEventBase(SVGSMILElement& timedElement) {
+  DCHECK(!m_syncBase);
+  SVGElement* eventBase = lookupEventBase(timedElement);
+  if (!eventBase) {
+    if (m_baseID.isEmpty())
+      return;
+    SVGTreeScopeResources& treeScopeResources =
+        timedElement.treeScope().ensureSVGTreeScopedResources();
+    if (!treeScopeResources.isElementPendingResource(timedElement, m_baseID))
+      treeScopeResources.addPendingResource(m_baseID, timedElement);
+    return;
+  }
+  DCHECK(!m_eventListener);
+  m_eventListener = ConditionEventListener::create(&timedElement, this);
+  eventBase->addEventListener(m_name, m_eventListener, false);
+  timedElement.addReferenceTo(eventBase);
+}
+
+void SVGSMILElement::Condition::disconnectEventBase(
+    SVGSMILElement& timedElement) {
+  DCHECK(!m_syncBase);
+  if (!m_eventListener)
+    return;
+  // Note: It's a memory optimization to try to remove our condition event
+  // listener, but it's not guaranteed to work, since we have no guarantee that
+  // we will be able to find our condition's original eventBase. So, we also
+  // have to disconnect ourselves from our condition event listener, in case it
+  // later fires.
+  if (SVGElement* eventBase = lookupEventBase(timedElement))
+    eventBase->removeEventListener(m_name, m_eventListener, false);
+  m_eventListener->disconnectAnimation();
+  m_eventListener = nullptr;
+}
+
 SVGSMILElement::SVGSMILElement(const QualifiedName& tagName, Document& doc)
     : SVGElement(tagName, doc),
       SVGTests(this),
@@ -413,7 +478,8 @@
   }
 
   m_conditions.push_back(
-      Condition::create(type, beginOrEnd, baseID, nameString, offset, repeat));
+      Condition::create(type, beginOrEnd, AtomicString(baseID),
+                        AtomicString(nameString), offset, repeat));
 
   if (type == Condition::EventBase && beginOrEnd == End)
     m_hasEndEventConditions = true;
@@ -454,16 +520,24 @@
       parseBeginOrEnd(fastGetAttribute(SVGNames::endAttr), End);
     }
     parseBeginOrEnd(value.getString(), Begin);
-    if (isConnected())
+    if (isConnected()) {
       connectSyncBaseConditions();
+      connectEventBaseConditions();
+      beginListChanged(elapsed());
+    }
+    animationAttributeChanged();
   } else if (name == SVGNames::endAttr) {
     if (!m_conditions.isEmpty()) {
       clearConditions();
       parseBeginOrEnd(fastGetAttribute(SVGNames::beginAttr), Begin);
     }
     parseBeginOrEnd(value.getString(), End);
-    if (isConnected())
+    if (isConnected()) {
       connectSyncBaseConditions();
+      connectEventBaseConditions();
+      endListChanged(elapsed());
+    }
+    animationAttributeChanged();
   } else if (name == SVGNames::onbeginAttr) {
     setAttributeEventListener(
         EventTypeNames::beginEvent,
@@ -500,14 +574,6 @@
     buildPendingResource();
     if (m_targetElement)
       clearAnimatedType();
-  } else if (attrName == SVGNames::beginAttr || attrName == SVGNames::endAttr) {
-    if (isConnected()) {
-      connectEventBaseConditions();
-      if (attrName == SVGNames::beginAttr)
-        beginListChanged(elapsed());
-      else if (attrName == SVGNames::endAttr)
-        endListChanged(elapsed());
-    }
   } else {
     SVGElement::svgAttributeChanged(attrName);
     return;
@@ -516,34 +582,13 @@
   animationAttributeChanged();
 }
 
-inline SVGElement* SVGSMILElement::eventBaseFor(const Condition& condition) {
-  Element* eventBase =
-      condition.baseID().isEmpty()
-          ? targetElement()
-          : treeScope().getElementById(AtomicString(condition.baseID()));
-  if (eventBase && eventBase->isSVGElement())
-    return toSVGElement(eventBase);
-  return nullptr;
-}
-
 void SVGSMILElement::connectSyncBaseConditions() {
   if (m_syncBaseConditionsConnected)
     disconnectSyncBaseConditions();
   m_syncBaseConditionsConnected = true;
-  for (unsigned n = 0; n < m_conditions.size(); ++n) {
-    Condition* condition = m_conditions[n].get();
-    if (condition->getType() == Condition::Syncbase) {
-      ASSERT(!condition->baseID().isEmpty());
-      Element* element =
-          treeScope().getElementById(AtomicString(condition->baseID()));
-      if (!element || !isSVGSMILElement(*element)) {
-        condition->setSyncBase(0);
-        continue;
-      }
-      SVGSMILElement* svgSMILElement = toSVGSMILElement(element);
-      condition->setSyncBase(svgSMILElement);
-      svgSMILElement->addSyncBaseDependent(this);
-    }
+  for (Condition* condition : m_conditions) {
+    if (condition->getType() == Condition::Syncbase)
+      condition->connectSyncBase(*this);
   }
 }
 
@@ -551,63 +596,24 @@
   if (!m_syncBaseConditionsConnected)
     return;
   m_syncBaseConditionsConnected = false;
-  for (unsigned n = 0; n < m_conditions.size(); ++n) {
-    Condition* condition = m_conditions[n].get();
-    if (condition->getType() == Condition::Syncbase) {
-      if (condition->syncBase())
-        condition->syncBase()->removeSyncBaseDependent(this);
-      condition->setSyncBase(0);
-    }
+  for (Condition* condition : m_conditions) {
+    if (condition->getType() == Condition::Syncbase)
+      condition->disconnectSyncBase(*this);
   }
 }
 
 void SVGSMILElement::connectEventBaseConditions() {
   disconnectEventBaseConditions();
-  for (unsigned n = 0; n < m_conditions.size(); ++n) {
-    Condition* condition = m_conditions[n].get();
-    if (condition->getType() == Condition::EventBase) {
-      ASSERT(!condition->syncBase());
-      SVGElement* eventBase = eventBaseFor(*condition);
-      if (!eventBase) {
-        if (!condition->baseID().isEmpty() &&
-            !treeScope()
-                 .ensureSVGTreeScopedResources()
-                 .isElementPendingResource(*this,
-                                           AtomicString(condition->baseID()))) {
-          treeScope().ensureSVGTreeScopedResources().addPendingResource(
-              AtomicString(condition->baseID()), *this);
-        }
-        continue;
-      }
-      ASSERT(!condition->eventListener());
-      condition->setEventListener(
-          ConditionEventListener::create(this, condition));
-      eventBase->addEventListener(AtomicString(condition->name()),
-                                  condition->eventListener(), false);
-      addReferenceTo(eventBase);
-    }
+  for (Condition* condition : m_conditions) {
+    if (condition->getType() == Condition::EventBase)
+      condition->connectEventBase(*this);
   }
 }
 
 void SVGSMILElement::disconnectEventBaseConditions() {
-  for (unsigned n = 0; n < m_conditions.size(); ++n) {
-    Condition* condition = m_conditions[n].get();
-    if (condition->getType() == Condition::EventBase) {
-      ASSERT(!condition->syncBase());
-      if (!condition->eventListener())
-        continue;
-      // Note: It's a memory optimization to try to remove our condition
-      // event listener, but it's not guaranteed to work, since we have
-      // no guarantee that eventBaseFor() will be able to find our condition's
-      // original eventBase. So, we also have to disconnect ourselves from
-      // our condition event listener, in case it later fires.
-      SVGElement* eventBase = eventBaseFor(*condition);
-      if (eventBase)
-        eventBase->removeEventListener(AtomicString(condition->name()),
-                                       condition->eventListener(), false);
-      condition->eventListener()->disconnectAnimation();
-      condition->setEventListener(nullptr);
-    }
+  for (Condition* condition : m_conditions) {
+    if (condition->getType() == Condition::EventBase)
+      condition->disconnectEventBase(*this);
   }
 }
 
@@ -1183,26 +1189,25 @@
     return;
 
   for (SVGSMILElement* element : m_syncBaseDependents)
-    element->createInstanceTimesFromSyncbase(this);
+    element->createInstanceTimesFromSyncbase(*this);
 
   loopBreaker.erase(this);
 }
 
-void SVGSMILElement::createInstanceTimesFromSyncbase(SVGSMILElement* syncBase) {
+void SVGSMILElement::createInstanceTimesFromSyncbase(SVGSMILElement& syncBase) {
   // FIXME: To be really correct, this should handle updating exising interval
   // by changing the associated times instead of creating new ones.
-  for (unsigned n = 0; n < m_conditions.size(); ++n) {
-    Condition* condition = m_conditions[n].get();
+  for (Condition* condition : m_conditions) {
     if (condition->getType() == Condition::Syncbase &&
-        condition->syncBase() == syncBase) {
+        condition->syncBaseEquals(syncBase)) {
       ASSERT(condition->name() == "begin" || condition->name() == "end");
       // No nested time containers in SVG, no need for crazy time space
       // conversions. Phew!
       SMILTime time = 0;
       if (condition->name() == "begin")
-        time = syncBase->m_interval.begin + condition->offset();
+        time = syncBase.m_interval.begin + condition->offset();
       else
-        time = syncBase->m_interval.end + condition->offset();
+        time = syncBase.m_interval.end + condition->offset();
       if (!time.isFinite())
         continue;
       SMILTime elapsed = this->elapsed();
@@ -1216,14 +1221,14 @@
   }
 }
 
-void SVGSMILElement::addSyncBaseDependent(SVGSMILElement* animation) {
-  m_syncBaseDependents.insert(animation);
+void SVGSMILElement::addSyncBaseDependent(SVGSMILElement& animation) {
+  m_syncBaseDependents.insert(&animation);
   if (m_interval.begin.isFinite())
-    animation->createInstanceTimesFromSyncbase(this);
+    animation.createInstanceTimesFromSyncbase(*this);
 }
 
-void SVGSMILElement::removeSyncBaseDependent(SVGSMILElement* animation) {
-  m_syncBaseDependents.erase(animation);
+void SVGSMILElement::removeSyncBaseDependent(SVGSMILElement& animation) {
+  m_syncBaseDependents.erase(&animation);
 }
 
 void SVGSMILElement::handleConditionEvent(Event* event, Condition* condition) {
@@ -1302,13 +1307,6 @@
   m_isScheduled = false;
 }
 
-SVGSMILElement::Condition::~Condition() {}
-
-DEFINE_TRACE(SVGSMILElement::Condition) {
-  visitor->trace(m_syncBase);
-  visitor->trace(m_eventListener);
-}
-
 DEFINE_TRACE(SVGSMILElement) {
   visitor->trace(m_targetElement);
   visitor->trace(m_timeContainer);

diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h
index 9a923568f..b89f404 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.h

@@ -186,16 +186,10 @@
    public:
     enum Type { EventBase, Syncbase, AccessKey };
 
-    Condition(Type,
-              BeginOrEnd,
-              const String& baseID,
-              const String& name,
-              SMILTime offset,
-              int repeat = -1);
     static Condition* create(Type type,
                              BeginOrEnd beginOrEnd,
-                             const String& baseID,
-                             const String& name,
+                             const AtomicString& baseID,
+                             const AtomicString& name,
                              SMILTime offset,
                              int repeat = -1) {
       return new Condition(type, beginOrEnd, baseID, name, offset, repeat);
@@ -205,22 +199,33 @@
 
     Type getType() const { return m_type; }
     BeginOrEnd getBeginOrEnd() const { return m_beginOrEnd; }
-    String baseID() const { return m_baseID; }
-    String name() const { return m_name; }
+    const AtomicString& name() const { return m_name; }
     SMILTime offset() const { return m_offset; }
     int repeat() const { return m_repeat; }
-    SVGSMILElement* syncBase() const { return m_syncBase.get(); }
-    void setSyncBase(SVGSMILElement* element) { m_syncBase = element; }
-    ConditionEventListener* eventListener() const {
-      return m_eventListener.get();
+
+    void connectSyncBase(SVGSMILElement&);
+    void disconnectSyncBase(SVGSMILElement&);
+    bool syncBaseEquals(SVGSMILElement& timedElement) const {
+      return m_syncBase == timedElement;
     }
-    void setEventListener(ConditionEventListener*);
+
+    void connectEventBase(SVGSMILElement&);
+    void disconnectEventBase(SVGSMILElement&);
 
    private:
+    Condition(Type,
+              BeginOrEnd,
+              const AtomicString& baseID,
+              const AtomicString& name,
+              SMILTime offset,
+              int repeat);
+
+    SVGElement* lookupEventBase(SVGSMILElement&) const;
+
     Type m_type;
     BeginOrEnd m_beginOrEnd;
-    String m_baseID;
-    String m_name;
+    AtomicString m_baseID;
+    AtomicString m_name;
     SMILTime m_offset;
     int m_repeat;
     Member<SVGSMILElement> m_syncBase;
@@ -228,7 +233,6 @@
   };
   bool parseCondition(const String&, BeginOrEnd beginOrEnd);
   void parseBeginOrEnd(const String&, BeginOrEnd beginOrEnd);
-  SVGElement* eventBaseFor(const Condition&);
 
   void disconnectSyncBaseConditions();
   void disconnectEventBaseConditions();
@@ -237,9 +241,9 @@
   void handleConditionEvent(Event*, Condition*);
 
   void notifyDependentsIntervalChanged();
-  void createInstanceTimesFromSyncbase(SVGSMILElement* syncbase);
-  void addSyncBaseDependent(SVGSMILElement*);
-  void removeSyncBaseDependent(SVGSMILElement*);
+  void createInstanceTimesFromSyncbase(SVGSMILElement& syncbase);
+  void addSyncBaseDependent(SVGSMILElement&);
+  void removeSyncBaseDependent(SVGSMILElement&);
 
   enum ActiveState { Inactive, Active, Frozen };
 

diff --git a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.cpp b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.cpp
index 997bbe3..9ae7098 100644
--- a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.cpp
+++ b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.cpp

@@ -35,8 +35,8 @@
 }
 
 // static
-Performance* DOMWindowPerformance::performance(DOMWindow& window) {
-  return from(toLocalDOMWindow(window)).performance();
+Performance* DOMWindowPerformance::performance(LocalDOMWindow& window) {
+  return from(window).performance();
 }
 
 Performance* DOMWindowPerformance::performance() {

diff --git a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h
index f59c300..651b5c5 100644
--- a/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h
+++ b/third_party/WebKit/Source/core/timing/DOMWindowPerformance.h

@@ -6,14 +6,13 @@
 #define DOMWindowPerformance_h
 
 #include "core/CoreExport.h"
-#include "core/frame/LocalDOMWindow.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
-class DOMWindow;
+class LocalDOMWindow;
 class Performance;
 
 class CORE_EXPORT DOMWindowPerformance final
@@ -24,7 +23,7 @@
 
  public:
   static DOMWindowPerformance& from(LocalDOMWindow&);
-  static Performance* performance(DOMWindow&);
+  static Performance* performance(LocalDOMWindow&);
 
   DECLARE_TRACE();
 

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerMessagingProxy.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerMessagingProxy.cpp
index f8b7357..bca10576 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerMessagingProxy.cpp
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerMessagingProxy.cpp

@@ -20,7 +20,7 @@
 std::unique_ptr<WorkerThread> DedicatedWorkerMessagingProxy::createWorkerThread(
     double originTime) {
   return DedicatedWorkerThread::create(loaderProxy(), workerObjectProxy(),
-                                       getParentFrameTaskRunners(), originTime);
+                                       originTime);
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
index 69bc7f00..d0b11fc 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerTest.cpp

@@ -38,12 +38,10 @@
  public:
   DedicatedWorkerThreadForTest(
       WorkerLoaderProxyProvider* workerLoaderProxyProvider,
-      InProcessWorkerObjectProxy& workerObjectProxy,
-      ParentFrameTaskRunners* parentFrameTaskRunners)
+      InProcessWorkerObjectProxy& workerObjectProxy)
       : DedicatedWorkerThread(
             WorkerLoaderProxy::create(workerLoaderProxyProvider),
             workerObjectProxy,
-            parentFrameTaskRunners,
             monotonicallyIncreasingTime()) {
     m_workerBackingThread = WorkerBackingThread::createForTest("Test thread");
   }
@@ -96,8 +94,7 @@
     m_mockWorkerLoaderProxyProvider =
         WTF::makeUnique<MockWorkerLoaderProxyProvider>();
     m_workerThread = WTF::wrapUnique(new DedicatedWorkerThreadForTest(
-        m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy(),
-        getParentFrameTaskRunners()));
+        m_mockWorkerLoaderProxyProvider.get(), workerObjectProxy()));
     m_mockWorkerThreadLifecycleObserver = new MockWorkerThreadLifecycleObserver(
         m_workerThread->getWorkerThreadLifecycleContext());
     EXPECT_CALL(*m_mockWorkerThreadLifecycleObserver,
@@ -119,13 +116,15 @@
     CSPHeaderAndType headerAndType("contentSecurityPolicy",
                                    ContentSecurityPolicyHeaderTypeReport);
     headers->push_back(headerAndType);
-    workerThread()->start(WorkerThreadStartupData::create(
-        scriptURL, "fake user agent", source, nullptr /* cachedMetaData */,
-        DontPauseWorkerGlobalScopeOnStart, headers.get(),
-        "" /* referrerPolicy */, m_securityOrigin.get(),
-        nullptr /* workerClients */, WebAddressSpaceLocal,
-        nullptr /* originTrialTokens */, nullptr /* workerSettings */,
-        WorkerV8Settings::Default()));
+    workerThread()->start(
+        WorkerThreadStartupData::create(
+            scriptURL, "fake user agent", source, nullptr /* cachedMetaData */,
+            DontPauseWorkerGlobalScopeOnStart, headers.get(),
+            "" /* referrerPolicy */, m_securityOrigin.get(),
+            nullptr /* workerClients */, WebAddressSpaceLocal,
+            nullptr /* originTrialTokens */, nullptr /* workerSettings */,
+            WorkerV8Settings::Default()),
+        getParentFrameTaskRunners());
 
     workerInspectorProxy()->workerThreadCreated(
         toDocument(getExecutionContext()), m_workerThread.get(), scriptURL);

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.cpp
index 4be83811c..7b21d6c4 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.cpp
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.cpp

@@ -43,21 +43,16 @@
 std::unique_ptr<DedicatedWorkerThread> DedicatedWorkerThread::create(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
     InProcessWorkerObjectProxy& workerObjectProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners,
     double timeOrigin) {
-  return WTF::wrapUnique(
-      new DedicatedWorkerThread(std::move(workerLoaderProxy), workerObjectProxy,
-                                parentFrameTaskRunners, timeOrigin));
+  return WTF::wrapUnique(new DedicatedWorkerThread(
+      std::move(workerLoaderProxy), workerObjectProxy, timeOrigin));
 }
 
 DedicatedWorkerThread::DedicatedWorkerThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
     InProcessWorkerObjectProxy& workerObjectProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners,
     double timeOrigin)
-    : WorkerThread(std::move(workerLoaderProxy),
-                   workerObjectProxy,
-                   parentFrameTaskRunners),
+    : WorkerThread(std::move(workerLoaderProxy), workerObjectProxy),
       m_workerBackingThread(
           WorkerBackingThread::create("DedicatedWorker Thread")),
       m_workerObjectProxy(workerObjectProxy),

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.h b/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.h
index 4e2e887..cd9c7e9 100644
--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.h
+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerThread.h

@@ -43,7 +43,6 @@
   static std::unique_ptr<DedicatedWorkerThread> create(
       PassRefPtr<WorkerLoaderProxy>,
       InProcessWorkerObjectProxy&,
-      ParentFrameTaskRunners*,
       double timeOrigin);
   ~DedicatedWorkerThread() override;
 
@@ -58,7 +57,6 @@
  protected:
   DedicatedWorkerThread(PassRefPtr<WorkerLoaderProxy>,
                         InProcessWorkerObjectProxy&,
-                        ParentFrameTaskRunners*,
                         double timeOrigin);
   WorkerOrWorkletGlobalScope* createWorkerGlobalScope(
       std::unique_ptr<WorkerThreadStartupData>) override;

diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp b/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
index 01e58f3..c9a5e3a1 100644
--- a/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp
+++ b/third_party/WebKit/Source/core/workers/SharedWorkerThread.cpp

@@ -41,21 +41,16 @@
 std::unique_ptr<SharedWorkerThread> SharedWorkerThread::create(
     const String& name,
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners) {
-  return WTF::wrapUnique(
-      new SharedWorkerThread(name, std::move(workerLoaderProxy),
-                             workerReportingProxy, parentFrameTaskRunners));
+    WorkerReportingProxy& workerReportingProxy) {
+  return WTF::wrapUnique(new SharedWorkerThread(
+      name, std::move(workerLoaderProxy), workerReportingProxy));
 }
 
 SharedWorkerThread::SharedWorkerThread(
     const String& name,
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners)
-    : WorkerThread(std::move(workerLoaderProxy),
-                   workerReportingProxy,
-                   parentFrameTaskRunners),
+    WorkerReportingProxy& workerReportingProxy)
+    : WorkerThread(std::move(workerLoaderProxy), workerReportingProxy),
       m_workerBackingThread(WorkerBackingThread::create("SharedWorker Thread")),
       m_name(name.isolatedCopy()) {}
 

diff --git a/third_party/WebKit/Source/core/workers/SharedWorkerThread.h b/third_party/WebKit/Source/core/workers/SharedWorkerThread.h
index 9509750..88ea5415 100644
--- a/third_party/WebKit/Source/core/workers/SharedWorkerThread.h
+++ b/third_party/WebKit/Source/core/workers/SharedWorkerThread.h

@@ -44,8 +44,7 @@
   static std::unique_ptr<SharedWorkerThread> create(
       const String& name,
       PassRefPtr<WorkerLoaderProxy>,
-      WorkerReportingProxy&,
-      ParentFrameTaskRunners*);
+      WorkerReportingProxy&);
   ~SharedWorkerThread() override;
 
   WorkerBackingThread& workerBackingThread() override {
@@ -60,8 +59,7 @@
  private:
   SharedWorkerThread(const String& name,
                      PassRefPtr<WorkerLoaderProxy>,
-                     WorkerReportingProxy&,
-                     ParentFrameTaskRunners*);
+                     WorkerReportingProxy&);
 
   std::unique_ptr<WorkerBackingThread> m_workerBackingThread;
   String m_name;

diff --git a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
index a3fe6be..62dd73a 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp
+++ b/third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.cpp

@@ -56,7 +56,7 @@
 
   m_loaderProxy = WorkerLoaderProxy::create(this);
   m_workerThread = createWorkerThread(originTime);
-  m_workerThread->start(std::move(startupData));
+  m_workerThread->start(std::move(startupData), getParentFrameTaskRunners());
   workerThreadCreated();
 }
 

diff --git a/third_party/WebKit/Source/core/workers/ThreadedWorkletTest.cpp b/third_party/WebKit/Source/core/workers/ThreadedWorkletTest.cpp
index 2d4187b5..45dc232 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedWorkletTest.cpp
+++ b/third_party/WebKit/Source/core/workers/ThreadedWorkletTest.cpp

@@ -23,11 +23,9 @@
  public:
   ThreadedWorkletThreadForTest(
       WorkerLoaderProxyProvider* workerLoaderProxyProvider,
-      WorkerReportingProxy& workerReportingProxy,
-      ParentFrameTaskRunners* parentFrameTaskRunners)
+      WorkerReportingProxy& workerReportingProxy)
       : WorkerThread(WorkerLoaderProxy::create(workerLoaderProxyProvider),
-                     workerReportingProxy,
-                     parentFrameTaskRunners) {}
+                     workerReportingProxy) {}
   ~ThreadedWorkletThreadForTest() override{};
 
   WorkerBackingThread& workerBackingThread() override {
@@ -95,8 +93,7 @@
     m_mockWorkerLoaderProxyProvider =
         WTF::makeUnique<MockWorkerLoaderProxyProvider>();
     m_workerThread = WTF::makeUnique<ThreadedWorkletThreadForTest>(
-        m_mockWorkerLoaderProxyProvider.get(), workletObjectProxy(),
-        getParentFrameTaskRunners());
+        m_mockWorkerLoaderProxyProvider.get(), workletObjectProxy());
     ThreadedWorkletThreadForTest::ensureSharedBackingThread();
   }
 
@@ -116,12 +113,15 @@
     WorkerClients* workerClients = nullptr;
     Vector<String> originTrialTokens;
     std::unique_ptr<WorkerSettings> workerSettings = nullptr;
-    m_workerThread->start(WorkerThreadStartupData::create(
-        scriptURL, "fake user agent", "// fake source code",
-        std::move(cachedMetaData), DontPauseWorkerGlobalScopeOnStart,
-        &contentSecurityPolicyHeaders, referrerPolicy, m_securityOrigin.get(),
-        workerClients, WebAddressSpaceLocal, &originTrialTokens,
-        std::move(workerSettings), WorkerV8Settings::Default()));
+    m_workerThread->start(
+        WorkerThreadStartupData::create(
+            scriptURL, "fake user agent", "// fake source code",
+            std::move(cachedMetaData), DontPauseWorkerGlobalScopeOnStart,
+            &contentSecurityPolicyHeaders, referrerPolicy,
+            m_securityOrigin.get(), workerClients, WebAddressSpaceLocal,
+            &originTrialTokens, std::move(workerSettings),
+            WorkerV8Settings::Default()),
+        getParentFrameTaskRunners());
     workerInspectorProxy()->workerThreadCreated(
         toDocument(getExecutionContext()), m_workerThread.get(), scriptURL);
   }

diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
index 17b2c4a..4401616c 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThread.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.cpp

@@ -104,13 +104,15 @@
   exitCodeHistogram.count(static_cast<int>(m_exitCode));
 }
 
-void WorkerThread::start(std::unique_ptr<WorkerThreadStartupData> startupData) {
+void WorkerThread::start(std::unique_ptr<WorkerThreadStartupData> startupData,
+                         ParentFrameTaskRunners* parentFrameTaskRunners) {
   DCHECK(isMainThread());
 
   if (m_requestedToStart)
     return;
 
   m_requestedToStart = true;
+  m_parentFrameTaskRunners = parentFrameTaskRunners;
   workerBackingThread().backingThread().postTask(
       BLINK_FROM_HERE, crossThreadBind(&WorkerThread::initializeOnWorkerThread,
                                        crossThreadUnretained(this),
@@ -284,14 +286,12 @@
 }
 
 WorkerThread::WorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-                           WorkerReportingProxy& workerReportingProxy,
-                           ParentFrameTaskRunners* parentFrameTaskRunners)
+                           WorkerReportingProxy& workerReportingProxy)
     : m_workerThreadId(getNextWorkerThreadId()),
       m_forcibleTerminationDelayInMs(kForcibleTerminationDelayInMs),
       m_inspectorTaskRunner(WTF::makeUnique<InspectorTaskRunner>()),
       m_workerLoaderProxy(workerLoaderProxy),
       m_workerReportingProxy(workerReportingProxy),
-      m_parentFrameTaskRunners(parentFrameTaskRunners),
       m_shutdownEvent(WTF::wrapUnique(
           new WaitableEvent(WaitableEvent::ResetPolicy::Manual,
                             WaitableEvent::InitialState::NonSignaled))),

diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.h b/third_party/WebKit/Source/core/workers/WorkerThread.h
index cb6ece4..d345b44e 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThread.h
+++ b/third_party/WebKit/Source/core/workers/WorkerThread.h

@@ -106,7 +106,7 @@
   virtual ~WorkerThread();
 
   // Called on the main thread.
-  void start(std::unique_ptr<WorkerThreadStartupData>);
+  void start(std::unique_ptr<WorkerThreadStartupData>, ParentFrameTaskRunners*);
   void terminate();
 
   // Called on the main thread. Internally calls terminateInternal() and wait
@@ -175,9 +175,7 @@
   }
 
  protected:
-  WorkerThread(PassRefPtr<WorkerLoaderProxy>,
-               WorkerReportingProxy&,
-               ParentFrameTaskRunners*);
+  WorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
 
   // Factory method for creating a new worker context for the thread.
   // Called on the worker thread.

diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
index 1a01f3b3..e1d4738 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp

@@ -45,9 +45,8 @@
     m_reportingProxy = WTF::makeUnique<MockWorkerReportingProxy>();
     m_securityOrigin =
         SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
-    m_workerThread = WTF::wrapUnique(
-        new WorkerThreadForTest(m_loaderProxyProvider.get(), *m_reportingProxy,
-                                ParentFrameTaskRunners::create(nullptr)));
+    m_workerThread = WTF::wrapUnique(new WorkerThreadForTest(
+        m_loaderProxyProvider.get(), *m_reportingProxy));
     m_lifecycleObserver = new MockWorkerThreadLifecycleObserver(
         m_workerThread->getWorkerThreadLifecycleContext());
   }
@@ -58,15 +57,17 @@
   }
 
   void start() {
-    m_workerThread->startWithSourceCode(m_securityOrigin.get(),
-                                        "//fake source code");
+    m_workerThread->startWithSourceCode(
+        m_securityOrigin.get(), "//fake source code",
+        ParentFrameTaskRunners::create(nullptr));
   }
 
   void startWithSourceCodeNotToFinish() {
     // Use a JavaScript source code that makes an infinite loop so that we
     // can catch some kind of issues as a timeout.
-    m_workerThread->startWithSourceCode(m_securityOrigin.get(),
-                                        "while(true) {}");
+    m_workerThread->startWithSourceCode(
+        m_securityOrigin.get(), "while(true) {}",
+        ParentFrameTaskRunners::create(nullptr));
   }
 
   void setForcibleTerminationDelayInMs(long long forcibleTerminationDelayInMs) {
@@ -282,7 +283,8 @@
           m_securityOrigin.get(), nullptr, /* workerClients */
           WebAddressSpaceLocal, nullptr /* originTrialToken */,
           nullptr /* WorkerSettings */, WorkerV8Settings::Default());
-  m_workerThread->start(std::move(startupData));
+  m_workerThread->start(std::move(startupData),
+                        ParentFrameTaskRunners::create(nullptr));
 
   // Used to wait for worker thread termination in a debugger task on the
   // worker thread.

diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
index a5f69a82..f93d0b8 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h
+++ b/third_party/WebKit/Source/core/workers/WorkerThreadTestHelper.h

@@ -119,11 +119,9 @@
 class WorkerThreadForTest : public WorkerThread {
  public:
   WorkerThreadForTest(WorkerLoaderProxyProvider* mockWorkerLoaderProxyProvider,
-                      WorkerReportingProxy& mockWorkerReportingProxy,
-                      ParentFrameTaskRunners* parentFrameTaskRunners)
+                      WorkerReportingProxy& mockWorkerReportingProxy)
       : WorkerThread(WorkerLoaderProxy::create(mockWorkerLoaderProxyProvider),
-                     mockWorkerReportingProxy,
-                     parentFrameTaskRunners),
+                     mockWorkerReportingProxy),
         m_workerBackingThread(
             WorkerBackingThread::createForTest("Test thread")) {}
 
@@ -138,7 +136,8 @@
       std::unique_ptr<WorkerThreadStartupData>) override;
 
   void startWithSourceCode(SecurityOrigin* securityOrigin,
-                           const String& source) {
+                           const String& source,
+                           ParentFrameTaskRunners* parentFrameTaskRunners) {
     std::unique_ptr<Vector<CSPHeaderAndType>> headers =
         WTF::makeUnique<Vector<CSPHeaderAndType>>();
     CSPHeaderAndType headerAndType("contentSecurityPolicy",
@@ -148,10 +147,11 @@
     WorkerClients* clients = nullptr;
 
     start(WorkerThreadStartupData::create(
-        KURL(ParsedURLString, "http://fake.url/"), "fake user agent", source,
-        nullptr, DontPauseWorkerGlobalScopeOnStart, headers.get(), "",
-        securityOrigin, clients, WebAddressSpaceLocal, nullptr, nullptr,
-        WorkerV8Settings::Default()));
+              KURL(ParsedURLString, "http://fake.url/"), "fake user agent",
+              source, nullptr, DontPauseWorkerGlobalScopeOnStart, headers.get(),
+              "", securityOrigin, clients, WebAddressSpaceLocal, nullptr,
+              nullptr, WorkerV8Settings::Default()),
+          parentFrameTaskRunners);
   }
 
   void waitForInit() {

diff --git a/third_party/WebKit/Source/devtools/.eslintrc.js b/third_party/WebKit/Source/devtools/.eslintrc.js
index 914281a..e7d2aa51 100644
--- a/third_party/WebKit/Source/devtools/.eslintrc.js
+++ b/third_party/WebKit/Source/devtools/.eslintrc.js

@@ -6,6 +6,10 @@
         "es6": true
     },
 
+    "parserOptions": {
+        "ecmaVersion": 8
+    },
+
     /**
      * ESLint rules
      *
@@ -42,6 +46,7 @@
         "curly": [2, "multi-or-nest", "consistent"],
         "new-parens": 2,
         "func-call-spacing": 2,
+        "arrow-parens": [2, "as-needed"],
 
         // anti-patterns
         "no-with": 2,

diff --git a/third_party/WebKit/Source/devtools/BUILD.gn b/third_party/WebKit/Source/devtools/BUILD.gn
index 64ca3e5..0018559c 100644
--- a/third_party/WebKit/Source/devtools/BUILD.gn
+++ b/third_party/WebKit/Source/devtools/BUILD.gn

@@ -240,6 +240,11 @@
   "front_end/heap_snapshot_worker/HeapSnapshotWorker.js",
   "front_end/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js",
   "front_end/heap_snapshot_worker/module.json",
+  "front_end/help/Help.js",
+  "front_end/help/module.json",
+  "front_end/help/releaseNote.css",
+  "front_end/help/ReleaseNote.js",
+  "front_end/help/ReleaseNoteText.js",
   "front_end/host/InspectorFrontendHost.js",
   "front_end/host/InspectorFrontendHostAPI.js",
   "front_end/host/module.json",

diff --git a/third_party/WebKit/Source/devtools/front_end/Tests.js b/third_party/WebKit/Source/devtools/front_end/Tests.js
index 21e7322..11a6be7 100644
--- a/third_party/WebKit/Source/devtools/front_end/Tests.js
+++ b/third_party/WebKit/Source/devtools/front_end/Tests.js

@@ -866,8 +866,7 @@
 
   TestSuite.prototype.testTempFile = function() {
     this.takeControl();
-    Bindings.TempFile.create('test-file', 'test')
-        .then(() => this.releaseControl(), (error) => this.fail(String(error)));
+    Bindings.TempFile.create('test-file', 'test').then(() => this.releaseControl(), error => this.fail(String(error)));
   };
 
   TestSuite.prototype.waitForTestResultsInConsole = function() {

diff --git a/third_party/WebKit/Source/devtools/front_end/accessibility/ARIAAttributesView.js b/third_party/WebKit/Source/devtools/front_end/accessibility/ARIAAttributesView.js
index 22b2e09..7d7b8ea 100644
--- a/third_party/WebKit/Source/devtools/front_end/accessibility/ARIAAttributesView.js
+++ b/third_party/WebKit/Source/devtools/front_end/accessibility/ARIAAttributesView.js

@@ -212,7 +212,7 @@
     prefix = prefix.toLowerCase();
     if (!prefix && !force && (this._isEditingName || expression))
       return Promise.resolve([]);
-    return Promise.resolve(this._ariaCompletions.filter((value) => value.startsWith(prefix)).map(c => ({text: c})));
+    return Promise.resolve(this._ariaCompletions.filter(value => value.startsWith(prefix)).map(c => ({text: c})));
   }
 };
 

diff --git a/third_party/WebKit/Source/devtools/front_end/accessibility/AXTreePane.js b/third_party/WebKit/Source/devtools/front_end/accessibility/AXTreePane.js
index 358aa53..1b5b1ec 100644
--- a/third_party/WebKit/Source/devtools/front_end/accessibility/AXTreePane.js
+++ b/third_party/WebKit/Source/devtools/front_end/accessibility/AXTreePane.js

@@ -71,7 +71,7 @@
     } else {
       // Only set the node for the accessibility panel, not the Elements tree.
       var axSidebarView = this._axSidebarView;
-      axNode.deferredDOMNode().resolve((node) => {
+      axNode.deferredDOMNode().resolve(node => {
         axSidebarView.setNode(node);
       });
     }
@@ -321,4 +321,3 @@
   internalRole: 'ax-internal-role',
   role: 'ax-role',
 };
-

diff --git a/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilityModel.js b/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilityModel.js
index e262c257..e15457e 100644
--- a/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilityModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/accessibility/AccessibilityModel.js

@@ -142,7 +142,7 @@
   highlightDOMNode() {
     if (!this.isDOMNode())
       return;
-    this.deferredDOMNode().resolvePromise().then((node) => {
+    this.deferredDOMNode().resolvePromise().then(node => {
       SDK.DOMModel.fromTarget(this.target()).nodeHighlightRequested(node.id);
     });
   }
@@ -180,7 +180,7 @@
     if (!this._childIds || !this._childIds.length)
       return false;
 
-    return !this._childIds.some((id) => this._accessibilityModel.axNodeForId(id) !== undefined);
+    return !this._childIds.some(id => this._accessibilityModel.axNodeForId(id) !== undefined);
   }
 
   /**

diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/BlackboxManager.js b/third_party/WebKit/Source/devtools/front_end/bindings/BlackboxManager.js
index 20cf7f5..71c203d 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/BlackboxManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/BlackboxManager.js

@@ -142,7 +142,7 @@
     if (!previousScriptState)
       return Promise.resolve();
 
-    var hasBlackboxedMappings = sourceMap.sourceURLs().some((url) => this.isBlackboxedURL(url));
+    var hasBlackboxedMappings = sourceMap.sourceURLs().some(url => this.isBlackboxedURL(url));
     var mappings = hasBlackboxedMappings ? sourceMap.mappings().slice() : [];
     if (!mappings.length) {
       if (previousScriptState.length > 0)

diff --git a/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js b/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js
index 2a81701d..8940d93 100644
--- a/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js
+++ b/third_party/WebKit/Source/devtools/front_end/bindings/DebuggerWorkspaceBinding.js

@@ -266,7 +266,7 @@
    */
   _reset(debuggerModel) {
     var modelData = this._debuggerModelToData.get(debuggerModel);
-    modelData.callFrameLocations.valuesArray().forEach((location) => this._removeLiveLocation(location));
+    modelData.callFrameLocations.valuesArray().forEach(location => this._removeLiveLocation(location));
     modelData.callFrameLocations.clear();
   }
 

diff --git a/third_party/WebKit/Source/devtools/front_end/components/DOMPresentationUtils.js b/third_party/WebKit/Source/devtools/front_end/components/DOMPresentationUtils.js
index 9e8c620..69a34727 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/DOMPresentationUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/components/DOMPresentationUtils.js

@@ -132,7 +132,7 @@
   var link = shadowRoot.createChild('div', 'node-link');
   link.createChild('content');
   link.addEventListener('click', deferredNode.resolve.bind(deferredNode, onDeferredNodeResolved), false);
-  link.addEventListener('mousedown', (e) => e.consume(), false);
+  link.addEventListener('mousedown', e => e.consume(), false);
 
   /**
    * @param {?SDK.DOMNode} node

diff --git a/third_party/WebKit/Source/devtools/front_end/coverage/CoverageView.js b/third_party/WebKit/Source/devtools/front_end/coverage/CoverageView.js
index 08ccde4..e8dee8b 100644
--- a/third_party/WebKit/Source/devtools/front_end/coverage/CoverageView.js
+++ b/third_party/WebKit/Source/devtools/front_end/coverage/CoverageView.js

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/** @typedef {{range: !Protocol.CSS.SourceRange, wasUsed: boolean}} */
+/** @typedef {{range: !Common.TextRange, wasUsed: boolean}} */
 Coverage.RangeUsage;
 
 /** @typedef {{styleSheetHeader: !SDK.CSSStyleSheetHeader, ranges: !Array<!Coverage.RangeUsage>}} */
 Coverage.StyleSheetUsage;
 
-/** @typedef {{url: string, totalSize: number, unusedSize: number, usedSize: number,
+/** @typedef {{url: string, size: (number|undefined), unusedSize: (number|undefined), usedSize: (number|undefined),
  *      ranges: !Array<!Coverage.RangeUsage>}} */
 Coverage.CoverageInfo;
 
@@ -78,112 +78,215 @@
       return;
     this._recordButton.setTitle(Common.UIString('Stop recording'));
     cssModel.startRuleUsageTracking();
+    mainTarget.profilerAgent().startPreciseCoverage();
 
     this._progressElement.textContent = Common.UIString('Recording...');
   }
 
-  _stopRecording() {
-    var mainTarget = SDK.targetManager.mainTarget();
-    if (!mainTarget)
-      return;
-
+  async _stopRecording() {
     this._recordButton.setTitle(Common.UIString('Start recording'));
     this._progressElement.textContent = Common.UIString('Fetching results...');
 
-    var cssModel = mainTarget.model(SDK.CSSModel);
-    if (!cssModel)
-      return;
+    var cssCoverageInfoPromise = this._stopCSSCoverage();
+    var jsCoverageInfoPromise = this._stopJSCoverage();
+    var cssCoverageInfo = await cssCoverageInfoPromise;
+    var jsCoverageInfo = await jsCoverageInfoPromise;
+    this._updateViews(cssCoverageInfo.concat(jsCoverageInfo));
+  }
 
-    cssModel.ruleListPromise().then(processRuleList.bind(this)).then(updateViews.bind(this));
+  /**
+   * @param {!Array<!Coverage.CoverageInfo>} coverageInfo
+   * @this {!Coverage.CoverageView}
+   */
+  _updateViews(coverageInfo) {
+    coverageInfo = Coverage.CoverageView._coalesceByURL(coverageInfo);
+    this._updateStats(coverageInfo);
+    this._updateGutter(coverageInfo);
+    this._coverageResultsElement.removeChildren();
+    this._listView.update(coverageInfo);
+    this._listView.show(this._coverageResultsElement);
+  }
 
-    /**
-     * @param {!Array<!SDK.CSSModel.RuleUsage>} ruleUsageList
-     * @this {!Coverage.CoverageView}
-     * @return {!Promise<!Array<!Coverage.CoverageInfo>>}
-     */
-    function processRuleList(ruleUsageList) {
-      /** @type {!Map<?SDK.CSSStyleSheetHeader, !Array<!Coverage.RangeUsage>>} */
-      var rulesByStyleSheet = new Map();
-      for (var rule of ruleUsageList) {
-        var styleSheetHeader = cssModel.styleSheetHeaderForId(rule.styleSheetId);
-        var ranges = rulesByStyleSheet.get(styleSheetHeader);
-        if (!ranges) {
-          ranges = [];
-          rulesByStyleSheet.set(styleSheetHeader, ranges);
-        }
-        ranges.push({range: rule.range, wasUsed: rule.wasUsed});
+  /**
+   * @param {!Array<!Coverage.CoverageInfo>} coverageInfo
+   * @return {!Array<!Coverage.CoverageInfo>}
+   */
+  static _coalesceByURL(coverageInfo) {
+    coverageInfo.sort((a, b) => (a.url || '').localeCompare(b.url));
+    var result = [];
+    for (var entry of coverageInfo) {
+      if (!entry.url)
+        continue;
+      if (result.length && result.peekLast().url === entry.url) {
+        var lastEntry = result.peekLast();
+        lastEntry.size += entry.size;
+        lastEntry.usedSize += entry.usedSize;
+        lastEntry.unusedSize += entry.unusedSize;
+      } else {
+        result.push(entry);
       }
-      return Promise.all(
-          Array.from(rulesByStyleSheet.entries(), entry => this._convertToCoverageInfo(entry[0], entry[1])));
     }
+    return result;
+  }
 
-    /**
-     * @param {!Array<!Coverage.CoverageInfo>} coverageInfo
-     * @this {!Coverage.CoverageView}
-     */
-    function updateViews(coverageInfo) {
-      coverageInfo = coalesceByURL(coverageInfo);
-      this._updateStats(coverageInfo);
-      this._updateGutter(coverageInfo);
-      this._coverageResultsElement.removeChildren();
-      this._listView.update(coverageInfo);
-      this._listView.show(this._coverageResultsElement);
-    }
+  /**
+   * @return {!Promise<!Array<!Coverage.CoverageInfo>>}
+   */
+  async _stopJSCoverage() {
+    var mainTarget = SDK.targetManager.mainTarget();
+    var profilerAgent = mainTarget && mainTarget.profilerAgent();
+    if (!profilerAgent)
+      return [];
+    var coveragePromise = profilerAgent.takePreciseCoverage((error, result) => error ? [] : result);
+    profilerAgent.stopPreciseCoverage();
+    var rawCoverageData = await coveragePromise;
+    return Coverage.CoverageView._processJSCoverage(
+        /** @type !SDK.DebuggerModel */ (SDK.DebuggerModel.fromTarget(mainTarget)), rawCoverageData);
+  }
 
-    /**
-     * @param {!Array<!Coverage.CoverageInfo>} coverageInfo
-     * @return {!Array<!Coverage.CoverageInfo>}
-     */
-    function coalesceByURL(coverageInfo) {
-      coverageInfo.sort((a, b) => (a.url || '').localeCompare(b.url));
-      var result = [];
-      for (var entry of coverageInfo) {
-        if (!entry.url)
-          continue;
-        if (result.length && result.peekLast().url === entry.url) {
-          var lastEntry = result.peekLast();
-          lastEntry.size += entry.size;
-          lastEntry.usedSize += entry.usedSize;
-          lastEntry.unusedSize += entry.unusedSize;
-        } else {
-          result.push(entry);
+  /**
+   * @param {!SDK.DebuggerModel} debuggerModel
+   * @param {!Array<!Protocol.Profiler.ScriptCoverage>} scriptsCoverage
+   * @return {!Promise<!Array<!Coverage.CoverageInfo>>}
+   */
+  static async _processJSCoverage(debuggerModel, scriptsCoverage) {
+    var promises = [];
+    for (var entry of scriptsCoverage) {
+      var ranges = [];
+      var script = debuggerModel.scriptForId(entry.scriptId);
+      if (!script)
+        continue;
+      for (var func of entry.functions) {
+        for (var range of func.ranges) {
+          var textRange = new Common.TextRange(
+              range.startLineNumber, range.startColumnNumber, range.endLineNumber, range.endColumnNumber);
+          ranges.push({range: textRange, wasUsed: !!range.count});
         }
       }
-      return result;
+      promises.push(convertToCoverageInfo(script, ranges));
+    }
+    return Promise.all(promises);
+
+    /**
+     * @param {!SDK.Script} script
+     * @param {!Array<!Coverage.RangeUsage>} ranges
+     * @return {!Promise<!Coverage.CoverageInfo>}
+     */
+    function convertToCoverageInfo(script, ranges) {
+      return script.requestContent().then(
+          content => Coverage.CoverageView._coverageInfoForText(
+              script.contentURL(), script.lineOffset, script.columnOffset, content, ranges));
     }
   }
 
   /**
-   * @param {!SDK.CSSStyleSheetHeader} styleSheetHeader
-   * @param {!Array<!Coverage.RangeUsage>} ranges
-   * @return {!Promise<!Coverage.CoverageInfo>}
+   * @return {!Promise<!Array<!Coverage.CoverageInfo>>}
    */
-  _convertToCoverageInfo(styleSheetHeader, ranges) {
+  async _stopCSSCoverage() {
+    var mainTarget = SDK.targetManager.mainTarget();
+    const cssModel = mainTarget && mainTarget.model(SDK.CSSModel);
+    if (!cssModel)
+      return Promise.resolve([]);
+
+    var rawCoverageData = await cssModel.ruleListPromise();
+    return Coverage.CoverageView._processCSSCoverage(
+        /** @type !SDK.CSSModel */ (cssModel), rawCoverageData);
+  }
+
+  /**
+   * @param {!SDK.CSSModel} cssModel
+   * @param {!Array<!SDK.CSSModel.RuleUsage>} ruleUsageList
+   * @return {!Promise<!Array<!Coverage.CoverageInfo>>}
+   */
+  static async _processCSSCoverage(cssModel, ruleUsageList) {
+    /** @type {!Map<?SDK.CSSStyleSheetHeader, !Array<!Coverage.RangeUsage>>} */
+    var rulesByStyleSheet = new Map();
+    for (var rule of ruleUsageList) {
+      var styleSheetHeader = cssModel.styleSheetHeaderForId(rule.styleSheetId);
+      var ranges = rulesByStyleSheet.get(styleSheetHeader);
+      if (!ranges) {
+        ranges = [];
+        rulesByStyleSheet.set(styleSheetHeader, ranges);
+      }
+      var textRange = new Common.TextRange(
+          rule.range.startLine + styleSheetHeader.startLine,
+          rule.range.startColumn + (rule.range.startLine ? 0 : styleSheetHeader.startColumn),
+          rule.range.endLine + styleSheetHeader.startLine,
+          rule.range.endColumn + (rule.range.endLine ? 0 : styleSheetHeader.startColumn));
+      ranges.push({range: textRange, wasUsed: rule.wasUsed});
+    }
+    return Promise.all(Array.from(rulesByStyleSheet.entries(), entry => convertToCoverageInfo(entry[0], entry[1])));
+
+    /**
+     * @param {!SDK.CSSStyleSheetHeader} styleSheetHeader
+     * @param {!Array<!Coverage.RangeUsage>} ranges
+     * @return {!Promise<!Coverage.CoverageInfo>}
+     */
+    function convertToCoverageInfo(styleSheetHeader, ranges) {
+      return styleSheetHeader.requestContent().then(
+          content => Coverage.CoverageView._coverageInfoForText(
+              styleSheetHeader.sourceURL, styleSheetHeader.startLine, styleSheetHeader.startColumn, content, ranges));
+    }
+  }
+
+  /**
+   * @param {string} url
+   * @param {number} startLine
+   * @param {number} startColumn
+   * @param {?string} content
+   * @param {!Array<!Coverage.RangeUsage>} ranges
+   * @return {!Coverage.CoverageInfo}
+   */
+  static _coverageInfoForText(url, startLine, startColumn, content, ranges) {
     var coverageInfo = {
-      url: styleSheetHeader.sourceURL,
+      url: url,
       ranges: ranges,
     };
-    return styleSheetHeader.requestContent().then(content => {
-      if (!content)
-        return coverageInfo;
-      var text = new Common.Text(content);
-      var usedSize = 0;
-      var unusedSize = 0;
-      for (var entry of ranges) {
-        var range = entry.range;
-        var size = text.offsetFromPosition(range.endLine, range.endColumn) -
-            text.offsetFromPosition(range.startLine, range.startColumn);
-        if (entry.wasUsed)
-          usedSize += size;
-        else
-          unusedSize += size;
-      }
-      coverageInfo.size = content.length;
-      coverageInfo.usedSize = usedSize;
-      coverageInfo.unusedSize = unusedSize;
-
+    if (!content)
       return coverageInfo;
+
+    var text = new Common.Text(content);
+    var offsetRanges = ranges.map(r => {
+      var range = r.range.relativeTo(startLine, startColumn);
+      return {
+        start: text.offsetFromPosition(range.startLine, range.startColumn),
+        end: text.offsetFromPosition(range.endLine, range.endColumn),
+        wasUsed: r.wasUsed
+      };
     });
+
+    var stack = [];
+    offsetRanges.sort((a, b) => a.start - b.start);
+    for (var entry of offsetRanges) {
+      while (stack.length && stack.peekLast().end <= entry.start)
+        stack.pop();
+
+      entry.ownSize = entry.end - entry.start;
+      var top = stack.peekLast();
+      if (top) {
+        if (top.end < entry.end) {
+          console.assert(
+              false, `Overlapping coverage entries in ${url}: ${top.start}-${top.end} vs. ${entry.start}-${entry.end}`);
+        }
+        top.ownSize -= entry.ownSize;
+      }
+      stack.push(entry);
+    }
+
+    var usedSize = 0;
+    var unusedSize = 0;
+    for (var entry of offsetRanges) {
+      if (entry.wasUsed)
+        usedSize += entry.ownSize;
+      else
+        unusedSize += entry.ownSize;
+    }
+
+    coverageInfo.size = content.length;
+    coverageInfo.usedSize = usedSize;
+    coverageInfo.unusedSize = unusedSize;
+
+    return coverageInfo;
   }
 
   /**
@@ -210,12 +313,8 @@
       var uiSourceCode = info.url && Workspace.workspace.uiSourceCodeForURL(info.url);
       if (!uiSourceCode)
         continue;
-      for (var range of info.ranges) {
-        var gutterRange = Common.TextRange.fromObject(range.range);
-        if (gutterRange.startColumn)
-          gutterRange.startColumn--;
-        uiSourceCode.addDecoration(gutterRange, Coverage.CoverageView.LineDecorator.type, range.wasUsed);
-      }
+      for (var range of info.ranges)
+        uiSourceCode.addDecoration(range.range, Coverage.CoverageView.LineDecorator.type, range.wasUsed);
     }
   }
 };

diff --git a/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js b/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js
index f5771ce..11396ec 100644
--- a/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js
+++ b/third_party/WebKit/Source/devtools/front_end/devices/DevicesView.js

@@ -86,7 +86,9 @@
    */
   _devicesUpdated(event) {
     this._devices =
-        /** @type {!Array.<!Adb.Device>} */ (event.data).slice().filter(d => d.adbSerial.toUpperCase() !== 'WEBRTC');
+        /** @type {!Array.<!Adb.Device>} */ (event.data)
+            .slice()
+            .filter(d => d.adbSerial.toUpperCase() !== 'WEBRTC' && d.adbSerial.toUpperCase() !== 'LOCALHOST');
     for (var device of this._devices) {
       if (!device.adbConnected)
         device.adbModel = Common.UIString('Unknown');

diff --git a/third_party/WebKit/Source/devtools/front_end/elements/ComputedStyleWidget.js b/third_party/WebKit/Source/devtools/front_end/elements/ComputedStyleWidget.js
index 473a5f6..6bdf6b9 100644
--- a/third_party/WebKit/Source/devtools/front_end/elements/ComputedStyleWidget.js
+++ b/third_party/WebKit/Source/devtools/front_end/elements/ComputedStyleWidget.js

@@ -196,8 +196,8 @@
       var trace = propertyTraces.get(propertyName);
       if (trace) {
         var activeProperty = this._renderPropertyTrace(cssModel, matchedStyles, nodeStyle.node, treeElement, trace);
-        treeElement.listItemElement.addEventListener('mousedown', (e) => e.consume(), false);
-        treeElement.listItemElement.addEventListener('dblclick', (e) => e.consume(), false);
+        treeElement.listItemElement.addEventListener('mousedown', e => e.consume(), false);
+        treeElement.listItemElement.addEventListener('dblclick', e => e.consume(), false);
         treeElement.listItemElement.addEventListener('click', handleClick.bind(null, treeElement), false);
         var gotoSourceElement = UI.Icon.create('smallicon-arrow-in-circle', 'goto-source-icon');
         gotoSourceElement.addEventListener('click', this._navigateToSource.bind(this, activeProperty));

diff --git a/third_party/WebKit/Source/devtools/front_end/help/Help.js b/third_party/WebKit/Source/devtools/front_end/help/Help.js
new file mode 100644
index 0000000..35838b6f
--- /dev/null
+++ b/third_party/WebKit/Source/devtools/front_end/help/Help.js

@@ -0,0 +1,91 @@
+// Copyright 2017 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.
+
+/**
+ * @return {!Help.ReleaseNote}
+ */
+Help.latestReleaseNote = function() {
+  if (!Help._latestReleaseNote) {
+    /** @type {!Help.ReleaseNote} */
+    Help._latestReleaseNote = Help._getReleaseNoteByVersion(Help.browserVersion());
+  }
+  return Help._latestReleaseNote;
+};
+
+/**
+ * @param {number} version
+ * @return {!Help.ReleaseNote}
+ */
+Help._getReleaseNoteByVersion = function(version) {
+  var originalVersion = version;
+  while (version) {
+    var note = Help.releaseNoteText.find(note => note.version === version);
+    if (note)
+      return note;
+    version--;
+  }
+  console.error(`Unable to find release note for version ${originalVersion} - using last release note as fallback`);
+  return /** @type {!Help.ReleaseNote} */ (Help.releaseNoteText.peekLast());
+};
+
+/**
+ * @return {!Common.Setting}
+ */
+Help.releaseNoteVersionSetting = function() {
+  if (!Help._releaseNoteVersionSetting) {
+    /** @type {!Common.Setting} */
+    Help._releaseNoteVersionSetting = Common.settings.createSetting('releaseNoteVersionSeen', 0, false);
+  }
+  return Help._releaseNoteVersionSetting;
+};
+
+Help.showReleaseNoteIfNeeded = function() {
+  Help._showReleaseNoteIfNeeded(Help.releaseNoteVersionSetting().get(), Help.browserVersion());
+};
+
+/**
+ * @param {number} lastSeenVersion
+ * @param {number} browserVersion
+ */
+Help._showReleaseNoteIfNeeded = function(lastSeenVersion, browserVersion) {
+  if (!Runtime.experiments.isEnabled('releaseNote'))
+    return;
+  if (lastSeenVersion >= browserVersion)
+    return;
+  if (Help.latestReleaseNote().version !== browserVersion)
+    return;
+  Help.releaseNoteVersionSetting().set(Help.browserVersion());
+  UI.inspectorView.showPanel(Help._releaseNoteViewId);
+};
+
+/**
+ * @return {number}
+ */
+Help.browserVersion = function() {
+  if (!Help._browserVersion) {
+    var chromeRegex = new RegExp('(?:^|\\W)Chrome/(\\d+)');
+    var chromeMatch = navigator.userAgent.match(chromeRegex);
+    /** @type {number} */
+    Help._browserVersion = Number(chromeMatch[1]);
+  }
+  return Help._browserVersion;
+};
+
+/**
+ * @const
+ * @type {string}
+ */
+Help._releaseNoteViewId = 'release-note';
+
+/** @typedef {!{src: string}} */
+Help.ReleaseNoteImage;
+
+/** @typedef {!{text: string, link: string, featured: (boolean | undefined)}} */
+Help.ReleaseNoteHighlight;
+
+/**
+ * @typedef {!{version: number, highlights: !Array<!Help.ReleaseNoteHighlight>,
+ *    link: string, image: !Help.ReleaseNoteImage}}
+ */
+Help.ReleaseNote;

diff --git a/third_party/WebKit/Source/devtools/front_end/help/ReleaseNote.js b/third_party/WebKit/Source/devtools/front_end/help/ReleaseNote.js
new file mode 100644
index 0000000..3af1db26
--- /dev/null
+++ b/third_party/WebKit/Source/devtools/front_end/help/ReleaseNote.js

@@ -0,0 +1,49 @@
+// Copyright 2017 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.
+
+Help.ReleaseNoteView = class extends UI.VBox {
+  constructor() {
+    super(true);
+    this.registerRequiredCSS('help/releaseNote.css');
+    var releaseNoteElement = this._createReleaseNoteElement(Help.latestReleaseNote());
+    this.contentElement.appendChild(releaseNoteElement);
+  }
+
+  /**
+   * @param {!Help.ReleaseNote} releaseNote
+   * @return {!Element}
+   */
+  _createReleaseNoteElement(releaseNote) {
+    var container = createElementWithClass('div', 'release-note-container');
+    var textContainer = container.createChild('div', 'release-note-text-container');
+    textContainer.createChild('div', 'release-note-header').textContent =
+        Common.UIString('New in DevTools %d', releaseNote.version);
+    var highlightContainer = textContainer.createChild('ul', 'release-note-highlight-container');
+    for (var highlight of releaseNote.highlights) {
+      var className = highlight.featured ? 'release-note-featured-link' : 'release-note-link';
+      var highlightLink = UI.createExternalLink(highlight.link, highlight.text, className);
+      highlightContainer.createChild('li').appendChild(highlightLink);
+    }
+
+    var viewMoreButton = UI.createTextButton(Common.UIString('And more...'), event => {
+      event.consume(true);
+      InspectorFrontendHost.openInNewTab(releaseNote.link);
+    });
+    textContainer.appendChild(viewMoreButton);
+
+    var closeButton = UI.createTextButton(Common.UIString('Dismiss'), event => {
+      event.consume(true);
+      UI.inspectorView.closeDrawerTab(Help._releaseNoteViewId, true);
+    }, 'close-release-note');
+    textContainer.appendChild(closeButton);
+
+    var imageLink = UI.createExternalLink(releaseNote.link, ' ', 'release-note-image-container');
+    container.appendChild(imageLink);
+    var image = imageLink.createChild('img', 'release-note-image');
+    image.src = releaseNote.image.src;
+    image.addEventListener('mouseover', e => container.classList.add('image-hover'));
+    image.addEventListener('mouseout', e => container.classList.remove('image-hover'));
+    return container;
+  }
+};

diff --git a/third_party/WebKit/Source/devtools/front_end/help/ReleaseNoteText.js b/third_party/WebKit/Source/devtools/front_end/help/ReleaseNoteText.js
new file mode 100644
index 0000000..da5ce49
--- /dev/null
+++ b/third_party/WebKit/Source/devtools/front_end/help/ReleaseNoteText.js

@@ -0,0 +1,33 @@
+// Copyright 2017 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.
+
+// NOTE: need to be careful about adding release notes early otherwise it'll
+// be shown in Canary (e.g. make sure the release notes are accurate).
+// https://github.com/ChromeDevTools/devtools-frontend/wiki/Release-Notes
+
+/** @type {!Array<!Help.ReleaseNote>} */
+Help.releaseNoteText = [
+  {
+    version: 58,
+    highlights: [
+      {
+        text: 'Review CSS changes in the new Changes drawer',
+        link: 'https://developers.google.com/web/updates/2016/06/devtools-digest',
+        featured: true,
+      },
+      {
+        text: 'Contextual icons in Console',
+        link: 'https://developers.google.com/web/updates/2016/06/devtools-digest',
+      },
+      {
+        text: 'Release notes for DevTools',
+        link: 'https://developers.google.com/web/updates/2016/06/devtools-digest',
+      },
+    ],
+    link: 'https://developers.google.com/web/updates/2016/06/devtools-digest',
+    image: {
+      src: 'https://developers.google.com/web/updates/images/2016/08/colorpicker.jpg',
+    },
+  },
+];

diff --git a/third_party/WebKit/Source/devtools/front_end/help/module.json b/third_party/WebKit/Source/devtools/front_end/help/module.json
new file mode 100644
index 0000000..a91d233e
--- /dev/null
+++ b/third_party/WebKit/Source/devtools/front_end/help/module.json

@@ -0,0 +1,26 @@
+{
+  "extensions": [
+    {
+      "type": "view",
+      "location": "drawer-view",
+      "id": "release-note",
+      "title": "What's New?",
+      "persistence": "closeable",
+      "order": 1,
+      "className": "Help.ReleaseNoteView",
+      "experiment": "releaseNote"
+    }
+  ],
+  "dependencies": [
+    "ui",
+    "host"
+  ],
+  "scripts": [
+    "Help.js",
+    "ReleaseNote.js",
+    "ReleaseNoteText.js"
+  ],
+  "resources": [
+    "releaseNote.css"
+  ]
+}

diff --git a/third_party/WebKit/Source/devtools/front_end/help/releaseNote.css b/third_party/WebKit/Source/devtools/front_end/help/releaseNote.css
new file mode 100644
index 0000000..06b1a7ed
--- /dev/null
+++ b/third_party/WebKit/Source/devtools/front_end/help/releaseNote.css

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017 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.
+ */
+
+.release-note-header {
+    font-size: 15px;
+}
+
+.release-note-container {
+    margin: 12px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap-reverse;
+    align-content: flex-start;
+}
+
+.release-note-highlight-container {
+    margin: 12px 0 12px -25px;
+    line-height: 1.5;
+    width: 100%;
+}
+
+.release-note-link, .release-note-featured-link {
+    color: #039be5;
+    text-decoration: none;
+}
+
+.release-note-link:hover,
+.release-note-featured-link:hover,
+.image-hover .release-note-featured-link {
+    text-decoration: underline;
+}
+
+.release-note-image-container {
+    /* Bottom padding is used when DevTools width is small and the image wraps */
+    padding: 0 0 12px 0;
+}
+
+.release-note-image {
+    width: 200px;
+}
+
+.release-note-text-container {
+    max-width: 300px;
+}
+
+.close-release-note {
+    margin-left: 4px;
+}

diff --git a/third_party/WebKit/Source/devtools/front_end/inline_editor/ColorSwatch.js b/third_party/WebKit/Source/devtools/front_end/inline_editor/ColorSwatch.js
index 823d9d7..54ef9ef2 100644
--- a/third_party/WebKit/Source/devtools/front_end/inline_editor/ColorSwatch.js
+++ b/third_party/WebKit/Source/devtools/front_end/inline_editor/ColorSwatch.js

@@ -133,8 +133,8 @@
     this._iconElement = root.createChild('span', 'color-swatch');
     this._iconElement.title = Common.UIString('Shift-click to change color format');
     this._swatchInner = this._iconElement.createChild('span', 'color-swatch-inner');
-    this._swatchInner.addEventListener('dblclick', (e) => e.consume(), false);
-    this._swatchInner.addEventListener('mousedown', (e) => e.consume(), false);
+    this._swatchInner.addEventListener('dblclick', e => e.consume(), false);
+    this._swatchInner.addEventListener('mousedown', e => e.consume(), false);
     this._swatchInner.addEventListener('click', this._handleClick.bind(this), true);
 
     root.createChild('content');

diff --git a/third_party/WebKit/Source/devtools/front_end/inline_editor/SwatchPopoverHelper.js b/third_party/WebKit/Source/devtools/front_end/inline_editor/SwatchPopoverHelper.js
index 60ef88f..b67ff4f 100644
--- a/third_party/WebKit/Source/devtools/front_end/inline_editor/SwatchPopoverHelper.js
+++ b/third_party/WebKit/Source/devtools/front_end/inline_editor/SwatchPopoverHelper.js

@@ -10,7 +10,7 @@
     this._popover = new UI.Popover();
     this._popover.setCanShrink(false);
     this._popover.setNoPadding(true);
-    this._popover.element.addEventListener('mousedown', (e) => e.consume(), false);
+    this._popover.element.addEventListener('mousedown', e => e.consume(), false);
 
     this._hideProxy = this.hide.bind(this, true);
     this._boundOnKeyDown = this._onKeyDown.bind(this);

diff --git a/third_party/WebKit/Source/devtools/front_end/inspector.json b/third_party/WebKit/Source/devtools/front_end/inspector.json
index f63d9ddd..ffca469 100644
--- a/third_party/WebKit/Source/devtools/front_end/inspector.json
+++ b/third_party/WebKit/Source/devtools/front_end/inspector.json

@@ -54,7 +54,8 @@
         { "name": "heap_snapshot_model" },
         { "name": "network_conditions", "type": "autostart"},
         { "name": "event_listeners" },
-        { "name": "object_ui", "type": "autostart"}
+        { "name": "object_ui", "type": "autostart"},
+        { "name": "help", "type": "autostart"}
     ],
 
     "has_html": true

diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
index 3e144fe..33331dc 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
+++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js

@@ -107,6 +107,7 @@
     Runtime.experiments.register('objectPreviews', 'Object previews', true);
     Runtime.experiments.register('persistence2', 'Persistence 2.0');
     Runtime.experiments.register('persistenceValidation', 'Validate persistence bindings');
+    Runtime.experiments.register('releaseNote', 'Release note', true);
     Runtime.experiments.register('requestBlocking', 'Request blocking', true);
     Runtime.experiments.register('timelineShowAllEvents', 'Show all events on Timeline', true);
     Runtime.experiments.register('timelineShowAllProcesses', 'Show all processes on Timeline', true);
@@ -130,6 +131,8 @@
         Runtime.experiments.enableForTest('cssTrackerPanel');
       if (testPath.indexOf('audits2/') !== -1)
         Runtime.experiments.enableForTest('audits2');
+      if (testPath.indexOf('help/') !== -1)
+        Runtime.experiments.enableForTest('releaseNote');
     }
 
     Runtime.experiments.setDefaultExperiments(['persistenceValidation', 'timelineMultipleMainViews']);
@@ -278,6 +281,8 @@
     console.timeStamp('Main._lateInitialization');
     this._registerShortcuts();
     Extensions.extensionServer.initializeExtensions();
+    if (!Host.isUnderTest())
+      Help.showReleaseNoteIfNeeded();
   }
 
   _registerForwardedShortcuts() {

diff --git a/third_party/WebKit/Source/devtools/front_end/main/module.json b/third_party/WebKit/Source/devtools/front_end/main/module.json
index df4d4435..55d8931d 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/module.json
+++ b/third_party/WebKit/Source/devtools/front_end/main/module.json

@@ -427,7 +427,8 @@
         "host",
         "platform",
         "sdk",
-        "persistence"
+        "persistence",
+        "help"
     ],
     "scripts": [
         "RenderingOptions.js",

diff --git a/third_party/WebKit/Source/devtools/front_end/network/BlockedURLsPane.js b/third_party/WebKit/Source/devtools/front_end/network/BlockedURLsPane.js
index e38c045..aa6445a 100644
--- a/third_party/WebKit/Source/devtools/front_end/network/BlockedURLsPane.js
+++ b/third_party/WebKit/Source/devtools/front_end/network/BlockedURLsPane.js

@@ -16,7 +16,7 @@
     this._blockedURLsSetting.addChangeListener(this._update, this);
 
     this._toolbar = new UI.Toolbar('', this.contentElement);
-    this._toolbar.element.addEventListener('click', (e) => e.consume());
+    this._toolbar.element.addEventListener('click', e => e.consume());
     var addButton = new UI.ToolbarButton(Common.UIString('Add pattern'), 'largeicon-add');
     addButton.addEventListener(UI.ToolbarButton.Events.Click, this._addButtonClicked, this);
     this._toolbar.appendToolbarItem(addButton);

diff --git a/third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js b/third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js
index 2d334da8..57ddf918 100644
--- a/third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js
+++ b/third_party/WebKit/Source/devtools/front_end/perf_ui/FlameChart.js

@@ -165,12 +165,14 @@
       return;
     this._highlightedEntryIndex = entryIndex;
     this._updateElementPosition(this._highlightElement, this._highlightedEntryIndex);
+    this._dataProvider.highlightEntry(entryIndex);
   }
 
   hideHighlight() {
     this._entryInfo.removeChildren();
     this._highlightedEntryIndex = -1;
     this._updateElementPosition(this._highlightElement, this._highlightedEntryIndex);
+    this._dataProvider.highlightEntry(-1);
   }
 
   _resetCanvas() {
@@ -1340,6 +1342,11 @@
 
   /**
    * @param {number} entryIndex
+   */
+  highlightEntry(entryIndex) {},
+
+  /**
+   * @param {number} entryIndex
    * @return {boolean}
    */
   forceDecoration(entryIndex) {},

diff --git a/third_party/WebKit/Source/devtools/front_end/profiler/CPUProfileFlameChart.js b/third_party/WebKit/Source/devtools/front_end/profiler/CPUProfileFlameChart.js
index 0d0d1dc5..d5d3135 100644
--- a/third_party/WebKit/Source/devtools/front_end/profiler/CPUProfileFlameChart.js
+++ b/third_party/WebKit/Source/devtools/front_end/profiler/CPUProfileFlameChart.js

@@ -115,6 +115,13 @@
   /**
    * @override
    * @param {number} entryIndex
+   */
+  highlightEntry(entryIndex) {
+  }
+
+  /**
+   * @override
+   * @param {number} entryIndex
    * @return {boolean}
    */
   canJumpToEntry(entryIndex) {

diff --git a/third_party/WebKit/Source/devtools/front_end/profiler/ProfileLauncherView.js b/third_party/WebKit/Source/devtools/front_end/profiler/ProfileLauncherView.js
index 626ebe9..0fc88a5 100644
--- a/third_party/WebKit/Source/devtools/front_end/profiler/ProfileLauncherView.js
+++ b/third_party/WebKit/Source/devtools/front_end/profiler/ProfileLauncherView.js

@@ -27,8 +27,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /**
- * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
 Profiler.ProfileLauncherView = class extends UI.VBox {
@@ -37,11 +37,8 @@
    */
   constructor(profilesPanel) {
     super();
-
     this._panel = profilesPanel;
-
-    this.element.classList.add('profile-launcher-view');
-    this.element.classList.add('panel-enabler-view');
+    this.element.classList.add('profile-launcher-view', 'panel-enabler-view');
 
     this._contentElement = this.element.createChild('div', 'profile-launcher-view-content');
     this._innerContentElement = this._contentElement.createChild('div');
@@ -55,51 +52,13 @@
     this._recordButtonEnabled = true;
     this._loadButton = UI.createTextButton(Common.UIString('Load'), this._loadButtonClicked.bind(this), 'load-profile');
     this._contentElement.appendChild(this._loadButton);
-    SDK.targetManager.observeTargets(this);
-  }
 
-  /**
-   * @return {?UI.SearchableView}
-   */
-  searchableView() {
-    return null;
-  }
-
-  /**
-   * @override
-   * @param {!SDK.Target} target
-   */
-  targetAdded(target) {
-    this._updateLoadButtonLayout();
-  }
-
-  /**
-   * @override
-   * @param {!SDK.Target} target
-   */
-  targetRemoved(target) {
-    this._updateLoadButtonLayout();
-  }
-
-  _updateLoadButtonLayout() {
-    this._loadButton.classList.toggle('multi-target', SDK.targetManager.targets(SDK.Target.Capability.JS).length > 1);
-  }
-
-  /**
-   * @param {!Profiler.ProfileType} profileType
-   */
-  addProfileType(profileType) {
-    var descriptionElement = this._innerContentElement.createChild('h1');
-    descriptionElement.textContent = profileType.description;
-    var decorationElement = profileType.decorationElement();
-    if (decorationElement)
-      this._innerContentElement.appendChild(decorationElement);
-    this._isInstantProfile = profileType.isInstantProfile();
-    this._isEnabled = profileType.isEnabled();
-  }
-
-  _controlButtonClicked() {
-    this._panel.toggleRecord();
+    this._selectedProfileTypeSetting = Common.settings.createSetting('selectedProfileType', 'CPU');
+    this._header = this._innerContentElement.createChild('h1');
+    this._profileTypeSelectorForm = this._innerContentElement.createChild('form');
+    this._innerContentElement.createChild('div', 'flexible-space');
+    /** @type {!Map<string, !HTMLOptionElement>} */
+    this._typeIdToOptionElement = new Map();
   }
 
   _loadButtonClicked() {
@@ -122,6 +81,8 @@
       this._controlButton.classList.remove('running');
       this._controlButton.textContent = Common.UIString('Start');
     }
+    for (var item of this._typeIdToOptionElement.values())
+      item.disabled = !!this._isProfiling;
   }
 
   profileStarted() {
@@ -144,27 +105,8 @@
     this._isEnabled = profileType.isEnabled();
     this._updateControls();
   }
-};
-
-/**
- * @unrestricted
- */
-Profiler.MultiProfileLauncherView = class extends Profiler.ProfileLauncherView {
-  /**
-   * @param {!Profiler.ProfilesPanel} profilesPanel
-   */
-  constructor(profilesPanel) {
-    super(profilesPanel);
-    this._selectedProfileTypeSetting = Common.settings.createSetting('selectedProfileType', 'CPU');
-    this._header = this._innerContentElement.createChild('h1');
-    this._profileTypeSelectorForm = this._innerContentElement.createChild('form');
-    this._innerContentElement.createChild('div', 'flexible-space');
-    /** @type {!Map<string, !HTMLOptionElement>} */
-    this._typeIdToOptionElement = new Map();
-  }
 
   /**
-   * @override
    * @param {!Profiler.ProfileType} profileType
    */
   addProfileType(profileType) {
@@ -192,57 +134,26 @@
       typeId = this._typeIdToOptionElement.keys().next().value;
     this._typeIdToOptionElement.get(typeId).checked = true;
     var type = this._typeIdToOptionElement.get(typeId)._profileType;
-    this.dispatchEventToListeners(Profiler.MultiProfileLauncherView.Events.ProfileTypeSelected, type);
+    this.dispatchEventToListeners(Profiler.ProfileLauncherView.Events.ProfileTypeSelected, type);
   }
 
-  /**
-   * @override
-   */
   _controlButtonClicked() {
     this._panel.toggleRecord();
   }
 
   /**
-   * @override
-   */
-  _updateControls() {
-    super._updateControls();
-    var items = this._profileTypeSelectorForm.elements;
-    for (var i = 0; i < items.length; ++i) {
-      if (items[i].type === 'radio')
-        items[i].disabled = this._isProfiling;
-    }
-  }
-
-  /**
    * @param {!Profiler.ProfileType} profileType
    */
   _profileTypeChanged(profileType) {
-    this.dispatchEventToListeners(Profiler.MultiProfileLauncherView.Events.ProfileTypeSelected, profileType);
+    this.dispatchEventToListeners(Profiler.ProfileLauncherView.Events.ProfileTypeSelected, profileType);
     this._isInstantProfile = profileType.isInstantProfile();
     this._isEnabled = profileType.isEnabled();
     this._updateControls();
     this._selectedProfileTypeSetting.set(profileType.id);
   }
-
-  /**
-   * @override
-   */
-  profileStarted() {
-    this._isProfiling = true;
-    this._updateControls();
-  }
-
-  /**
-   * @override
-   */
-  profileFinished() {
-    this._isProfiling = false;
-    this._updateControls();
-  }
 };
 
 /** @enum {symbol} */
-Profiler.MultiProfileLauncherView.Events = {
+Profiler.ProfileLauncherView.Events = {
   ProfileTypeSelected: Symbol('ProfileTypeSelected')
 };

diff --git a/third_party/WebKit/Source/devtools/front_end/profiler/ProfilesPanel.js b/third_party/WebKit/Source/devtools/front_end/profiler/ProfilesPanel.js
index 53ceb75..5829c1f 100644
--- a/third_party/WebKit/Source/devtools/front_end/profiler/ProfilesPanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/profiler/ProfilesPanel.js

@@ -80,9 +80,9 @@
     this._profileViewToolbar = new UI.Toolbar('', this._toolbarElement);
 
     this._profileGroups = {};
-    this._launcherView = new Profiler.MultiProfileLauncherView(this);
+    this._launcherView = new Profiler.ProfileLauncherView(this);
     this._launcherView.addEventListener(
-        Profiler.MultiProfileLauncherView.Events.ProfileTypeSelected, this._onProfileTypeSelected, this);
+        Profiler.ProfileLauncherView.Events.ProfileTypeSelected, this._onProfileTypeSelected, this);
 
     this._profileToView = [];
     this._typeIdToSidebarSection = {};

diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js b/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js
index af55aa88..a109453e 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js

@@ -13,6 +13,7 @@
     this._reportView.show(this.contentElement);
 
     this._toolbar = this._reportView.createToolbar();
+    this._toolbar.makeWrappable(false, true);
 
     /** @type {!Map<!SDK.ServiceWorkerRegistration, !Resources.ServiceWorkersView.Section>} */
     this._sections = new Map();
@@ -28,9 +29,9 @@
     var fallbackToNetwork = new UI.ToolbarSettingCheckbox(
         bypassServiceWorkerSetting, Common.UIString('Bypass Service Worker and load resources from the network'));
     this._toolbar.appendToolbarItem(fallbackToNetwork);
-    this._toolbar.appendSpacer();
     this._showAllCheckbox = new UI.ToolbarCheckbox(
         Common.UIString('Show all'), Common.UIString('Show all Service Workers regardless of the origin'));
+    this._showAllCheckbox.setRightAligned(true);
     this._showAllCheckbox.inputElement.addEventListener('change', this._updateSectionVisibility.bind(this), false);
     this._toolbar.appendToolbarItem(this._showAllCheckbox);
 
@@ -232,7 +233,7 @@
     var version = this._manager.findVersion(versionId);
     if (!version || !version.targetId)
       return null;
-    return this._subTargetsManager.targetForId(version.targetId);
+    return SDK.targetManager.targetById(version.targetId);
   }
 
   /**

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js b/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
index 06a0cfb..987f68a 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/Connections.js

@@ -117,7 +117,7 @@
     this._socket = new WebSocket(url);
     this._socket.onerror = this._onError.bind(this);
     this._socket.onopen = this._onOpen.bind(this);
-    this._socket.onmessage = (messageEvent) => params.onMessage.call(null, /** @type {string} */ (messageEvent.data));
+    this._socket.onmessage = messageEvent => params.onMessage.call(null, /** @type {string} */ (messageEvent.data));
     this._socket.onclose = this._onClose.bind(this);
 
     this._onDisconnect = params.onDisconnect;

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
index 30d3247..1b915c3 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ConsoleModel.js

@@ -124,8 +124,7 @@
    * @param {!SDK.ConsoleMessage} msg
    */
   addMessage(msg) {
-    if (msg.source === SDK.ConsoleMessage.MessageSource.Worker && msg.target().subTargetsManager &&
-        msg.target().subTargetsManager.targetForId(msg.workerId))
+    if (msg.source === SDK.ConsoleMessage.MessageSource.Worker && SDK.targetManager.targetById(msg.workerId))
       return;
 
     if (msg.source === SDK.ConsoleMessage.MessageSource.ConsoleAPI && msg.type === SDK.ConsoleMessage.MessageType.Clear)

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js
index d4c9f1a..4edc2a2 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/RuntimeModel.js

@@ -453,11 +453,7 @@
     this.runtimeModel = target.runtimeModel;
     this.debuggerModel = SDK.DebuggerModel.fromTarget(target);
     this.frameId = frameId;
-
-    this._label = name;
-    var parsedUrl = origin.asParsedURL();
-    if (!this._label && parsedUrl)
-      this._label = parsedUrl.lastPathComponentWithFragment();
+    this._setLabel('');
   }
 
   /**
@@ -583,9 +579,25 @@
    * @param {string} label
    */
   setLabel(label) {
-    this._label = label;
+    this._setLabel(label);
     this.runtimeModel.dispatchEventToListeners(SDK.RuntimeModel.Events.ExecutionContextChanged, this);
   }
+
+  /**
+   * @param {string} label
+   */
+  _setLabel(label) {
+    if (label) {
+      this._label = label;
+      return;
+    }
+    if (this.name) {
+      this._label = this.name;
+      return;
+    }
+    var parsedUrl = this.origin.asParsedURL();
+    this._label = parsedUrl ? parsedUrl.lastPathComponentWithFragment() : '';
+  }
 };
 
 

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js
index 01a7eef..120b85a 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js

@@ -583,10 +583,7 @@
     var parent = target.parentTarget();
     if (!parent || parent.parentTarget() !== this._target)
       return null;
-    var targetInfo = this._subTargetsManager.targetInfo(parent);
-    if (!targetInfo || targetInfo.type !== 'service_worker')
-      return null;
-    return targetInfo.id;
+    return parent.id();
   }
 
   _updateAllContextLabels() {
@@ -605,11 +602,12 @@
    * @param {?SDK.ServiceWorkerVersion} version
    */
   _updateContextLabel(context, version) {
+    if (!version) {
+      context.setLabel('');
+      return;
+    }
     var parsedUrl = context.origin.asParsedURL();
     var label = parsedUrl ? parsedUrl.lastPathComponentWithFragment() : context.name;
-    if (version)
-      context.setLabel(label + ' #' + version.id + ' (' + version.status + ')');
-    else
-      context.setLabel(label);
+    context.setLabel(label + ' #' + version.id + ' (' + version.status + ')');
   }
 };

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js b/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
index a7645e0..8101ab0 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/SourceMap.js

@@ -374,10 +374,9 @@
       return [];
     var mappings = this.mappings();
     var info = this._sourceInfos.get(sourceURL);
-    if (info.reverseMappings === null) {
-      info.reverseMappings =
-          mappings.filter((mapping) => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
-    }
+    if (info.reverseMappings === null)
+      info.reverseMappings = mappings.filter(mapping => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
+
     return info.reverseMappings;
 
     /**

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js
index b8501c5..ef20196 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js

@@ -110,22 +110,6 @@
   }
 
   /**
-   * @param {string} targetId
-   * @return {?SDK.Target}
-   */
-  targetForId(targetId) {
-    return this._attachedTargets.get(targetId) || null;
-  }
-
-  /**
-   * @param {!SDK.Target} target
-   * @return {?SDK.TargetInfo}
-   */
-  targetInfo(target) {
-    return target[SDK.SubTargetsManager._InfoSymbol] || null;
-  }
-
-  /**
    * @param {string} type
    * @return {number}
    */
@@ -156,8 +140,8 @@
       targetName = parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + (++this._lastAnonymousTargetId);
     }
     var target = SDK.targetManager.createTarget(
-        targetName, this._capabilitiesForType(targetInfo.type), this._createConnection.bind(this, targetInfo.id),
-        this.target());
+        targetInfo.id, targetName, this._capabilitiesForType(targetInfo.type),
+        this._createConnection.bind(this, targetInfo.id), this.target());
     target[SDK.SubTargetsManager._InfoSymbol] = targetInfo;
     this._attachedTargets.set(targetInfo.id, target);
 
@@ -234,8 +218,7 @@
     var idsToDetach = [];
     for (var targetId of this._attachedTargets.keys()) {
       var target = this._attachedTargets.get(targetId);
-      var targetInfo = this.targetInfo(target);
-      if (targetInfo.type === 'worker')
+      if (target[SDK.SubTargetsManager._InfoSymbol].type === 'worker')
         idsToDetach.push(targetId);
     }
     idsToDetach.forEach(id => this._detachedFromTarget(id));

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/Target.js b/third_party/WebKit/Source/devtools/front_end/sdk/Target.js
index 2b25a282..222c5b6 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/Target.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/Target.js

@@ -10,19 +10,20 @@
 SDK.Target = class extends Protocol.TargetBase {
   /**
    * @param {!SDK.TargetManager} targetManager
+   * @param {string} id
    * @param {string} name
    * @param {number} capabilitiesMask
    * @param {!Protocol.InspectorBackend.Connection.Factory} connectionFactory
    * @param {?SDK.Target} parentTarget
    */
-  constructor(targetManager, name, capabilitiesMask, connectionFactory, parentTarget) {
+  constructor(targetManager, id, name, capabilitiesMask, connectionFactory, parentTarget) {
     super(connectionFactory);
     this._targetManager = targetManager;
     this._name = name;
     this._inspectedURL = '';
     this._capabilitiesMask = capabilitiesMask;
     this._parentTarget = parentTarget;
-    this._id = SDK.Target._nextId++;
+    this._id = id;
     this._modelByConstructor = new Map();
   }
 
@@ -39,7 +40,7 @@
   }
 
   /**
-   * @return {number}
+   * @return {string}
    */
   id() {
     return this._id;
@@ -198,8 +199,6 @@
   AllForTests: 127
 };
 
-SDK.Target._nextId = 1;
-
 /**
  * @unrestricted
  */

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
index 9ab919f..1a95381 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js

@@ -229,14 +229,15 @@
   }
 
   /**
+   * @param {string} id
    * @param {string} name
    * @param {number} capabilitiesMask
    * @param {!Protocol.InspectorBackend.Connection.Factory} connectionFactory
    * @param {?SDK.Target} parentTarget
    * @return {!SDK.Target}
    */
-  createTarget(name, capabilitiesMask, connectionFactory, parentTarget) {
-    var target = new SDK.Target(this, name, capabilitiesMask, connectionFactory, parentTarget);
+  createTarget(id, name, capabilitiesMask, connectionFactory, parentTarget) {
+    var target = new SDK.Target(this, id, name, capabilitiesMask, connectionFactory, parentTarget);
     this._pendingTargets.add(target);
 
     /** @type {!SDK.ConsoleModel} */
@@ -314,7 +315,7 @@
    */
   _observersForTarget(target) {
     return this._observers.filter(
-        (observer) => target.hasAllCapabilities(observer[this._observerCapabiliesMaskSymbol] || 0));
+        observer => target.hasAllCapabilities(observer[this._observerCapabiliesMaskSymbol] || 0));
   }
 
   /**
@@ -354,12 +355,12 @@
     if (!capabilitiesMask)
       return this._targets.slice();
     else
-      return this._targets.filter((target) => target.hasAllCapabilities(capabilitiesMask || 0));
+      return this._targets.filter(target => target.hasAllCapabilities(capabilitiesMask || 0));
   }
 
   /**
    *
-   * @param {number} id
+   * @param {string} id
    * @return {?SDK.Target}
    */
   targetById(id) {
@@ -406,7 +407,8 @@
   _connectAndCreateMainTarget() {
     if (Runtime.queryParam('nodeFrontend')) {
       var target = new SDK.Target(
-          this, Common.UIString('Node'), SDK.Target.Capability.Target, this._createMainConnection.bind(this), null);
+          this, 'main', Common.UIString('Node'), SDK.Target.Capability.Target, this._createMainConnection.bind(this),
+          null);
       target.subTargetsManager = new SDK.SubTargetsManager(target);
       target.setInspectedURL('Node');
       Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSFromFrontend);
@@ -424,7 +426,8 @@
       Host.userMetrics.actionTaken(Host.UserMetrics.Action.ConnectToNodeJSDirectly);
     }
 
-    var target = this.createTarget(Common.UIString('Main'), capabilities, this._createMainConnection.bind(this), null);
+    var target =
+        this.createTarget('main', Common.UIString('Main'), capabilities, this._createMainConnection.bind(this), null);
     target.runtimeAgent().runIfWaitingForDebugger();
   }
 

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js b/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js
index 6b477d6..69f172c 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js

@@ -112,10 +112,10 @@
         SDK.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
     SDK.targetManager.addModelListener(
         SDK.DebuggerModel, SDK.DebuggerModel.Events.DebuggerResumed,
-        (event) => this._debuggerResumed(/** @type {!SDK.DebuggerModel} */ (event.data)));
+        event => this._debuggerResumed(/** @type {!SDK.DebuggerModel} */ (event.data)));
     SDK.targetManager.addModelListener(
         SDK.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared,
-        (event) => this._debuggerResumed(/** @type {!SDK.DebuggerModel} */ (event.data)));
+        event => this._debuggerResumed(/** @type {!SDK.DebuggerModel} */ (event.data)));
     SDK.targetManager.addModelListener(
         SDK.SubTargetsManager, SDK.SubTargetsManager.Events.AvailableNodeTargetsChanged,
         this._availableNodeTargetsChanged, this);

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js b/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
index e97e00e..897bbbfe 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js

@@ -10,12 +10,12 @@
     super(true);
     this.registerRequiredCSS('sources/threadsSidebarPane.css');
 
-    this._availableNodeTargetsElement = this.element.createChild('div', 'hidden available-node-targets');
-
     /** @type {!UI.ListControl<!SDK.DebuggerModel>} */
     this._list = new UI.ListControl(this, UI.ListMode.NonViewport);
     this.contentElement.appendChild(this._list.element);
 
+    this._availableNodeTargetsElement = this.contentElement.createChild('div', 'hidden available-node-targets');
+
     UI.context.addFlavorChangeListener(SDK.Target, this._targetFlavorChanged, this);
 
     SDK.targetManager.addModelListener(

diff --git a/third_party/WebKit/Source/devtools/front_end/test_runner/TestRunner.js b/third_party/WebKit/Source/devtools/front_end/test_runner/TestRunner.js
index bf1dff2..d270d6c 100644
--- a/third_party/WebKit/Source/devtools/front_end/test_runner/TestRunner.js
+++ b/third_party/WebKit/Source/devtools/front_end/test_runner/TestRunner.js

@@ -9,9 +9,9 @@
 
 TestRunner.executeTestScript = function() {
   fetch(`${Runtime.queryParam('test')}`)
-      .then((data) => data.text())
-      .then((testScript) => eval(`(function(){${testScript}})()`))
-      .catch((error) => {
+      .then(data => data.text())
+      .then(testScript => eval(`(function(){${testScript}})()`))
+      .catch(error => {
         TestRunner.addResult(`Unable to execute test script because of error: ${error}`);
         TestRunner.completeTest();
       });

diff --git a/third_party/WebKit/Source/devtools/front_end/text_editor/TextEditorAutocompleteController.js b/third_party/WebKit/Source/devtools/front_end/text_editor/TextEditorAutocompleteController.js
index ffd7f89..f0f76cf6 100644
--- a/third_party/WebKit/Source/devtools/front_end/text_editor/TextEditorAutocompleteController.js
+++ b/third_party/WebKit/Source/devtools/front_end/text_editor/TextEditorAutocompleteController.js

@@ -90,7 +90,7 @@
   _removeWordsFromText(text) {
     Common.TextUtils.textToWords(
         text, /** @type {function(string):boolean} */ (this._config.isWordChar),
-        (word) => this._dictionary.removeWord(word));
+        word => this._dictionary.removeWord(word));
   }
 
   /**
@@ -126,7 +126,7 @@
     var completions = this._dictionary.wordsWithPrefix(this._textEditor.text(queryRange));
     var substituteWord = this._textEditor.text(substituteRange);
     if (this._dictionary.wordCount(substituteWord) === 1)
-      completions = completions.filter((word) => word !== substituteWord);
+      completions = completions.filter(word => word !== substituteWord);
 
     completions.sort((a, b) => this._dictionary.wordCount(b) - this._dictionary.wordCount(a) || a.length - b.length);
     return Promise.resolve(completions.map(item => ({text: item})));

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/EventsTimelineTreeView.js b/third_party/WebKit/Source/devtools/front_end/timeline/EventsTimelineTreeView.js
index 951b5e0..1a719b6a 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/EventsTimelineTreeView.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/EventsTimelineTreeView.js

@@ -113,17 +113,9 @@
     var traceEvent = node.event;
     if (!traceEvent)
       return false;
-    Timeline.TimelineUIUtils.buildTraceEventDetails(
-        traceEvent, this.model().timelineModel(), this._linkifier, false, showDetails.bind(this));
+    Timeline.TimelineUIUtils.buildTraceEventDetails(traceEvent, this.model().timelineModel(), this._linkifier, false)
+      .then(fragment => this._detailsView.element.appendChild(fragment));
     return true;
-
-    /**
-     * @param {!DocumentFragment} fragment
-     * @this {Timeline.EventsTimelineTreeView}
-     */
-    function showDetails(fragment) {
-      this._detailsView.element.appendChild(fragment);
-    }
   }
 
   /**

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js
index e97ba72b..00272073 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js

@@ -143,7 +143,7 @@
   }
 
   /**
-   * @param {number} targetId
+   * @param {string} targetId
    * @param {?Protocol.Error} error
    * @param {?Protocol.Profiler.Profile} cpuProfile
    */
@@ -264,11 +264,12 @@
     var workerMetaEvents = metadataEvents.filter(event => event.name === metadataEventTypes.TracingSessionIdForWorker);
     for (var metaEvent of workerMetaEvents) {
       var workerId = metaEvent.args['data']['workerId'];
-      var workerTarget = this._target.subTargetsManager ? this._target.subTargetsManager.targetForId(workerId) : null;
+      var workerTarget = SDK.targetManager.targetById(workerId);
       if (!workerTarget)
         continue;
       var cpuProfile = this._cpuProfiles.get(workerTarget.id());
-      this._injectCpuProfileEvent(pid, metaEvent.args['data']['workerThreadId'], cpuProfile);
+      this._injectCpuProfileEvent(
+          metaEvent.thread.process().id(), metaEvent.args['data']['workerThreadId'], cpuProfile);
     }
     this._cpuProfiles = null;
   }

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineDetailsView.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineDetailsView.js
index 3242212..615df98 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineDetailsView.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineDetailsView.js

@@ -117,8 +117,8 @@
       case Timeline.TimelineSelection.Type.TraceEvent:
         var event = /** @type {!SDK.TracingModel.Event} */ (this._selection.object());
         Timeline.TimelineUIUtils.buildTraceEventDetails(
-            event, this._model.timelineModel(), this._detailsLinkifier, true,
-            this._appendDetailsTabsForTraceEventAndShowDetails.bind(this, event));
+            event, this._model.timelineModel(), this._detailsLinkifier, true)
+                .then(fragment => this._appendDetailsTabsForTraceEventAndShowDetails(event, fragment));
         break;
       case Timeline.TimelineSelection.Type.Frame:
         var frame = /** @type {!TimelineModel.TimelineFrame} */ (this._selection.object());

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js
index 48293ea1..42aad625 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChart.js

@@ -494,6 +494,25 @@
   /**
    * @override
    * @param {number} entryIndex
+   */
+  highlightEntry(entryIndex) {
+    SDK.DOMModel.hideDOMNodeHighlight();
+    var event = /** @type {!SDK.TracingModel.Event} */ (this._entryData[entryIndex]);
+    if (!event)
+      return;
+    var target = this._model.targetByEvent(event);
+    if (!target)
+      return;
+    var timelineData = TimelineModel.TimelineData.forEvent(event);
+    var backendNodeId = timelineData.backendNodeId;
+    if (!backendNodeId)
+      return;
+    new SDK.DeferredDOMNode(target, backendNodeId).highlight();
+  }
+
+  /**
+   * @override
+   * @param {number} entryIndex
    * @return {string}
    */
   entryColor(entryIndex) {

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineNetworkFlameChart.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineNetworkFlameChart.js
index d066c15..0facabeb 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineNetworkFlameChart.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineNetworkFlameChart.js

@@ -295,6 +295,13 @@
   }
 
   /**
+   * @override
+   * @param {number} entryIndex
+   */
+  highlightEntry(entryIndex) {
+  }
+
+  /**
    * @param {string} priority
    * @return {?string}
    */

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
index c257246..1dbcfe13 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js

@@ -673,25 +673,28 @@
    * @param {!TimelineModel.TimelineModel} model
    * @param {!Components.Linkifier} linkifier
    * @param {boolean} detailed
-   * @param {function(!DocumentFragment)} callback
+   * @return {!Promise<!DocumentFragment>}
    */
-  static buildTraceEventDetails(event, model, linkifier, detailed, callback) {
-    var target = model.targetByEvent(event);
-    if (!target) {
-      callbackWrapper();
-      return;
+  static async buildTraceEventDetails(event, model, linkifier, detailed) {
+    var maybeTarget = model.targetByEvent(event);
+    if (!maybeTarget) {
+      return Timeline.TimelineUIUtils._buildTraceEventDetailsSynchronously(
+          event, model, linkifier, detailed, null);
     }
-    var relatedNodes = null;
-    var barrier = new CallbackBarrier();
+
+    var target = /** @type {!SDK.Target} */ (maybeTarget);
     if (!event[Timeline.TimelineUIUtils._previewElementSymbol]) {
       var url = TimelineModel.TimelineData.forEvent(event).url;
-      if (url) {
-        Components.DOMPresentationUtils.buildImagePreviewContents(
-            target, url, false, barrier.createCallback(saveImage));
-      } else if (TimelineModel.TimelineData.forEvent(event).picture) {
-        Timeline.TimelineUIUtils.buildPicturePreviewContent(event, target, barrier.createCallback(saveImage));
-      }
+      event[Timeline.TimelineUIUtils._previewElementSymbol] = await new Promise(fulfill => {
+        if (url)
+          Components.DOMPresentationUtils.buildImagePreviewContents(target, url, false, fulfill);
+        else if (TimelineModel.TimelineData.forEvent(event).picture)
+          Timeline.TimelineUIUtils.buildPicturePreviewContent(event, target, fulfill);
+        else
+          fulfill();
+      }) || null;
     }
+
     var nodeIdsToResolve = new Set();
     var timelineData = TimelineModel.TimelineData.forEvent(event);
     if (timelineData.backendNodeId)
@@ -699,31 +702,17 @@
     var invalidationTrackingEvents = TimelineModel.InvalidationTracker.invalidationEventsFor(event);
     if (invalidationTrackingEvents)
       Timeline.TimelineUIUtils._collectInvalidationNodeIds(nodeIdsToResolve, invalidationTrackingEvents);
+    var relatedNodes = null;
     if (nodeIdsToResolve.size) {
       var domModel = SDK.DOMModel.fromTarget(target);
-      if (domModel)
-        domModel.pushNodesByBackendIdsToFrontend(nodeIdsToResolve, barrier.createCallback(setRelatedNodeMap));
-    }
-    barrier.callWhenDone(callbackWrapper);
-
-    /**
-     * @param {!Element=} element
-     */
-    function saveImage(element) {
-      event[Timeline.TimelineUIUtils._previewElementSymbol] = element || null;
+      if (domModel) {
+        relatedNodes = await new Promise(fulfill =>
+            domModel.pushNodesByBackendIdsToFrontend(nodeIdsToResolve, fulfill));
+      }
     }
 
-    /**
-     * @param {?Map<number, ?SDK.DOMNode>} nodeMap
-     */
-    function setRelatedNodeMap(nodeMap) {
-      relatedNodes = nodeMap;
-    }
-
-    function callbackWrapper() {
-      callback(Timeline.TimelineUIUtils._buildTraceEventDetailsSynchronously(
-          event, model, linkifier, detailed, relatedNodes));
-    }
+    return Timeline.TimelineUIUtils._buildTraceEventDetailsSynchronously(
+          event, model, linkifier, detailed, relatedNodes);
   }
 
   /**
@@ -802,7 +791,11 @@
         }
         if (eventData['encodedDataLength']) {
           contentHelper.appendTextRow(
-              Common.UIString('Encoded Data Length'), Common.UIString('%d Bytes', eventData['encodedDataLength']));
+              Common.UIString('Encoded Data'), Common.UIString('%d Bytes', eventData['encodedDataLength']));
+        }
+        if (eventData['decodedBodyLength']) {
+          contentHelper.appendTextRow(
+              Common.UIString('Decoded Body'), Common.UIString('%d Bytes', eventData['decodedBodyLength']));
         }
         break;
       case recordTypes.CompileScript:
@@ -1100,12 +1093,14 @@
       contentHelper.appendTextRow(Common.UIString('Mime Type'), request.mimeType);
     var lengthText = '';
     if (request.fromCache)
-      lengthText += Common.UIString('(from cache) ');
+      lengthText += Common.UIString(' (from cache)');
     if (request.fromServiceWorker)
-      lengthText += Common.UIString('(from service worker)');
+      lengthText += Common.UIString(' (from service worker)');
     if (request.encodedDataLength || !lengthText)
-      lengthText = `${Number.bytesToString(request.encodedDataLength)} ${lengthText}`;
-    contentHelper.appendTextRow(Common.UIString('Encoded Length'), lengthText);
+      lengthText = `${Number.bytesToString(request.encodedDataLength)}${lengthText}`;
+    contentHelper.appendTextRow(Common.UIString('Encoded Data'), lengthText);
+    if (request.decodedBodyLength)
+      contentHelper.appendTextRow(Common.UIString('Decoded Body'), Number.bytesToString(request.decodedBodyLength));
     const title = Common.UIString('Initiator');
     const sendRequest = request.children[0];
     const topFrame = TimelineModel.TimelineData.forEvent(sendRequest).topFrame();
@@ -1967,7 +1962,7 @@
     for (var i = 0; i < invalidations.length; i++) {
       var invalidation = invalidations[i];
       var invalidationNode = this._createInvalidationNode(invalidation, false);
-      invalidationNode.addEventListener('click', (e) => e.consume(), false);
+      invalidationNode.addEventListener('click', e => e.consume(), false);
       if (invalidationNode && !invalidationNodeIdMap[invalidation.nodeId]) {
         invalidationNodes.push(invalidationNode);
         invalidationNodeIdMap[invalidation.nodeId] = true;

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
index b960a62..63ba41e5 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

@@ -163,7 +163,7 @@
     // FIXME: Consider returning null for loaded traces.
     var workerId = this._workerIdByThread.get(event.thread);
     var mainTarget = SDK.targetManager.mainTarget();
-    return workerId ? mainTarget.subTargetsManager.targetForId(workerId) : mainTarget;
+    return workerId ? SDK.targetManager.targetById(workerId) : mainTarget;
   }
 
   /**
@@ -1289,6 +1289,7 @@
     this.startTime = event.name === TimelineModel.TimelineModel.RecordType.ResourceSendRequest ? event.startTime : 0;
     this.endTime = Infinity;
     this.encodedDataLength = 0;
+    this.decodedBodyLength = 0;
     /** @type {!Array<!SDK.TracingModel.Event>} */
     this.children = [];
     /** @type {?Object} */
@@ -1321,7 +1322,7 @@
     if (!this.responseTime &&
         (event.name === recordType.ResourceReceiveResponse || event.name === recordType.ResourceReceivedData))
       this.responseTime = event.startTime;
-    const encodedDataLength = eventData['encodedDataLength'] || 0;
+    var encodedDataLength = eventData['encodedDataLength'] || 0;
     if (event.name === recordType.ResourceReceiveResponse) {
       if (eventData['fromCache'])
         this.fromCache = true;
@@ -1333,6 +1334,9 @@
       this.encodedDataLength += encodedDataLength;
     if (event.name === recordType.ResourceFinish && encodedDataLength)
       this.encodedDataLength = encodedDataLength;
+    var decodedBodyLength = eventData['decodedBodyLength'];
+    if (event.name === recordType.ResourceFinish && decodedBodyLength)
+      this.decodedBodyLength = decodedBodyLength;
     if (!this.url)
       this.url = eventData['url'];
     if (!this.requestMethod)

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js b/third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js
index 09b1242..077d6c9a 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js

@@ -227,6 +227,14 @@
   }
 
   /**
+   * @param {string} id
+   * @param {boolean=} userGesture
+   */
+  closeDrawerTab(id, userGesture) {
+    this._drawerTabbedPane.closeTab(id, userGesture);
+  }
+
+  /**
    * @param {!Event} event
    */
   _keyDown(event) {

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/SoftContextMenu.js b/third_party/WebKit/Source/devtools/front_end/ui/SoftContextMenu.js
index ed7e23c..1f905c9 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/SoftContextMenu.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/SoftContextMenu.js

@@ -61,7 +61,7 @@
     this.element.style.left = (this._parentMenu ? x - subMenuOverlap : x) + 'px';
 
     this._contextMenuElement.tabIndex = 0;
-    this._contextMenuElement.addEventListener('mouseup', (e) => e.consume(), false);
+    this._contextMenuElement.addEventListener('mouseup', e => e.consume(), false);
     this._contextMenuElement.addEventListener('keydown', this._menuKeyDown.bind(this), false);
 
     for (var i = 0; i < this._items.length; ++i)

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
index 1607fe6..75ed17ce 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js

@@ -194,12 +194,15 @@
 
   /**
    * @param {boolean=} reverse
+   * @param {boolean=} growVertically
    */
-  makeWrappable(reverse) {
+  makeWrappable(reverse, growVertically) {
     this._contentElement.classList.add('wrappable');
     this._reverse = !!reverse;
     if (reverse)
       this._contentElement.classList.add('wrappable-reverse');
+    if (growVertically)
+      this._contentElement.classList.add('toolbar-grow-vertical');
   }
 
   makeVertical() {
@@ -429,6 +432,10 @@
     if (this._toolbar && !(this instanceof UI.ToolbarSeparator))
       this._toolbar._hideSeparatorDupes();
   }
+
+  setRightAligned(alignRight) {
+    this.element.classList.toggle('toolbar-item-right-aligned', alignRight);
+  }
 };
 
 /**

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js b/third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js
index 549939c6..edef869 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/UIUtils.js

@@ -1942,7 +1942,7 @@
     a.href = href;
     a.classList.add('devtools-link');
     if (!preventClick) {
-      a.addEventListener('click', (event) => {
+      a.addEventListener('click', event => {
         event.consume(true);
         InspectorFrontendHost.openInNewTab(/** @type {string} */ (href));
       }, false);

diff --git a/third_party/WebKit/Source/devtools/front_end/ui/toolbar.css b/third_party/WebKit/Source/devtools/front_end/ui/toolbar.css
index 64e0597..b59a274 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/toolbar.css
+++ b/third_party/WebKit/Source/devtools/front_end/ui/toolbar.css

@@ -28,6 +28,10 @@
     flex-direction: row-reverse;
 }
 
+.toolbar-shadow.toolbar-grow-vertical {
+    height: initial;
+}
+
 .toolbar-shadow.vertical {
     flex-direction: column;
     height: auto;

diff --git a/third_party/WebKit/Source/devtools/scripts/compile_frontend.py b/third_party/WebKit/Source/devtools/scripts/compile_frontend.py
index 1f11459..da2b7aa 100755
--- a/third_party/WebKit/Source/devtools/scripts/compile_frontend.py
+++ b/third_party/WebKit/Source/devtools/scripts/compile_frontend.py

@@ -244,7 +244,7 @@
     'SIMPLE_OPTIMIZATIONS',
     '--warning_level',
     'VERBOSE',
-    '--language_in=ES6_STRICT',
+    '--language_in=ECMASCRIPT_NEXT',
     '--language_out=ES5_STRICT',
     '--extra_annotation_name',
     'suppressReceiverCheck',

diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
index c25e91c..06100e3 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

@@ -216,7 +216,7 @@
 
 ScrollableArea* AXLayoutObject::getScrollableAreaIfScrollable() const {
   if (isWebArea())
-    return documentFrameView();
+    return documentFrameView()->layoutViewportScrollableArea();
 
   if (!m_layoutObject || !m_layoutObject->isBox())
     return 0;

diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
index 5b6f077..e781447 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp

@@ -1395,7 +1395,6 @@
         markerRanges.push_back(
             AXRange(marker->startOffset(), marker->endOffset()));
         break;
-      case DocumentMarker::InvisibleSpellcheck:
       case DocumentMarker::Composition:
         // No need for accessibility to know about these marker types.
         break;

diff --git a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
index 85c4e990d0..be66f83 100644
--- a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp
+++ b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.cpp

@@ -82,11 +82,11 @@
 
 }  // namespace
 
-CacheStorage* GlobalCacheStorage::caches(DOMWindow& window,
+CacheStorage* GlobalCacheStorage::caches(LocalDOMWindow& window,
                                          ExceptionState& exceptionState) {
   return GlobalCacheStorageImpl<LocalDOMWindow>::from(
-             toLocalDOMWindow(window), window.getExecutionContext())
-      .caches(toLocalDOMWindow(window), exceptionState);
+             window, window.getExecutionContext())
+      .caches(window, exceptionState);
 }
 
 CacheStorage* GlobalCacheStorage::caches(WorkerGlobalScope& worker,

diff --git a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.h b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.h
index 25b5dacb..34ecddc 100644
--- a/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.h
+++ b/third_party/WebKit/Source/modules/cachestorage/GlobalCacheStorage.h

@@ -10,15 +10,15 @@
 namespace blink {
 
 class CacheStorage;
-class DOMWindow;
 class ExceptionState;
+class LocalDOMWindow;
 class WorkerGlobalScope;
 
 class GlobalCacheStorage {
   STATIC_ONLY(GlobalCacheStorage);
 
  public:
-  static CacheStorage* caches(DOMWindow&, ExceptionState&);
+  static CacheStorage* caches(LocalDOMWindow&, ExceptionState&);
   static CacheStorage* caches(WorkerGlobalScope&, ExceptionState&);
 };
 

diff --git a/third_party/WebKit/Source/modules/canvas2d/Canvas2DContextAttributes.idl b/third_party/WebKit/Source/modules/canvas2d/Canvas2DContextAttributes.idl
deleted file mode 100644
index 711fd37..0000000
--- a/third_party/WebKit/Source/modules/canvas2d/Canvas2DContextAttributes.idl
+++ /dev/null

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2013, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-dictionary Canvas2DContextAttributes {
-    boolean alpha = true;
-
-    // TODO(crbug.com/637288): Do we keep "legacy-srgb" as the default?
-    // Must decide before shipping.
-    [RuntimeEnabled=ExperimentalCanvasFeatures] CanvasColorSpace colorSpace = "legacy-srgb";
-};

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
index 882496e8..b0e83170 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp

@@ -967,9 +967,11 @@
 }
 
 void CanvasRenderingContext2D::getContextAttributes(
-    Canvas2DContextAttributes& attrs) const {
-  attrs.setAlpha(creationAttributes().alpha());
-  attrs.setColorSpace(colorSpaceAsString());
+    CanvasRenderingContext2DSettings& settings) const {
+  settings.setAlpha(creationAttributes().alpha());
+  settings.setColorSpace(colorSpaceAsString());
+  settings.setPixelFormat(pixelFormatAsString());
+  settings.setLinearPixelMath(linearPixelMath());
 }
 
 void CanvasRenderingContext2D::drawFocusIfNeeded(Element* element) {

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
index 5ee91880..4d4bffb 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

@@ -35,7 +35,7 @@
 #include "core/svg/SVGResourceClient.h"
 #include "modules/ModulesExport.h"
 #include "modules/canvas2d/BaseRenderingContext2D.h"
-#include "modules/canvas2d/Canvas2DContextAttributes.h"
+#include "modules/canvas2d/CanvasRenderingContext2DSettings.h"
 #include "modules/canvas2d/CanvasRenderingContext2DState.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/heap/GarbageCollected.h"
@@ -123,7 +123,7 @@
   void strokeText(const String& text, double x, double y, double maxWidth);
   TextMetrics* measureText(const String& text);
 
-  void getContextAttributes(Canvas2DContextAttributes&) const;
+  void getContextAttributes(CanvasRenderingContext2DSettings&) const;
 
   void drawFocusIfNeeded(Element*);
   void drawFocusIfNeeded(Path2D*, Element*);

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.idl
index 1fe24ab4..3c4d402d 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.idl
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.idl

@@ -125,7 +125,7 @@
     // Should be merged with WebGL counterpart in CanvasRenderingContext, once no-longer experimental
     [RuntimeEnabled=ExperimentalCanvasFeatures] boolean isContextLost();
 
-    Canvas2DContextAttributes getContextAttributes();
+    CanvasRenderingContext2DSettings getContextAttributes();
 
     // FIXME: factor out to CanvasDrawingStyles
     // line caps/joins

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DSettings.idl b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DSettings.idl
new file mode 100644
index 0000000..9537e78
--- /dev/null
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DSettings.idl

@@ -0,0 +1,15 @@
+// Copyright 2017 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.
+
+[PermissiveDictionaryConversion]
+dictionary CanvasRenderingContext2DSettings {
+    boolean alpha = true;
+
+    // TODO(crbug.com/637288): Do we keep "legacy-srgb" as the default?
+    // Must decide before shipping.
+    [RuntimeEnabled=ExperimentalCanvasFeatures] CanvasColorSpace colorSpace = "legacy-srgb";
+    [RuntimeEnabled=ExperimentalCanvasFeatures] CanvasPixelFormat pixelFormat = "8-8-8-8";
+    [RuntimeEnabled=ExperimentalCanvasFeatures] boolean linearPixelMath = false;
+};
+

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
index fdaa4b3c..6414364 100644
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

@@ -97,6 +97,8 @@
 
 //============================================================================
 
+enum LinearPixelMathState { LinearPixelMathDisabled, LinearPixelMathEnabled };
+
 class CanvasRenderingContext2DTest : public ::testing::Test {
  protected:
   CanvasRenderingContext2DTest();
@@ -119,7 +121,9 @@
     return canvasElement().buffer()->getGPUMemoryUsage();
   }
 
-  void createContext(OpacityMode, String colorSpace = String());
+  void createContext(OpacityMode,
+                     String colorSpace = String(),
+                     LinearPixelMathState = LinearPixelMathDisabled);
   ScriptState* getScriptState() {
     return ScriptState::forMainWorld(m_canvasElement->frame());
   }
@@ -174,13 +178,20 @@
       m_opaqueBitmap(IntSize(10, 10), OpaqueBitmap),
       m_alphaBitmap(IntSize(10, 10), TransparentBitmap) {}
 
-void CanvasRenderingContext2DTest::createContext(OpacityMode opacityMode,
-                                                 String colorSpace) {
+void CanvasRenderingContext2DTest::createContext(
+    OpacityMode opacityMode,
+    String colorSpace,
+    LinearPixelMathState linearPixelMathState) {
   String canvasType("2d");
   CanvasContextCreationAttributes attributes;
   attributes.setAlpha(opacityMode == NonOpaque);
-  if (!colorSpace.isEmpty())
+  if (!colorSpace.isEmpty()) {
     attributes.setColorSpace(colorSpace);
+    if (linearPixelMathState == LinearPixelMathEnabled) {
+      attributes.setPixelFormat("float16");
+      attributes.setLinearPixelMath(true);
+    }
+  }
   m_canvasElement->getCanvasRenderingContext(canvasType, attributes);
 }
 
@@ -988,24 +999,10 @@
   EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
 
   DummyExceptionStateForTesting exceptionState;
-  for (int i = 0;
-       i <
-       ExpensiveCanvasHeuristicParameters::GPUReadbackMinSuccessiveFrames - 1;
-       i++) {
-    context2d()->getImageData(0, 0, 1, 1, exceptionState);
-    canvasElement().finalizeFrame();
-
-    EXPECT_FALSE(exceptionState.hadException());
-    EXPECT_TRUE(canvasElement().buffer()->isAccelerated());
-    EXPECT_EQ(1u, getGlobalAcceleratedImageBufferCount());
-    EXPECT_EQ(720000, getGlobalGPUMemoryUsage());
-  }
-
   context2d()->getImageData(0, 0, 1, 1, exceptionState);
-  canvasElement().finalizeFrame();
 
   EXPECT_FALSE(exceptionState.hadException());
-  if (ExpensiveCanvasHeuristicParameters::GPUReadbackForcesNoAcceleration) {
+  if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration) {
     EXPECT_FALSE(canvasElement().buffer()->isAccelerated());
     EXPECT_EQ(0u, getGlobalAcceleratedImageBufferCount());
     EXPECT_EQ(0, getGlobalGPUMemoryUsage());
@@ -1225,7 +1222,7 @@
       ColorBehavior::globalTargetColorSpace();
   ColorBehavior::setGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace());
 
-  createContext(NonOpaque, "linear-rgb");
+  createContext(NonOpaque, "srgb", LinearPixelMathEnabled);
   ColorBehavior behavior = context2d()->drawImageColorBehavior();
   EXPECT_TRUE(behavior.isTransformToTargetColorSpace());
   EXPECT_TRUE(gfx::ColorSpace::CreateSCRGBLinear() ==

diff --git a/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.cpp b/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.cpp
index 8924168..72304649 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.cpp

@@ -19,11 +19,8 @@
 
 AbstractAnimationWorkletThread::AbstractAnimationWorkletThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners)
-    : WorkerThread(std::move(workerLoaderProxy),
-                   workerReportingProxy,
-                   parentFrameTaskRunners) {}
+    WorkerReportingProxy& workerReportingProxy)
+    : WorkerThread(std::move(workerLoaderProxy), workerReportingProxy) {}
 
 AbstractAnimationWorkletThread::~AbstractAnimationWorkletThread() {}
 

diff --git a/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.h b/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.h
index a3b9ea9..9e806fb 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.h
+++ b/third_party/WebKit/Source/modules/compositorworker/AbstractAnimationWorkletThread.h

@@ -35,8 +35,7 @@
 
  protected:
   AbstractAnimationWorkletThread(PassRefPtr<WorkerLoaderProxy>,
-                                 WorkerReportingProxy&,
-                                 ParentFrameTaskRunners*);
+                                 WorkerReportingProxy&);
 
   bool isOwningBackingThread() const override { return false; }
 };

diff --git a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.cpp b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.cpp
index 54a35e2..cc3b6c2 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletMessagingProxy.cpp

@@ -19,8 +19,7 @@
 
 std::unique_ptr<WorkerThread>
 AnimationWorkletMessagingProxy::createWorkerThread(double originTime) {
-  return AnimationWorkletThread::create(loaderProxy(), workletObjectProxy(),
-                                        getParentFrameTaskRunners());
+  return AnimationWorkletThread::create(loaderProxy(), workletObjectProxy());
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.cpp b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.cpp
index bf59c89..cafd59f 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.cpp

@@ -14,23 +14,19 @@
 
 std::unique_ptr<AnimationWorkletThread> AnimationWorkletThread::create(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners) {
+    WorkerReportingProxy& workerReportingProxy) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("animation-worklet"),
                "AnimationWorkletThread::create");
   DCHECK(isMainThread());
-  return WTF::wrapUnique(
-      new AnimationWorkletThread(std::move(workerLoaderProxy),
-                                 workerReportingProxy, parentFrameTaskRunners));
+  return WTF::wrapUnique(new AnimationWorkletThread(
+      std::move(workerLoaderProxy), workerReportingProxy));
 }
 
 AnimationWorkletThread::AnimationWorkletThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners)
+    WorkerReportingProxy& workerReportingProxy)
     : AbstractAnimationWorkletThread(std::move(workerLoaderProxy),
-                                     workerReportingProxy,
-                                     parentFrameTaskRunners) {}
+                                     workerReportingProxy) {}
 
 AnimationWorkletThread::~AnimationWorkletThread() {}
 

diff --git a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.h b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.h
index 650c12af..3c9312b2 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.h
+++ b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThread.h

@@ -18,8 +18,7 @@
  public:
   static std::unique_ptr<AnimationWorkletThread> create(
       PassRefPtr<WorkerLoaderProxy>,
-      WorkerReportingProxy&,
-      ParentFrameTaskRunners*);
+      WorkerReportingProxy&);
   ~AnimationWorkletThread() override;
 
  protected:
@@ -27,9 +26,7 @@
       std::unique_ptr<WorkerThreadStartupData>) final;
 
  private:
-  AnimationWorkletThread(PassRefPtr<WorkerLoaderProxy>,
-                         WorkerReportingProxy&,
-                         ParentFrameTaskRunners*);
+  AnimationWorkletThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThreadTest.cpp b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThreadTest.cpp
index 6e8eb0a9..fbb429e 100644
--- a/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThreadTest.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/AnimationWorkletThreadTest.cpp

@@ -90,13 +90,14 @@
 
   std::unique_ptr<AnimationWorkletThread> createAnimationWorkletThread() {
     std::unique_ptr<AnimationWorkletThread> thread =
-        AnimationWorkletThread::create(nullptr, *m_reportingProxy,
-                                       ParentFrameTaskRunners::create(nullptr));
-    thread->start(WorkerThreadStartupData::create(
-        KURL(ParsedURLString, "http://fake.url/"), "fake user agent", "",
-        nullptr, DontPauseWorkerGlobalScopeOnStart, nullptr, "",
-        m_securityOrigin.get(), nullptr, WebAddressSpaceLocal, nullptr, nullptr,
-        WorkerV8Settings::Default()));
+        AnimationWorkletThread::create(nullptr, *m_reportingProxy);
+    thread->start(
+        WorkerThreadStartupData::create(
+            KURL(ParsedURLString, "http://fake.url/"), "fake user agent", "",
+            nullptr, DontPauseWorkerGlobalScopeOnStart, nullptr, "",
+            m_securityOrigin.get(), nullptr, WebAddressSpaceLocal, nullptr,
+            nullptr, WorkerV8Settings::Default()),
+        ParentFrameTaskRunners::create(nullptr));
     return thread;
   }
 

diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerMessagingProxy.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerMessagingProxy.cpp
index 96b2335d..3764faf 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerMessagingProxy.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerMessagingProxy.cpp

@@ -20,7 +20,6 @@
 std::unique_ptr<WorkerThread>
 CompositorWorkerMessagingProxy::createWorkerThread(double originTime) {
   return CompositorWorkerThread::create(loaderProxy(), workerObjectProxy(),
-                                        getParentFrameTaskRunners(),
                                         originTime);
 }
 

diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
index e2c844e0..3df7759 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp

@@ -16,24 +16,20 @@
 std::unique_ptr<CompositorWorkerThread> CompositorWorkerThread::create(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
     InProcessWorkerObjectProxy& workerObjectProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners,
     double timeOrigin) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
                "CompositorWorkerThread::create");
   ASSERT(isMainThread());
   return WTF::wrapUnique(new CompositorWorkerThread(
-      std::move(workerLoaderProxy), workerObjectProxy, parentFrameTaskRunners,
-      timeOrigin));
+      std::move(workerLoaderProxy), workerObjectProxy, timeOrigin));
 }
 
 CompositorWorkerThread::CompositorWorkerThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
     InProcessWorkerObjectProxy& workerObjectProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners,
     double timeOrigin)
     : AbstractAnimationWorkletThread(std::move(workerLoaderProxy),
-                                     workerObjectProxy,
-                                     parentFrameTaskRunners),
+                                     workerObjectProxy),
       m_workerObjectProxy(workerObjectProxy),
       m_timeOrigin(timeOrigin) {}
 

diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
index cbb3379c..65bdc16 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.h

@@ -19,7 +19,6 @@
   static std::unique_ptr<CompositorWorkerThread> create(
       PassRefPtr<WorkerLoaderProxy>,
       InProcessWorkerObjectProxy&,
-      ParentFrameTaskRunners*,
       double timeOrigin);
   ~CompositorWorkerThread() override;
 
@@ -34,7 +33,6 @@
  private:
   CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy>,
                          InProcessWorkerObjectProxy&,
-                         ParentFrameTaskRunners*,
                          double timeOrigin);
 
   InProcessWorkerObjectProxy& m_workerObjectProxy;

diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
index a4ebe7e..6598af7 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThreadTest.cpp

@@ -108,16 +108,17 @@
 
   std::unique_ptr<CompositorWorkerThread> createCompositorWorker() {
     std::unique_ptr<CompositorWorkerThread> workerThread =
-        CompositorWorkerThread::create(nullptr, *m_objectProxy,
-                                       m_parentFrameTaskRunners.get(), 0);
+        CompositorWorkerThread::create(nullptr, *m_objectProxy, 0);
     WorkerClients* clients = WorkerClients::create();
     provideCompositorWorkerProxyClientTo(clients,
                                          new TestCompositorWorkerProxyClient);
-    workerThread->start(WorkerThreadStartupData::create(
-        KURL(ParsedURLString, "http://fake.url/"), "fake user agent",
-        "//fake source code", nullptr, DontPauseWorkerGlobalScopeOnStart,
-        nullptr, "", m_securityOrigin.get(), clients, WebAddressSpaceLocal,
-        nullptr, nullptr, WorkerV8Settings::Default()));
+    workerThread->start(
+        WorkerThreadStartupData::create(
+            KURL(ParsedURLString, "http://fake.url/"), "fake user agent",
+            "//fake source code", nullptr, DontPauseWorkerGlobalScopeOnStart,
+            nullptr, "", m_securityOrigin.get(), clients, WebAddressSpaceLocal,
+            nullptr, nullptr, WorkerV8Settings::Default()),
+        m_parentFrameTaskRunners.get());
     return workerThread;
   }
 

diff --git a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
index 3eacc94..53b74c9 100644
--- a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp
+++ b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.cpp

@@ -52,8 +52,8 @@
   return *supplement;
 }
 
-Crypto* DOMWindowCrypto::crypto(DOMWindow& window) {
-  return DOMWindowCrypto::from(toLocalDOMWindow(window)).crypto();
+Crypto* DOMWindowCrypto::crypto(LocalDOMWindow& window) {
+  return DOMWindowCrypto::from(window).crypto();
 }
 
 Crypto* DOMWindowCrypto::crypto() const {

diff --git a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.h b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.h
index 8a5884e3..4ababfee 100644
--- a/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.h
+++ b/third_party/WebKit/Source/modules/crypto/DOMWindowCrypto.h

@@ -31,14 +31,12 @@
 #ifndef DOMWindowCrypto_h
 #define DOMWindowCrypto_h
 
-#include "core/frame/LocalDOMWindow.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class Crypto;
-class DOMWindow;
 class LocalDOMWindow;
 
 class DOMWindowCrypto final : public GarbageCollected<DOMWindowCrypto>,
@@ -47,7 +45,7 @@
 
  public:
   static DOMWindowCrypto& from(LocalDOMWindow&);
-  static Crypto* crypto(DOMWindow&);
+  static Crypto* crypto(LocalDOMWindow&);
   Crypto* crypto() const;
 
   DECLARE_TRACE();

diff --git a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
index 9d8c75e5..0214b7a 100644
--- a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp
+++ b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp

@@ -35,7 +35,7 @@
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMArrayPiece.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/frame/UseCounter.h"
+#include "core/frame/Deprecation.h"
 #include "modules/crypto/CryptoHistograms.h"
 #include "modules/crypto/CryptoKey.h"
 #include "modules/crypto/CryptoResultImpl.h"
@@ -67,7 +67,7 @@
   }
 
   if (!scriptState->getExecutionContext()->isSecureContext()) {
-    UseCounter::count(
+    Deprecation::countDeprecation(
         scriptState->getExecutionContext(),
         UseCounter::SubtleCryptoOnlyStrictSecureContextCheckFailed);
   }

diff --git a/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.cpp b/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.cpp
index 3e4e7db..47a5bf2 100644
--- a/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.cpp
+++ b/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.cpp

@@ -29,8 +29,8 @@
 }
 
 // static
-Worklet* WindowPaintWorklet::paintWorklet(DOMWindow& window) {
-  return from(toLocalDOMWindow(window)).paintWorklet();
+Worklet* WindowPaintWorklet::paintWorklet(LocalDOMWindow& window) {
+  return from(window).paintWorklet();
 }
 
 PaintWorklet* WindowPaintWorklet::paintWorklet() {

diff --git a/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.h b/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.h
index 1668c8e..dab110b5 100644
--- a/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.h
+++ b/third_party/WebKit/Source/modules/csspaint/WindowPaintWorklet.h

@@ -5,14 +5,12 @@
 #ifndef WindowPaintWorklet_h
 #define WindowPaintWorklet_h
 
-#include "core/frame/LocalDOMWindow.h"
 #include "modules/ModulesExport.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
-class DOMWindow;
 class LocalDOMWindow;
 class PaintWorklet;
 class Worklet;
@@ -24,7 +22,7 @@
 
  public:
   static WindowPaintWorklet& from(LocalDOMWindow&);
-  static Worklet* paintWorklet(DOMWindow&);
+  static Worklet* paintWorklet(LocalDOMWindow&);
   PaintWorklet* paintWorklet();
 
   DECLARE_TRACE();

diff --git a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
index 44f9ad9..8fc5a02 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

@@ -69,7 +69,10 @@
         m_failureCallback(std::move(failure)) {}
 
   // ContentDecryptionModuleResult implementation.
-  void complete() override { (*m_successCallback)(); }
+  void complete() override {
+    DVLOG(EME_LOG_LEVEL) << __func__ << ": promise resolved.";
+    (*m_successCallback)();
+  }
 
   void completeWithContentDecryptionModule(
       WebContentDecryptionModule*) override {
@@ -98,6 +101,9 @@
       result.append(')');
     }
 
+    DVLOG(EME_LOG_LEVEL) << __func__ << ": promise rejected with code " << code
+                         << " and message: " << result.toString();
+
     (*m_failureCallback)(WebCdmExceptionToExceptionCode(code),
                          result.toString());
   }
@@ -338,7 +344,7 @@
     MediaKeys* mediaKeys) {
   HTMLMediaElementEncryptedMedia& thisElement =
       HTMLMediaElementEncryptedMedia::from(element);
-  DVLOG(EME_LOG_LEVEL) << __func__ << " current("
+  DVLOG(EME_LOG_LEVEL) << __func__ << ": current("
                        << thisElement.m_mediaKeys.get() << "), new("
                        << mediaKeys << ")";
 

diff --git a/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp b/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
index f58d57c..7f50811 100644
--- a/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp
+++ b/third_party/WebKit/Source/modules/fetch/GlobalFetch.cpp

@@ -79,8 +79,8 @@
 GlobalFetch::ScopedFetcher::~ScopedFetcher() {}
 
 GlobalFetch::ScopedFetcher* GlobalFetch::ScopedFetcher::from(
-    DOMWindow& window) {
-  return GlobalFetchImpl<LocalDOMWindow>::from(toLocalDOMWindow(window),
+    LocalDOMWindow& window) {
+  return GlobalFetchImpl<LocalDOMWindow>::from(window,
                                                window.getExecutionContext());
 }
 
@@ -93,7 +93,7 @@
 DEFINE_TRACE(GlobalFetch::ScopedFetcher) {}
 
 ScriptPromise GlobalFetch::fetch(ScriptState* scriptState,
-                                 DOMWindow& window,
+                                 LocalDOMWindow& window,
                                  const RequestInfo& input,
                                  const Dictionary& init,
                                  ExceptionState& exceptionState) {

diff --git a/third_party/WebKit/Source/modules/fetch/GlobalFetch.h b/third_party/WebKit/Source/modules/fetch/GlobalFetch.h
index 88927ca..6a7f7e4b 100644
--- a/third_party/WebKit/Source/modules/fetch/GlobalFetch.h
+++ b/third_party/WebKit/Source/modules/fetch/GlobalFetch.h

@@ -12,7 +12,7 @@
 namespace blink {
 
 class Dictionary;
-class DOMWindow;
+class LocalDOMWindow;
 class ExceptionState;
 class ScriptState;
 class WorkerGlobalScope;
@@ -30,14 +30,14 @@
                                 const Dictionary&,
                                 ExceptionState&) = 0;
 
-    static ScopedFetcher* from(DOMWindow&);
+    static ScopedFetcher* from(LocalDOMWindow&);
     static ScopedFetcher* from(WorkerGlobalScope&);
 
     DECLARE_VIRTUAL_TRACE();
   };
 
   static ScriptPromise fetch(ScriptState*,
-                             DOMWindow&,
+                             LocalDOMWindow&,
                              const RequestInfo&,
                              const Dictionary&,
                              ExceptionState&);

diff --git a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
index 572c1f3..e75b92c 100644
--- a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp

@@ -42,12 +42,11 @@
 namespace blink {
 
 void DOMWindowFileSystem::webkitRequestFileSystem(
-    DOMWindow& windowArg,
+    LocalDOMWindow& window,
     int type,
     long long size,
     FileSystemCallback* successCallback,
     ErrorCallback* errorCallback) {
-  LocalDOMWindow& window = toLocalDOMWindow(windowArg);
   if (!window.isCurrentlyDisplayedInFrame())
     return;
 
@@ -82,11 +81,10 @@
 }
 
 void DOMWindowFileSystem::webkitResolveLocalFileSystemURL(
-    DOMWindow& windowArg,
+    LocalDOMWindow& window,
     const String& url,
     EntryCallback* successCallback,
     ErrorCallback* errorCallback) {
-  LocalDOMWindow& window = toLocalDOMWindow(windowArg);
   if (!window.isCurrentlyDisplayedInFrame())
     return;
 

diff --git a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.h b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.h
index 6937c6e8..c6db8cb 100644
--- a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.h
+++ b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.h

@@ -32,21 +32,21 @@
 
 namespace blink {
 
-class DOMWindow;
 class EntryCallback;
 class ErrorCallback;
 class FileSystemCallback;
+class LocalDOMWindow;
 
 class DOMWindowFileSystem {
   STATIC_ONLY(DOMWindowFileSystem);
 
  public:
-  static void webkitRequestFileSystem(DOMWindow&,
+  static void webkitRequestFileSystem(LocalDOMWindow&,
                                       int type,
                                       long long size,
                                       FileSystemCallback*,
                                       ErrorCallback*);
-  static void webkitResolveLocalFileSystemURL(DOMWindow&,
+  static void webkitResolveLocalFileSystemURL(LocalDOMWindow&,
                                               const String&,
                                               EntryCallback*,
                                               ErrorCallback*);

diff --git a/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.cpp b/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.cpp
index 8e8dcc3..35c4bf1a 100644
--- a/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.cpp

@@ -52,9 +52,8 @@
 
 }  // namespace
 
-IDBFactory* GlobalIndexedDB::indexedDB(DOMWindow& window) {
-  return GlobalIndexedDBImpl<LocalDOMWindow>::from(toLocalDOMWindow(window))
-      .idbFactory(toLocalDOMWindow(window));
+IDBFactory* GlobalIndexedDB::indexedDB(LocalDOMWindow& window) {
+  return GlobalIndexedDBImpl<LocalDOMWindow>::from(window).idbFactory(window);
 }
 
 IDBFactory* GlobalIndexedDB::indexedDB(WorkerGlobalScope& worker) {

diff --git a/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.h b/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.h
index 26ba30b9..169e2381 100644
--- a/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.h
+++ b/third_party/WebKit/Source/modules/indexeddb/GlobalIndexedDB.h

@@ -10,14 +10,14 @@
 namespace blink {
 
 class IDBFactory;
-class DOMWindow;
+class LocalDOMWindow;
 class WorkerGlobalScope;
 
 class GlobalIndexedDB {
   STATIC_ONLY(GlobalIndexedDB);
 
  public:
-  static IDBFactory* indexedDB(DOMWindow&);
+  static IDBFactory* indexedDB(LocalDOMWindow&);
   static IDBFactory* indexedDB(WorkerGlobalScope&);
 };
 

diff --git a/third_party/WebKit/Source/modules/modules_idl_files.gni b/third_party/WebKit/Source/modules/modules_idl_files.gni
index 07b37fd1..8dec1f3 100644
--- a/third_party/WebKit/Source/modules/modules_idl_files.gni
+++ b/third_party/WebKit/Source/modules/modules_idl_files.gni

@@ -395,7 +395,7 @@
                     "bluetooth/BluetoothScanFilterInit.idl",
                     "bluetooth/RequestDeviceOptions.idl",
                     "cachestorage/CacheQueryOptions.idl",
-                    "canvas2d/Canvas2DContextAttributes.idl",
+                    "canvas2d/CanvasRenderingContext2DSettings.idl",
                     "canvas2d/HitRegionOptions.idl",
                     "credentialmanager/CredentialData.idl",
                     "credentialmanager/CredentialRequestOptions.idl",
@@ -687,8 +687,8 @@
   "$blink_modules_output_dir/bluetooth/RequestDeviceOptions.h",
   "$blink_modules_output_dir/cachestorage/CacheQueryOptions.cpp",
   "$blink_modules_output_dir/cachestorage/CacheQueryOptions.h",
-  "$blink_modules_output_dir/canvas2d/Canvas2DContextAttributes.cpp",
-  "$blink_modules_output_dir/canvas2d/Canvas2DContextAttributes.h",
+  "$blink_modules_output_dir/canvas2d/CanvasRenderingContext2DSettings.cpp",
+  "$blink_modules_output_dir/canvas2d/CanvasRenderingContext2DSettings.h",
   "$blink_modules_output_dir/canvas2d/HitRegionOptions.cpp",
   "$blink_modules_output_dir/canvas2d/HitRegionOptions.h",
   "$blink_modules_output_dir/credentialmanager/CredentialData.cpp",

diff --git a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp
index 7dd5f7a..bdaef555 100644
--- a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp
+++ b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.cpp

@@ -56,8 +56,9 @@
 }
 
 // static
-DeprecatedStorageInfo* DOMWindowQuota::webkitStorageInfo(DOMWindow& window) {
-  return DOMWindowQuota::from(toLocalDOMWindow(window)).webkitStorageInfo();
+DeprecatedStorageInfo* DOMWindowQuota::webkitStorageInfo(
+    LocalDOMWindow& window) {
+  return DOMWindowQuota::from(window).webkitStorageInfo();
 }
 
 DeprecatedStorageInfo* DOMWindowQuota::webkitStorageInfo() const {

diff --git a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h
index 4e1756d..bce97e3 100644
--- a/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h
+++ b/third_party/WebKit/Source/modules/quota/DOMWindowQuota.h

@@ -37,7 +37,6 @@
 namespace blink {
 
 class DeprecatedStorageInfo;
-class DOMWindow;
 class LocalDOMWindow;
 
 class DOMWindowQuota final : public GarbageCollected<DOMWindowQuota>,
@@ -46,7 +45,7 @@
 
  public:
   static DOMWindowQuota& from(LocalDOMWindow&);
-  static DeprecatedStorageInfo* webkitStorageInfo(DOMWindow&);
+  static DeprecatedStorageInfo* webkitStorageInfo(LocalDOMWindow&);
   DeprecatedStorageInfo* webkitStorageInfo() const;
 
   DECLARE_TRACE();

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index fb3272c..396af9c 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

@@ -282,16 +282,14 @@
   if (!executionContext)
     return ScriptPromise();
 
-  KURL scriptURL =
-      enteredExecutionContext(scriptState->isolate())->completeURL(url);
+  KURL scriptURL = executionContext->completeURL(url);
   scriptURL.removeFragmentIdentifier();
 
   KURL patternURL;
   if (options.scope().isNull())
     patternURL = KURL(scriptURL, "./");
   else
-    patternURL = enteredExecutionContext(scriptState->isolate())
-                     ->completeURL(options.scope());
+    patternURL = executionContext->completeURL(options.scope());
 
   registerServiceWorkerImpl(
       executionContext, scriptURL, patternURL,
@@ -339,8 +337,7 @@
     return promise;
   }
 
-  KURL completedURL =
-      enteredExecutionContext(scriptState->isolate())->completeURL(documentURL);
+  KURL completedURL = executionContext->completeURL(documentURL);
   completedURL.removeFragmentIdentifier();
   if (!documentOrigin->canRequest(completedURL)) {
     RefPtr<SecurityOrigin> documentURLOrigin =

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.cpp
index d050382..67155cff 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.cpp
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.cpp

@@ -40,20 +40,15 @@
 
 std::unique_ptr<ServiceWorkerThread> ServiceWorkerThread::create(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners) {
+    WorkerReportingProxy& workerReportingProxy) {
   return WTF::wrapUnique(new ServiceWorkerThread(std::move(workerLoaderProxy),
-                                                 workerReportingProxy,
-                                                 parentFrameTaskRunners));
+                                                 workerReportingProxy));
 }
 
 ServiceWorkerThread::ServiceWorkerThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners)
-    : WorkerThread(std::move(workerLoaderProxy),
-                   workerReportingProxy,
-                   parentFrameTaskRunners),
+    WorkerReportingProxy& workerReportingProxy)
+    : WorkerThread(std::move(workerLoaderProxy), workerReportingProxy),
       m_workerBackingThread(
           WorkerBackingThread::create("ServiceWorker Thread")) {}
 

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.h b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.h
index 464070a..a11b7213 100644
--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.h
+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.h

@@ -43,8 +43,7 @@
  public:
   static std::unique_ptr<ServiceWorkerThread> create(
       PassRefPtr<WorkerLoaderProxy>,
-      WorkerReportingProxy&,
-      ParentFrameTaskRunners*);
+      WorkerReportingProxy&);
   ~ServiceWorkerThread() override;
 
   WorkerBackingThread& workerBackingThread() override {
@@ -57,9 +56,7 @@
       std::unique_ptr<WorkerThreadStartupData>) override;
 
  private:
-  ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy>,
-                      WorkerReportingProxy&,
-                      ParentFrameTaskRunners*);
+  ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
   std::unique_ptr<WorkerBackingThread> m_workerBackingThread;
 };
 

diff --git a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.cpp b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.cpp
index bdda7091..6235775 100644
--- a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.cpp
+++ b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.cpp

@@ -59,9 +59,8 @@
 // static
 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(
     ScriptState* scriptState,
-    DOMWindow& window) {
-  return DOMWindowSpeechSynthesis::from(toLocalDOMWindow(window))
-      .speechSynthesis(scriptState);
+    LocalDOMWindow& window) {
+  return DOMWindowSpeechSynthesis::from(window).speechSynthesis(scriptState);
 }
 
 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(

diff --git a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h
index 5f6bbe84..e85abc92 100644
--- a/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h
+++ b/third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h

@@ -26,7 +26,6 @@
 #ifndef DOMWindowSpeechSynthesis_h
 #define DOMWindowSpeechSynthesis_h
 
-#include "core/frame/LocalDOMWindow.h"
 #include "modules/ModulesExport.h"
 #include "modules/speech/SpeechSynthesis.h"
 #include "platform/Supplementable.h"
@@ -34,6 +33,7 @@
 
 namespace blink {
 
+class LocalDOMWindow;
 class ScriptState;
 
 class MODULES_EXPORT DOMWindowSpeechSynthesis final
@@ -42,7 +42,7 @@
   USING_GARBAGE_COLLECTED_MIXIN(DOMWindowSpeechSynthesis);
 
  public:
-  static SpeechSynthesis* speechSynthesis(ScriptState*, DOMWindow&);
+  static SpeechSynthesis* speechSynthesis(ScriptState*, LocalDOMWindow&);
   static DOMWindowSpeechSynthesis& from(LocalDOMWindow&);
 
   DECLARE_TRACE();

diff --git a/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.cpp b/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.cpp
index d45fb3b..2b22b47b 100644
--- a/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.cpp
+++ b/third_party/WebKit/Source/modules/speech/testing/InternalsSpeechSynthesis.cpp

@@ -31,7 +31,7 @@
 #include "InternalsSpeechSynthesis.h"
 
 #include "core/dom/Document.h"
-#include "core/frame/DOMWindow.h"
+#include "core/frame/LocalDOMWindow.h"
 #include "core/testing/Internals.h"
 #include "modules/speech/DOMWindowSpeechSynthesis.h"
 #include "modules/speech/SpeechSynthesis.h"
@@ -43,8 +43,15 @@
     ScriptState* scriptState,
     Internals&,
     DOMWindow* window) {
-  SpeechSynthesis* synthesis =
-      DOMWindowSpeechSynthesis::speechSynthesis(scriptState, *window);
+  // TODO(dcheng): Performing a local/remote check is an anti-pattern. However,
+  // it is necessary here since |window| is an argument passed from Javascript,
+  // and the Window interface is accessible cross origin. The long-term fix is
+  // to make the Internals object per-context, so |window| doesn't need to
+  // passed as an argument.
+  if (!window->isLocalDOMWindow())
+    return;
+  SpeechSynthesis* synthesis = DOMWindowSpeechSynthesis::speechSynthesis(
+      scriptState, toLocalDOMWindow(*window));
   if (!synthesis)
     return;
 

diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp
index a0e7960..12ffa5c 100644
--- a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp
+++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.cpp

@@ -42,15 +42,15 @@
 }
 
 // static
-Storage* DOMWindowStorage::sessionStorage(DOMWindow& window,
+Storage* DOMWindowStorage::sessionStorage(LocalDOMWindow& window,
                                           ExceptionState& exceptionState) {
-  return from(toLocalDOMWindow(window)).sessionStorage(exceptionState);
+  return from(window).sessionStorage(exceptionState);
 }
 
 // static
-Storage* DOMWindowStorage::localStorage(DOMWindow& window,
+Storage* DOMWindowStorage::localStorage(LocalDOMWindow& window,
                                         ExceptionState& exceptionState) {
-  return from(toLocalDOMWindow(window)).localStorage(exceptionState);
+  return from(window).localStorage(exceptionState);
 }
 
 Storage* DOMWindowStorage::sessionStorage(

diff --git a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h
index 330e6e6..fa72fab 100644
--- a/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h
+++ b/third_party/WebKit/Source/modules/storage/DOMWindowStorage.h

@@ -5,13 +5,11 @@
 #ifndef DOMWindowStorage_h
 #define DOMWindowStorage_h
 
-#include "core/frame/LocalDOMWindow.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
-class DOMWindow;
 class ExceptionState;
 class LocalDOMWindow;
 class Storage;
@@ -22,8 +20,8 @@
 
  public:
   static DOMWindowStorage& from(LocalDOMWindow&);
-  static Storage* sessionStorage(DOMWindow&, ExceptionState&);
-  static Storage* localStorage(DOMWindow&, ExceptionState&);
+  static Storage* sessionStorage(LocalDOMWindow&, ExceptionState&);
+  static Storage* localStorage(LocalDOMWindow&, ExceptionState&);
 
   Storage* sessionStorage(ExceptionState&) const;
   Storage* localStorage(ExceptionState&) const;

diff --git a/third_party/WebKit/Source/modules/vr/VRDisplay.cpp b/third_party/WebKit/Source/modules/vr/VRDisplay.cpp
index 108b256..cc8f103 100644
--- a/third_party/WebKit/Source/modules/vr/VRDisplay.cpp
+++ b/third_party/WebKit/Source/modules/vr/VRDisplay.cpp

@@ -262,7 +262,7 @@
 
   // If what we were given has an invalid source, need to exit fullscreen with
   // previous, valid source, so delay m_layer reassignment
-  if (!layers[0].source()) {
+  if (layers[0].source().isNull()) {
     forceExitPresent();
     DOMException* exception =
         DOMException::create(InvalidStateError, "Invalid layer source.");
@@ -272,8 +272,15 @@
   }
   m_layer = layers[0];
 
-  CanvasRenderingContext* renderingContext =
-      m_layer.source()->renderingContext();
+  CanvasRenderingContext* renderingContext;
+  if (m_layer.source().isHTMLCanvasElement()) {
+    renderingContext =
+        m_layer.source().getAsHTMLCanvasElement()->renderingContext();
+  } else {
+    DCHECK(m_layer.source().isOffscreenCanvas());
+    renderingContext =
+        m_layer.source().getAsOffscreenCanvas()->renderingContext();
+  }
 
   if (!renderingContext || !renderingContext->is3d()) {
     forceExitPresent();
@@ -387,48 +394,65 @@
         PresentationResult::PresentationNotSupportedByDisplay);
     return;
   } else {
-    // TODO(klausw,crbug.com/655722): Need a proper VR compositor, but
-    // for the moment on mobile we'll just make the canvas fullscreen
-    // so that VrShell can pick it up through the standard (high
-    // latency) compositing path.
-    auto canvas = m_layer.source();
-    auto inlineStyle = canvas->inlineStyle();
-    if (inlineStyle) {
-      // THREE.js's VREffect sets explicit style.width/height on its rendering
-      // canvas based on the non-fullscreen window dimensions, and it keeps
-      // those unchanged when presenting. Unfortunately it appears that a
-      // fullscreened canvas just gets centered if it has explicitly set a
-      // size smaller than the fullscreen dimensions. Manually set size to
-      // 100% in this case and restore it when exiting fullscreen. This is a
-      // stopgap measure since THREE.js's usage appears legal according to the
-      // WebVR API spec. This will no longer be necessary once we can get rid
-      // of this fullscreen hack.
-      m_fullscreenOrigWidth = inlineStyle->getPropertyValue(CSSPropertyWidth);
-      if (!m_fullscreenOrigWidth.isNull()) {
-        canvas->setInlineStyleProperty(CSSPropertyWidth, "100%");
+    if (m_layer.source().isHTMLCanvasElement()) {
+      HTMLCanvasElement* canvas = m_layer.source().getAsHTMLCanvasElement();
+      // TODO(klausw,crbug.com/655722): Need a proper VR compositor, but
+      // for the moment on mobile we'll just make the canvas fullscreen
+      // so that VrShell can pick it up through the standard (high
+      // latency) compositing path.      auto canvas =
+      // m_layer.source().getAsHTMLCanvasElement();
+      auto inlineStyle = canvas->inlineStyle();
+      if (inlineStyle) {
+        // THREE.js's VREffect sets explicit style.width/height on its rendering
+        // canvas based on the non-fullscreen window dimensions, and it keeps
+        // those unchanged when presenting. Unfortunately it appears that a
+        // fullscreened canvas just gets centered if it has explicitly set a
+        // size smaller than the fullscreen dimensions. Manually set size to
+        // 100% in this case and restore it when exiting fullscreen. This is a
+        // stopgap measure since THREE.js's usage appears legal according to the
+        // WebVR API spec. This will no longer be necessary once we can get rid
+        // of this fullscreen hack.
+        m_fullscreenOrigWidth = inlineStyle->getPropertyValue(CSSPropertyWidth);
+        if (!m_fullscreenOrigWidth.isNull()) {
+          canvas->setInlineStyleProperty(CSSPropertyWidth, "100%");
+        }
+        m_fullscreenOrigHeight =
+            inlineStyle->getPropertyValue(CSSPropertyHeight);
+        if (!m_fullscreenOrigHeight.isNull()) {
+          canvas->setInlineStyleProperty(CSSPropertyHeight, "100%");
+        }
+      } else {
+        m_fullscreenOrigWidth = String();
+        m_fullscreenOrigHeight = String();
       }
-      m_fullscreenOrigHeight = inlineStyle->getPropertyValue(CSSPropertyHeight);
-      if (!m_fullscreenOrigHeight.isNull()) {
-        canvas->setInlineStyleProperty(CSSPropertyHeight, "100%");
+
+      if (doc) {
+        // Since the callback for requestPresent is asynchronous, we've lost our
+        // UserGestureToken, and need to create a new one to enter fullscreen.
+        gestureIndicator = WTF::wrapUnique(
+            new UserGestureIndicator(DocumentUserGestureToken::create(
+                doc, UserGestureToken::Status::PossiblyExistingGesture)));
       }
+      Fullscreen::requestFullscreen(*canvas);
+
+      // Check to see if the canvas is still the current fullscreen
+      // element once every 2 seconds.
+      m_fullscreenCheckTimer.startRepeating(2.0, BLINK_FROM_HERE);
+      m_reenteredFullscreen = false;
     } else {
-      m_fullscreenOrigWidth = String();
-      m_fullscreenOrigHeight = String();
+      DCHECK(m_layer.source().isOffscreenCanvas());
+      // TODO(junov, crbug.com/695497): Implement OffscreenCanvas presentation
+      forceExitPresent();
+      DOMException* exception = DOMException::create(
+          InvalidStateError, "OffscreenCanvas presentation not implemented.");
+      while (!m_pendingPresentResolvers.isEmpty()) {
+        ScriptPromiseResolver* resolver = m_pendingPresentResolvers.takeFirst();
+        resolver->reject(exception);
+      }
+      ReportPresentationResult(
+          PresentationResult::PresentationNotSupportedByDisplay);
+      return;
     }
-
-    if (doc) {
-      // Since the callback for requestPresent is asynchronous, we've lost our
-      // UserGestureToken, and need to create a new one to enter fullscreen.
-      gestureIndicator = WTF::wrapUnique(
-          new UserGestureIndicator(DocumentUserGestureToken::create(
-              doc, UserGestureToken::Status::PossiblyExistingGesture)));
-    }
-    Fullscreen::requestFullscreen(*canvas);
-
-    // Check to see if the canvas is still the current fullscreen
-    // element once every 2 seconds.
-    m_fullscreenCheckTimer.startRepeating(2.0, BLINK_FROM_HERE);
-    m_reenteredFullscreen = false;
   }
 
   if (doc) {
@@ -611,17 +635,22 @@
 void VRDisplay::stopPresenting() {
   if (m_isPresenting) {
     if (!m_capabilities->hasExternalDisplay()) {
-      auto canvas = m_layer.source();
-      Fullscreen::fullyExitFullscreen(canvas->document());
-      m_fullscreenCheckTimer.stop();
-      if (!m_fullscreenOrigWidth.isNull()) {
-        canvas->setInlineStyleProperty(CSSPropertyWidth, m_fullscreenOrigWidth);
-        m_fullscreenOrigWidth = String();
-      }
-      if (!m_fullscreenOrigHeight.isNull()) {
-        canvas->setInlineStyleProperty(CSSPropertyWidth,
-                                       m_fullscreenOrigHeight);
-        m_fullscreenOrigHeight = String();
+      if (m_layer.source().isHTMLCanvasElement()) {
+        auto canvas = m_layer.source().getAsHTMLCanvasElement();
+        Fullscreen::fullyExitFullscreen(canvas->document());
+        m_fullscreenCheckTimer.stop();
+        if (!m_fullscreenOrigWidth.isNull()) {
+          canvas->setInlineStyleProperty(CSSPropertyWidth,
+                                         m_fullscreenOrigWidth);
+          m_fullscreenOrigWidth = String();
+        }
+        if (!m_fullscreenOrigHeight.isNull()) {
+          canvas->setInlineStyleProperty(CSSPropertyWidth,
+                                         m_fullscreenOrigHeight);
+          m_fullscreenOrigHeight = String();
+        }
+      } else {
+        // TODO(junov, crbug.com/695497): Implement for OffscreenCanvas
       }
     } else {
       // Can't get into this presentation mode, so nothing to do here.
@@ -695,6 +724,7 @@
 }
 
 void VRDisplay::onFullscreenCheck(TimerBase*) {
+  DCHECK(m_layer.source().isHTMLCanvasElement());
   if (!m_isPresenting) {
     m_fullscreenCheckTimer.stop();
     return;
@@ -704,7 +734,8 @@
   // depend on the Fullscreen API to fake VR presentation, so this will
   // become unnessecary. Until that point, though, this seems preferable to
   // adding a bunch of notification plumbing to Fullscreen.
-  if (!Fullscreen::isCurrentFullScreenElement(*m_layer.source())) {
+  if (!Fullscreen::isCurrentFullScreenElement(
+          *m_layer.source().getAsHTMLCanvasElement())) {
     // TODO(mthiesse): Due to asynchronous resizing, we might get kicked out of
     // fullscreen when changing display parameters upon entering WebVR. So one
     // time only, we reenter fullscreen after having left it; otherwise we exit
@@ -718,7 +749,7 @@
       return;
     }
     m_reenteredFullscreen = true;
-    auto canvas = m_layer.source();
+    auto canvas = m_layer.source().getAsHTMLCanvasElement();
     Document* doc = this->document();
     std::unique_ptr<UserGestureIndicator> gestureIndicator;
     if (doc) {

diff --git a/third_party/WebKit/Source/modules/vr/VRLayer.idl b/third_party/WebKit/Source/modules/vr/VRLayer.idl
index 6bf2a70..3fab721 100644
--- a/third_party/WebKit/Source/modules/vr/VRLayer.idl
+++ b/third_party/WebKit/Source/modules/vr/VRLayer.idl

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-typedef HTMLCanvasElement VRSource;
+typedef (HTMLCanvasElement or OffscreenCanvas) VRSource;
 
 // https://w3c.github.io/webvr/#interface-vrlayer
 

diff --git a/third_party/WebKit/Source/modules/webaudio/AudioWorkletMessagingProxy.cpp b/third_party/WebKit/Source/modules/webaudio/AudioWorkletMessagingProxy.cpp
index 339c618..96e8965 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioWorkletMessagingProxy.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioWorkletMessagingProxy.cpp

@@ -17,8 +17,7 @@
 
 std::unique_ptr<WorkerThread> AudioWorkletMessagingProxy::createWorkerThread(
     double originTime) {
-  return AudioWorkletThread::create(loaderProxy(), workletObjectProxy(),
-                                    getParentFrameTaskRunners());
+  return AudioWorkletThread::create(loaderProxy(), workletObjectProxy());
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.cpp b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.cpp
index ec0ef272..46b891c 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.cpp

@@ -23,23 +23,18 @@
 
 std::unique_ptr<AudioWorkletThread> AudioWorkletThread::create(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners) {
+    WorkerReportingProxy& workerReportingProxy) {
   TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("audio-worklet"),
                "AudioWorkletThread::create");
   DCHECK(isMainThread());
   return WTF::wrapUnique(new AudioWorkletThread(std::move(workerLoaderProxy),
-                                                workerReportingProxy,
-                                                parentFrameTaskRunners));
+                                                workerReportingProxy));
 }
 
 AudioWorkletThread::AudioWorkletThread(
     PassRefPtr<WorkerLoaderProxy> workerLoaderProxy,
-    WorkerReportingProxy& workerReportingProxy,
-    ParentFrameTaskRunners* parentFrameTaskRunners)
-    : WorkerThread(std::move(workerLoaderProxy),
-                   workerReportingProxy,
-                   parentFrameTaskRunners) {}
+    WorkerReportingProxy& workerReportingProxy)
+    : WorkerThread(std::move(workerLoaderProxy), workerReportingProxy) {}
 
 AudioWorkletThread::~AudioWorkletThread() {}
 

diff --git a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.h b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.h
index 11fa0b3..5f583be0b 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.h
+++ b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThread.h

@@ -23,8 +23,7 @@
  public:
   static std::unique_ptr<AudioWorkletThread> create(
       PassRefPtr<WorkerLoaderProxy>,
-      WorkerReportingProxy&,
-      ParentFrameTaskRunners*);
+      WorkerReportingProxy&);
   ~AudioWorkletThread() override;
 
   WorkerBackingThread& workerBackingThread() override;
@@ -47,9 +46,7 @@
   bool isOwningBackingThread() const override { return false; }
 
  private:
-  AudioWorkletThread(PassRefPtr<WorkerLoaderProxy>,
-                     WorkerReportingProxy&,
-                     ParentFrameTaskRunners*);
+  AudioWorkletThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThreadTest.cpp b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThreadTest.cpp
index 6e857bb..a02ac44 100644
--- a/third_party/WebKit/Source/modules/webaudio/AudioWorkletThreadTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/AudioWorkletThreadTest.cpp

@@ -63,7 +63,6 @@
  public:
   void SetUp() override {
     AudioWorkletThread::createSharedBackingThreadForTest();
-    m_parentFrameTaskRunners = ParentFrameTaskRunners::create(nullptr);
     m_reportingProxy = TestAudioWorkletReportingProxy::create();
     m_securityOrigin =
         SecurityOrigin::create(KURL(ParsedURLString, "http://fake.url/"));
@@ -72,13 +71,15 @@
   void TearDown() override { AudioWorkletThread::clearSharedBackingThread(); }
 
   std::unique_ptr<AudioWorkletThread> createAudioWorkletThread() {
-    std::unique_ptr<AudioWorkletThread> thread = AudioWorkletThread::create(
-        nullptr, *m_reportingProxy, m_parentFrameTaskRunners.get());
-    thread->start(WorkerThreadStartupData::create(
-        KURL(ParsedURLString, "http://fake.url/"), "fake user agent", "",
-        nullptr, DontPauseWorkerGlobalScopeOnStart, nullptr, "",
-        m_securityOrigin.get(), nullptr, WebAddressSpaceLocal, nullptr, nullptr,
-        WorkerV8Settings::Default()));
+    std::unique_ptr<AudioWorkletThread> thread =
+        AudioWorkletThread::create(nullptr, *m_reportingProxy);
+    thread->start(
+        WorkerThreadStartupData::create(
+            KURL(ParsedURLString, "http://fake.url/"), "fake user agent", "",
+            nullptr, DontPauseWorkerGlobalScopeOnStart, nullptr, "",
+            m_securityOrigin.get(), nullptr, WebAddressSpaceLocal, nullptr,
+            nullptr, WorkerV8Settings::Default()),
+        ParentFrameTaskRunners::create(nullptr));
     return thread;
   }
 
@@ -104,7 +105,6 @@
 
   RefPtr<SecurityOrigin> m_securityOrigin;
   std::unique_ptr<WorkerReportingProxy> m_reportingProxy;
-  Persistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
 };
 
 TEST_F(AudioWorkletThreadTest, Basic) {

diff --git a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp
index b227819..bb77a0c 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.cpp

@@ -37,14 +37,13 @@
 
 namespace blink {
 
-Database* DOMWindowWebDatabase::openDatabase(DOMWindow& windowArg,
+Database* DOMWindowWebDatabase::openDatabase(LocalDOMWindow& window,
                                              const String& name,
                                              const String& version,
                                              const String& displayName,
                                              unsigned estimatedSize,
                                              DatabaseCallback* creationCallback,
                                              ExceptionState& exceptionState) {
-  LocalDOMWindow& window = toLocalDOMWindow(windowArg);
   if (!window.isCurrentlyDisplayedInFrame())
     return nullptr;
 

diff --git a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h
index 73af468..e15384a 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h
+++ b/third_party/WebKit/Source/modules/webdatabase/DOMWindowWebDatabase.h

@@ -32,16 +32,16 @@
 
 namespace blink {
 
-class DOMWindow;
 class Database;
 class DatabaseCallback;
 class ExceptionState;
+class LocalDOMWindow;
 
 class DOMWindowWebDatabase {
   STATIC_ONLY(DOMWindowWebDatabase);
 
  public:
-  static Database* openDatabase(DOMWindow&,
+  static Database* openDatabase(LocalDOMWindow&,
                                 const String& name,
                                 const String& version,
                                 const String& displayName,

diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn
index ef1a3e35..0a638a3 100644
--- a/third_party/WebKit/Source/platform/BUILD.gn
+++ b/third_party/WebKit/Source/platform/BUILD.gn

@@ -1063,6 +1063,8 @@
     "mac/BlockExceptions.mm",
     "mac/ColorMac.h",
     "mac/ColorMac.mm",
+    "mac/GraphicsContextCanvas.h",
+    "mac/GraphicsContextCanvas.mm",
     "mac/KillRingMac.mm",
     "mac/LocalCurrentGraphicsContext.h",
     "mac/LocalCurrentGraphicsContext.mm",
@@ -1752,6 +1754,7 @@
     "loader/fetch/ResourceFetcherTest.cpp",
     "loader/fetch/ResourceLoaderOptionsTest.cpp",
     "loader/fetch/ResourceTest.cpp",
+    "mac/GraphicsContextCanvasTest.mm",
     "mac/VersionUtilMacTest.mm",
     "mojo/CommonCustomTypesStructTraitsTest.cpp",
     "mojo/GeometryStructTraitsTest.cpp",

diff --git a/third_party/WebKit/Source/platform/graphics/ExpensiveCanvasHeuristicParameters.h b/third_party/WebKit/Source/platform/graphics/ExpensiveCanvasHeuristicParameters.h
index 340d96c..3fbcba25 100644
--- a/third_party/WebKit/Source/platform/graphics/ExpensiveCanvasHeuristicParameters.h
+++ b/third_party/WebKit/Source/platform/graphics/ExpensiveCanvasHeuristicParameters.h

@@ -78,11 +78,7 @@
   // GPU readback prevention heuristics
   //====================================
 
-  GPUReadbackForcesNoAcceleration = 1,
-
-  // When gpu readback is successively invoked in following number of frames,
-  // we disable gpu acceleration to avoid the high cost of gpu readback.
-  GPUReadbackMinSuccessiveFrames = 3,
+  GetImageDataForcesNoAcceleration = 1,
 
   // When a canvas is used as a source image, if its destination is
   // non-accelerated and the source canvas is accelerated, a readback

diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
index b1e788d..2e38b19 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

@@ -99,8 +99,6 @@
       m_snapshotState(InitialSnapshotState),
       m_surface(std::move(surface)),
       m_client(0),
-      m_gpuReadbackInvokedInCurrentFrame(false),
-      m_gpuReadbackSuccessiveFrames(0),
       m_gpuMemoryUsage(0) {
   m_surface->setImageBuffer(this);
   updateGPUMemoryUsage();
@@ -151,22 +149,6 @@
 }
 
 void ImageBuffer::finalizeFrame() {
-  if (isAccelerated() &&
-      ExpensiveCanvasHeuristicParameters::GPUReadbackForcesNoAcceleration &&
-      !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled()) {
-    if (m_gpuReadbackInvokedInCurrentFrame) {
-      m_gpuReadbackSuccessiveFrames++;
-      m_gpuReadbackInvokedInCurrentFrame = false;
-    } else {
-      m_gpuReadbackSuccessiveFrames = 0;
-    }
-
-    if (m_gpuReadbackSuccessiveFrames >=
-        ExpensiveCanvasHeuristicParameters::GPUReadbackMinSuccessiveFrames) {
-      disableAcceleration();
-    }
-  }
-
   m_surface->finalizeFrame();
 }
 
@@ -377,6 +359,11 @@
 
   DCHECK(canvas());
 
+  if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration &&
+      !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled()) {
+    const_cast<ImageBuffer*>(this)->disableAcceleration();
+  }
+
   sk_sp<SkImage> snapshot = m_surface->newImageSnapshot(
       PreferNoAcceleration, SnapshotReasonGetImageData);
   if (!snapshot)
@@ -422,7 +409,6 @@
 
   snapshot->readPixels(info, result.data(), bytesPerPixel * rect.width(),
                        rect.x(), rect.y());
-  m_gpuReadbackInvokedInCurrentFrame = true;
 
   if (useF16Workaround) {
     uint32_t* pixel = (uint32_t*)result.data();

diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
index 76b9ff4..8e38810 100644
--- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.h
+++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.h

@@ -196,9 +196,6 @@
   std::unique_ptr<ImageBufferSurface> m_surface;
   ImageBufferClient* m_client;
 
-  mutable bool m_gpuReadbackInvokedInCurrentFrame;
-  int m_gpuReadbackSuccessiveFrames;
-
   mutable intptr_t m_gpuMemoryUsage;
   static intptr_t s_globalGPUMemoryUsage;
   static unsigned s_globalAcceleratedImageBufferCount;

diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintCanvas.h b/third_party/WebKit/Source/platform/graphics/paint/PaintCanvas.h
index 4d942ab..c31f9ea 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintCanvas.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintCanvas.h

@@ -11,6 +11,7 @@
 using cc::PaintCanvas;
 using cc::PaintCanvasAutoRestore;
 using cc::PaintCanvasPassThrough;
+using cc::ToPixmap;
 }
 
 #endif  // PaintCanvas_h

diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.cpp b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.cpp
index 5f29873..00b0a35 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.cpp

@@ -80,7 +80,10 @@
 
 void FetchContext::dispatchDidDownloadData(unsigned long, int, int) {}
 
-void FetchContext::dispatchDidFinishLoading(unsigned long, double, int64_t) {}
+void FetchContext::dispatchDidFinishLoading(unsigned long,
+                                            double,
+                                            int64_t,
+                                            int64_t) {}
 
 void FetchContext::dispatchDidFail(unsigned long,
                                    const ResourceError&,

diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
index 1c42354a..8c92022 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchContext.h

@@ -115,7 +115,8 @@
                                        int encodedDataLength);
   virtual void dispatchDidFinishLoading(unsigned long identifier,
                                         double finishTime,
-                                        int64_t encodedDataLength);
+                                        int64_t encodedDataLength,
+                                        int64_t decodedBodyLength);
   virtual void dispatchDidFail(unsigned long identifier,
                                const ResourceError&,
                                int64_t encodedDataLength,

diff --git a/third_party/WebKit/Source/platform/loader/fetch/FetchRequest.cpp b/third_party/WebKit/Source/platform/loader/fetch/FetchRequest.cpp
index 0c5e18e..f435cba 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/FetchRequest.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/FetchRequest.cpp

@@ -119,7 +119,7 @@
                                        : ClientDidNotRequestCredentials;
 
   // TODO: Credentials should be removed only when the request is cross origin.
-  m_resourceRequest.removeCredentials();
+  m_resourceRequest.removeUserAndPassFromURL();
 
   if (origin)
     m_resourceRequest.setHTTPOrigin(origin);

diff --git a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
index 42e0614..46294ce 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/Resource.cpp

@@ -568,6 +568,7 @@
   DCHECK(!request.isNull());
   CHECK(!m_isRevalidationStartForbidden);
   m_isRevalidating = true;
+  m_hasRevalidated = true;
   m_resourceRequest = request;
   m_status = ResourceStatus::NotStarted;
 }

diff --git a/third_party/WebKit/Source/platform/loader/fetch/Resource.h b/third_party/WebKit/Source/platform/loader/fetch/Resource.h
index c17ba26..26e6b974 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/Resource.h
+++ b/third_party/WebKit/Source/platform/loader/fetch/Resource.h

@@ -266,6 +266,9 @@
   bool hasCacheControlNoStoreHeader() const;
   bool mustReloadDueToVaryHeader(const ResourceRequest& newRequest) const;
 
+  // For investigating https://crbug.com/692856.
+  bool hasRevalidated() const { return m_hasRevalidated; }
+
   bool isEligibleForIntegrityCheck(SecurityOrigin*) const;
 
   void setIntegrityMetadata(const IntegrityMetadataSet& metadata) {
@@ -459,6 +462,12 @@
   bool m_needsSynchronousCacheHit;
   bool m_linkPreload;
   bool m_isRevalidating;
+
+  // For investigating https://crbug.com/692856.
+  // Indicates whether at least one revalidation is done for |this|.
+  // Used for assertions only.
+  bool m_hasRevalidated = false;
+
   bool m_isAlive;
   bool m_isAddRemoveClientProhibited;
   bool m_isRevalidationStartForbidden = false;

diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index d62e6a12..eae214e 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

@@ -1197,7 +1197,8 @@
   }
 
   context().dispatchDidFinishLoading(resource->identifier(), finishTime,
-                                     encodedDataLength);
+                                     encodedDataLength,
+                                     resource->response().decodedBodyLength());
 
   if (type == DidFinishLoading)
     resource->finish(finishTime);

diff --git a/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.h b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.h
new file mode 100644
index 0000000..f90335f3
--- /dev/null
+++ b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.h

@@ -0,0 +1,61 @@
+// Copyright (c) 2017 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 GraphicsContextCanvas_h
+#define GraphicsContextCanvas_h
+
+#include <ApplicationServices/ApplicationServices.h>
+
+#include "platform/PlatformExport.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+
+struct SkIRect;
+
+namespace blink {
+
+// Converts a PaintCanvas temporarily to a CGContext
+class PLATFORM_EXPORT GraphicsContextCanvas {
+ public:
+  /**
+    User clip rect is an *additional* clip to be applied in addition to the
+    current state of the canvas, in *local* rather than device coordinates.
+    If no additional clipping is desired, pass in
+    SkIRect::MakeSize(canvas->getBaseLayerSize()) transformed by the inverse
+    CTM.
+   */
+  GraphicsContextCanvas(PaintCanvas*,
+                        const SkIRect& userClipRect,
+                        SkScalar bitmapScaleFactor = 1);
+  ~GraphicsContextCanvas();
+  CGContextRef cgContext();
+  bool hasEmptyClipRegion() const;
+
+ private:
+  void releaseIfNeeded();
+  SkIRect computeDirtyRect();
+
+  PaintCanvas* m_canvas;
+
+  CGContextRef m_cgContext;
+  // m_offscreen is only valid if m_useDeviceBits is false
+  SkBitmap m_offscreen;
+  SkIPoint m_bitmapOffset;
+  SkScalar m_bitmapScaleFactor;
+
+  // True if we are drawing to |m_canvas|'s backing store directly.
+  // Otherwise, the bits in |bitmap_| are our allocation and need to
+  // be copied over to |m_canvas|.
+  bool m_useDeviceBits;
+
+  // True if |bitmap_| is a dummy 1x1 bitmap allocated for the sake of creating
+  // a non-null CGContext (it is invalid to use a null CGContext), and will not
+  // be copied to |m_canvas|. This will happen if |m_canvas|'s clip region is
+  // empty.
+  bool m_bitmapIsDummy;
+};
+
+}  // namespace blink
+
+#endif  // GraphicsContextCanvas_h

diff --git a/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.mm b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.mm
new file mode 100644
index 0000000..f45ac090
--- /dev/null
+++ b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvas.mm

@@ -0,0 +1,137 @@
+// Copyright 2017 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 "platform/mac/GraphicsContextCanvas.h"
+
+#import <AppKit/AppKit.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+#include "skia/ext/skia_utils_mac.h"
+#include "wtf/RetainPtr.h"
+
+namespace blink {
+
+GraphicsContextCanvas::GraphicsContextCanvas(PaintCanvas* canvas,
+                                             const SkIRect& userClipRect,
+                                             SkScalar bitmapScaleFactor)
+    : m_canvas(canvas),
+      m_cgContext(0),
+      m_bitmapScaleFactor(bitmapScaleFactor),
+      m_useDeviceBits(false),
+      m_bitmapIsDummy(false) {
+  m_canvas->save();
+  m_canvas->clipRect(SkRect::MakeFromIRect(userClipRect));
+}
+
+GraphicsContextCanvas::~GraphicsContextCanvas() {
+  releaseIfNeeded();
+  m_canvas->restore();
+}
+
+SkIRect GraphicsContextCanvas::computeDirtyRect() {
+  // If the user specified a clip region, assume that it was tight and that the
+  // dirty rect is approximately the whole bitmap.
+  return SkIRect::MakeWH(m_offscreen.width(), m_offscreen.height());
+}
+
+// This must be called to balance calls to cgContext
+void GraphicsContextCanvas::releaseIfNeeded() {
+  if (!m_cgContext)
+    return;
+  if (!m_useDeviceBits && !m_bitmapIsDummy) {
+    // Find the bits that were drawn to.
+    SkIRect bounds = computeDirtyRect();
+    SkBitmap subset;
+    if (!m_offscreen.extractSubset(&subset, bounds)) {
+      return;
+    }
+    subset.setImmutable();  // Prevents a defensive copy inside Skia.
+    m_canvas->save();
+    m_canvas->setMatrix(SkMatrix::I());  // Reset back to device space.
+    m_canvas->translate(bounds.x() + m_bitmapOffset.x(),
+                        bounds.y() + m_bitmapOffset.y());
+    m_canvas->scale(1.f / m_bitmapScaleFactor, 1.f / m_bitmapScaleFactor);
+    m_canvas->drawBitmap(subset, 0, 0);
+    m_canvas->restore();
+  }
+  CGContextRelease(m_cgContext);
+  m_cgContext = 0;
+  m_useDeviceBits = false;
+  m_bitmapIsDummy = false;
+}
+
+CGContextRef GraphicsContextCanvas::cgContext() {
+  releaseIfNeeded();  // This flushes any prior bitmap use
+
+  SkIRect clip_bounds;
+  if (!m_canvas->getDeviceClipBounds(&clip_bounds)) {
+    // If the clip is empty, then there is nothing to draw. The caller may
+    // attempt to draw (to-be-clipped) results, so ensure there is a dummy
+    // non-NULL CGContext to use.
+    m_bitmapIsDummy = true;
+    clip_bounds = SkIRect::MakeXYWH(0, 0, 1, 1);
+  }
+
+  // remember the top/left, in case we need to compose this later
+  m_bitmapOffset.set(clip_bounds.x(), clip_bounds.y());
+
+  // Now make clip_bounds be relative to the current layer/device
+  if (!m_bitmapIsDummy) {
+    m_canvas->temporary_internal_describeTopLayer(nullptr, &clip_bounds);
+  }
+
+  SkPixmap devicePixels;
+  ToPixmap(m_canvas, &devicePixels);
+
+  // Only draw directly if we have pixels, and we're only rect-clipped.
+  // If not, we allocate an offscreen and draw into that, relying on the
+  // compositing step to apply skia's clip.
+  m_useDeviceBits =
+      devicePixels.addr() && m_canvas->isClipRect() && !m_bitmapIsDummy;
+  WTF::RetainPtr<CGColorSpace> colorSpace(CGColorSpaceCreateDeviceRGB());
+
+  int displayHeight;
+  if (m_useDeviceBits) {
+    SkPixmap subset;
+    bool result = devicePixels.extractSubset(&subset, clip_bounds);
+    DCHECK(result);
+    if (!result)
+      return 0;
+    displayHeight = subset.height();
+    m_cgContext = CGBitmapContextCreate(
+        subset.writable_addr(), subset.width(), subset.height(), 8,
+        subset.rowBytes(), colorSpace.get(),
+        kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
+  } else {
+    bool result = m_offscreen.tryAllocN32Pixels(
+        SkScalarCeilToInt(m_bitmapScaleFactor * clip_bounds.width()),
+        SkScalarCeilToInt(m_bitmapScaleFactor * clip_bounds.height()));
+    DCHECK(result);
+    if (!result)
+      return 0;
+    m_offscreen.eraseColor(0);
+    displayHeight = m_offscreen.height();
+    m_cgContext = CGBitmapContextCreate(
+        m_offscreen.getPixels(), m_offscreen.width(), m_offscreen.height(), 8,
+        m_offscreen.rowBytes(), colorSpace.get(),
+        kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst);
+  }
+  DCHECK(m_cgContext);
+
+  SkMatrix matrix = m_canvas->getTotalMatrix();
+  matrix.postTranslate(-SkIntToScalar(m_bitmapOffset.x()),
+                       -SkIntToScalar(m_bitmapOffset.y()));
+  matrix.postScale(m_bitmapScaleFactor, -m_bitmapScaleFactor);
+  matrix.postTranslate(0, SkIntToScalar(displayHeight));
+
+  CGContextConcatCTM(m_cgContext, skia::SkMatrixToCGAffineTransform(matrix));
+
+  return m_cgContext;
+}
+
+bool GraphicsContextCanvas::hasEmptyClipRegion() const {
+  return m_canvas->isClipEmpty();
+}
+
+}  // namespace blink

diff --git a/third_party/WebKit/Source/platform/mac/GraphicsContextCanvasTest.mm b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvasTest.mm
new file mode 100644
index 0000000..da375d2
--- /dev/null
+++ b/third_party/WebKit/Source/platform/mac/GraphicsContextCanvasTest.mm

@@ -0,0 +1,75 @@
+// Copyright (c) 2017 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 "platform/mac/GraphicsContextCanvas.h"
+#include "skia/ext/skia_utils_mac.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace blink {
+
+enum TestType {
+  TestIdentity = 0,
+  TestTranslate = 1,
+  TestClip = 2,
+  TestXClip = TestTranslate | TestClip,
+};
+
+void RunTest(TestType test) {
+  const unsigned width = 2;
+  const unsigned height = 2;
+  const unsigned storageSize = width * height;
+  const unsigned original[] = {0xFF333333, 0xFF666666, 0xFF999999, 0xFFCCCCCC};
+  EXPECT_EQ(storageSize, sizeof(original) / sizeof(original[0]));
+  unsigned bits[storageSize];
+  memcpy(bits, original, sizeof(original));
+  SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
+  SkBitmap bitmap;
+  bitmap.installPixels(info, bits, info.minRowBytes());
+
+  PaintCanvas canvas(bitmap);
+  if (test & TestTranslate)
+    canvas.translate(width / 2, 0);
+  if (test & TestClip) {
+    SkRect clipRect = {0, height / 2, width, height};
+    canvas.clipRect(clipRect);
+  }
+  {
+    SkIRect clip =
+        SkIRect::MakeSize(canvas.getBaseLayerSize())
+            .makeOffset(
+                (test & TestTranslate) ? -(static_cast<int>(width)) / 2 : 0, 0);
+    GraphicsContextCanvas bitLocker(&canvas, clip);
+    CGContextRef cgContext = bitLocker.cgContext();
+    CGColorRef testColor = CGColorGetConstantColor(kCGColorWhite);
+    CGContextSetFillColorWithColor(cgContext, testColor);
+    CGRect cgRect = {{0, 0}, {width, height}};
+    CGContextFillRect(cgContext, cgRect);
+  }
+  const unsigned results[][storageSize] = {
+      {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},  // identity
+      {0xFF333333, 0xFFFFFFFF, 0xFF999999, 0xFFFFFFFF},  // translate
+      {0xFF333333, 0xFF666666, 0xFFFFFFFF, 0xFFFFFFFF},  // clip
+      {0xFF333333, 0xFF666666, 0xFF999999, 0xFFFFFFFF}   // translate | clip
+  };
+  for (unsigned index = 0; index < storageSize; index++)
+    EXPECT_EQ(results[test][index], bits[index]);
+}
+
+TEST(GraphicsContextCanvasTest, Identity) {
+  RunTest(TestIdentity);
+}
+
+TEST(GraphicsContextCanvasTest, Translate) {
+  RunTest(TestTranslate);
+}
+
+TEST(GraphicsContextCanvasTest, Clip) {
+  RunTest(TestClip);
+}
+
+TEST(GraphicsContextCanvasTest, XClip) {
+  RunTest(TestXClip);
+}
+
+}  // namespace

diff --git a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.h b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.h
index bfdeffa..72699bfe 100644
--- a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.h
+++ b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.h

@@ -20,7 +20,7 @@
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/paint/PaintCanvas.h"
-#include "skia/ext/skia_utils_mac.h"
+#include "platform/mac/GraphicsContextCanvas.h"
 #include "wtf/Noncopyable.h"
 
 OBJC_CLASS NSGraphicsContext;
@@ -47,6 +47,6 @@
   NSGraphicsContext* m_savedNSGraphicsContext;
   bool m_didSetGraphicsContext;
   IntRect m_inflatedDirtyRect;
-  skia::SkiaBitLocker m_skiaBitLocker;
+  GraphicsContextCanvas m_graphicsContextCanvas;
 };
 }

diff --git a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
index 39925f7a..1677c43 100644
--- a/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm
+++ b/third_party/WebKit/Source/platform/mac/LocalCurrentGraphicsContext.mm

@@ -49,7 +49,7 @@
     const IntRect& dirtyRect)
     : m_didSetGraphicsContext(false),
       m_inflatedDirtyRect(ThemeMac::inflateRectForAA(dirtyRect)),
-      m_skiaBitLocker(canvas, m_inflatedDirtyRect, deviceScaleFactor) {
+      m_graphicsContextCanvas(canvas, m_inflatedDirtyRect, deviceScaleFactor) {
   m_savedCanvas = canvas;
   canvas->save();
 
@@ -87,7 +87,7 @@
 CGContextRef LocalCurrentGraphicsContext::cgContext() {
   // This synchronizes the CGContext to reflect the current SkCanvas state.
   // The implementation may not return the same CGContext each time.
-  CGContextRef cgContext = m_skiaBitLocker.cgContext();
+  CGContextRef cgContext = m_graphicsContextCanvas.cgContext();
 
   return cgContext;
 }

diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
index d9b53a9e..7f7b599 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.cpp
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.cpp

@@ -183,7 +183,7 @@
   m_url = url;
 }
 
-void ResourceRequest::removeCredentials() {
+void ResourceRequest::removeUserAndPassFromURL() {
   if (m_url.user().isEmpty() && m_url.pass().isEmpty())
     return;
 

diff --git a/third_party/WebKit/Source/platform/network/ResourceRequest.h b/third_party/WebKit/Source/platform/network/ResourceRequest.h
index 26d93f9..de75050 100644
--- a/third_party/WebKit/Source/platform/network/ResourceRequest.h
+++ b/third_party/WebKit/Source/platform/network/ResourceRequest.h

@@ -90,7 +90,7 @@
   const KURL& url() const;
   void setURL(const KURL& url);
 
-  void removeCredentials();
+  void removeUserAndPassFromURL();
 
   WebCachePolicy getCachePolicy() const;
   void setCachePolicy(WebCachePolicy);

diff --git a/third_party/WebKit/Source/platform/text/TextChecking.h b/third_party/WebKit/Source/platform/text/TextChecking.h
index 2dbbccc..c156fef 100644
--- a/third_party/WebKit/Source/platform/text/TextChecking.h
+++ b/third_party/WebKit/Source/platform/text/TextChecking.h

@@ -54,7 +54,6 @@
   int length;
   Vector<GrammarDetail> details;
   String replacement;
-  uint32_t hash;
 };
 
 const int unrequestedTextCheckingSequence = -1;
@@ -64,25 +63,15 @@
   friend class SpellCheckRequest;  // For access to m_sequence.
  public:
   TextCheckingRequestData() : m_sequence(unrequestedTextCheckingSequence) {}
-  TextCheckingRequestData(int sequence,
-                          const String& text,
-                          const Vector<uint32_t>& markers,
-                          const Vector<unsigned>& offsets)
-      : m_sequence(sequence),
-        m_text(text),
-        m_markers(markers),
-        m_offsets(offsets) {}
+  TextCheckingRequestData(int sequence, const String& text)
+      : m_sequence(sequence), m_text(text) {}
 
   int sequence() const { return m_sequence; }
   String text() const { return m_text; }
-  const Vector<uint32_t>& markers() const { return m_markers; }
-  const Vector<unsigned>& offsets() const { return m_offsets; }
 
  private:
   int m_sequence;
   String m_text;
-  Vector<uint32_t> m_markers;
-  Vector<unsigned> m_offsets;
 };
 
 class TextCheckingRequest

diff --git a/third_party/WebKit/Source/platform/text/TextDecoration.h b/third_party/WebKit/Source/platform/text/TextDecoration.h
index a381ead..edd730e 100644
--- a/third_party/WebKit/Source/platform/text/TextDecoration.h
+++ b/third_party/WebKit/Source/platform/text/TextDecoration.h

@@ -36,7 +36,6 @@
 enum TextDecorationType {
   TextDecorationTypeSpelling = 1 << 1,
   TextDecorationTypeGrammar = 1 << 2,
-  TextDecorationTypeInvisibleSpellcheck = 1 << 3,
 };
 }
 

diff --git a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
index bc15094..f9697276 100644
--- a/third_party/WebKit/Source/web/AssertMatchingEnums.cpp
+++ b/third_party/WebKit/Source/web/AssertMatchingEnums.cpp

@@ -653,8 +653,6 @@
 
 STATIC_ASSERT_ENUM(WebTextDecorationTypeSpelling, TextDecorationTypeSpelling);
 STATIC_ASSERT_ENUM(WebTextDecorationTypeGrammar, TextDecorationTypeGrammar);
-STATIC_ASSERT_ENUM(WebTextDecorationTypeInvisibleSpellcheck,
-                   TextDecorationTypeInvisibleSpellcheck);
 
 STATIC_ASSERT_ENUM(WebStorageQuotaErrorNotSupported, NotSupportedError);
 STATIC_ASSERT_ENUM(WebStorageQuotaErrorInvalidModification,

diff --git a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
index 52093ffa..a2116796 100644
--- a/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp
+++ b/third_party/WebKit/Source/web/ContextMenuClientImpl.cpp

@@ -107,8 +107,7 @@
 }
 
 static String selectMisspellingAsync(LocalFrame* selectedFrame,
-                                     String& description,
-                                     uint32_t& hash) {
+                                     String& description) {
   VisibleSelection selection =
       selectedFrame->selection().computeVisibleSelectionInDOMTreeDeprecated();
   if (selection.isNone())
@@ -122,7 +121,6 @@
   if (markers.size() != 1)
     return String();
   description = markers[0]->description();
-  hash = markers[0]->hash();
 
   // Cloning a range fails only for invalid ranges.
   Range* markerRange = selectionRange->cloneRange();
@@ -320,10 +318,7 @@
     // user right-clicks a mouse on a word, Chrome just needs to find a
     // spelling marker on the word instead of spellchecking it.
     String description;
-    uint32_t hash = 0;
-    data.misspelledWord =
-        selectMisspellingAsync(selectedFrame, description, hash);
-    data.misspellingHash = hash;
+    data.misspelledWord = selectMisspellingAsync(selectedFrame, description);
     if (description.length()) {
       Vector<String> suggestions;
       description.split('\n', suggestions);

diff --git a/third_party/WebKit/Source/web/PageOverlayTest.cpp b/third_party/WebKit/Source/web/PageOverlayTest.cpp
index 36e698c..24acc070 100644
--- a/third_party/WebKit/Source/web/PageOverlayTest.cpp
+++ b/third_party/WebKit/Source/web/PageOverlayTest.cpp

@@ -109,10 +109,10 @@
   bool m_oldValue;
 };
 
-class MockCanvas : public PaintCanvas {
+class MockCanvas : public SkCanvas {
  public:
-  MockCanvas(int width, int height) : PaintCanvas(width, height) {}
-  MOCK_METHOD2(onDrawRect, void(const SkRect&, const PaintFlags&));
+  MockCanvas(int width, int height) : SkCanvas(width, height) {}
+  MOCK_METHOD2(onDrawRect, void(const SkRect&, const SkPaint&));
 };
 
 TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
@@ -132,7 +132,7 @@
   EXPECT_CALL(canvas, onDrawRect(_, _)).Times(AtLeast(0));
   EXPECT_CALL(canvas,
               onDrawRect(SkRect::MakeWH(viewportWidth, viewportHeight),
-                         Property(&PaintFlags::getColor, SK_ColorYELLOW)));
+                         Property(&SkPaint::getColor, SK_ColorYELLOW)));
 
   GraphicsLayer* graphicsLayer = pageOverlay->graphicsLayer();
   WebRect rect(0, 0, viewportWidth, viewportHeight);

diff --git a/third_party/WebKit/Source/web/SpellCheckerClientImpl.cpp b/third_party/WebKit/Source/web/SpellCheckerClientImpl.cpp
index 4eb94e7..368f1ba 100644
--- a/third_party/WebKit/Source/web/SpellCheckerClientImpl.cpp
+++ b/third_party/WebKit/Source/web/SpellCheckerClientImpl.cpp

@@ -140,10 +140,8 @@
   if (!m_webView->spellCheckClient())
     return;
   const String& text = request->data().text();
-  const Vector<uint32_t>& markers = request->data().markers();
-  const Vector<unsigned>& markerOffsets = request->data().offsets();
   m_webView->spellCheckClient()->requestCheckingOfText(
-      text, markers, markerOffsets, new WebTextCheckingCompletionImpl(request));
+      text, new WebTextCheckingCompletionImpl(request));
 }
 
 void SpellCheckerClientImpl::cancelAllPendingRequests() {

diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
index ebae8080..e8ebbf6 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

@@ -473,9 +473,9 @@
   m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(
       *this, *document, *m_workerContextClient);
   m_loaderProxy = WorkerLoaderProxy::create(this);
-  m_workerThread = ServiceWorkerThread::create(
-      m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get());
-  m_workerThread->start(std::move(startupData));
+  m_workerThread =
+      ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
+  m_workerThread->start(std::move(startupData), m_mainThreadTaskRunners.get());
   m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
                                               scriptURL);
 }

diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
index e43dcc01..9b8ed4f 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

@@ -4,6 +4,8 @@
 
 #include "web/WebRemoteFrameImpl.h"
 
+#include "bindings/core/v8/DOMWrapperWorld.h"
+#include "bindings/core/v8/WindowProxy.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/RemoteSecurityContext.h"
 #include "core/dom/SecurityContext.h"
@@ -21,10 +23,10 @@
 #include "public/web/WebPerformance.h"
 #include "public/web/WebRange.h"
 #include "public/web/WebTreeScopeType.h"
+#include "v8/include/v8.h"
 #include "web/RemoteFrameOwner.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
-#include <v8/include/v8.h>
 
 namespace blink {
 
@@ -212,11 +214,6 @@
   return v8::Local<v8::Context>();
 }
 
-v8::Local<v8::Context> WebRemoteFrameImpl::deprecatedMainWorldScriptContext()
-    const {
-  return toV8Context(frame(), DOMWrapperWorld::mainWorld());
-}
-
 void WebRemoteFrameImpl::reload(WebFrameLoadType) {
   NOTREACHED();
 }
@@ -526,6 +523,12 @@
   frame()->setDocumentHasReceivedUserGesture();
 }
 
+v8::Local<v8::Object> WebRemoteFrameImpl::globalProxy() const {
+  return frame()
+      ->windowProxy(DOMWrapperWorld::mainWorld())
+      ->globalIfNotDetached();
+}
+
 WebRemoteFrameImpl::WebRemoteFrameImpl(WebTreeScopeType scope,
                                        WebRemoteFrameClient* client)
     : WebRemoteFrame(scope),

diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.h b/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
index d049228..9d26737 100644
--- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.h

@@ -75,7 +75,6 @@
       int argc,
       v8::Local<v8::Value> argv[]) override;
   v8::Local<v8::Context> mainWorldScriptContext() const override;
-  v8::Local<v8::Context> deprecatedMainWorldScriptContext() const override;
   void reload(WebFrameLoadType) override;
   void reloadWithOverrideURL(const WebURL& overrideUrl,
                              WebFrameLoadType) override;
@@ -156,13 +155,11 @@
       WebInsecureRequestPolicy) const override;
   void setReplicatedPotentiallyTrustworthyUniqueOrigin(bool) const override;
   void dispatchLoadEventOnFrameOwner() const override;
-
   void didStartLoading() override;
   void didStopLoading() override;
-
   bool isIgnoredForHitTest() const override;
-
   void willEnterFullscreen() override;
+  v8::Local<v8::Object> globalProxy() const override;
 
   void setHasReceivedUserGesture() override;
 

diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.cpp b/third_party/WebKit/Source/web/WebSettingsImpl.cpp
index 8843e8c..ff5ac4d2 100644
--- a/third_party/WebKit/Source/web/WebSettingsImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSettingsImpl.cpp

@@ -638,6 +638,10 @@
   m_settings->setPresentationRequiresUserGesture(required);
 }
 
+void WebSettingsImpl::setEmbeddedMediaExperienceEnabled(bool enabled) {
+  m_settings->setEmbeddedMediaExperienceEnabled(enabled);
+}
+
 void WebSettingsImpl::setViewportEnabled(bool enabled) {
   m_settings->setViewportEnabled(enabled);
 }

diff --git a/third_party/WebKit/Source/web/WebSettingsImpl.h b/third_party/WebKit/Source/web/WebSettingsImpl.h
index 0c4ec8c0..95178e0 100644
--- a/third_party/WebKit/Source/web/WebSettingsImpl.h
+++ b/third_party/WebKit/Source/web/WebSettingsImpl.h

@@ -124,6 +124,7 @@
   void setMediaPlaybackRequiresUserGesture(bool) override;
   void setMediaPlaybackGestureWhitelistScope(const WebString&) override;
   void setPresentationRequiresUserGesture(bool) override;
+  void setEmbeddedMediaExperienceEnabled(bool) override;
   void setMinimumAccelerated2dCanvasSize(int) override;
   void setMinimumFontSize(int) override;
   void setMinimumLogicalFontSize(int) override;

diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
index 6b25a1d..9860236 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

@@ -412,14 +412,13 @@
   m_parentFrameTaskRunners = ParentFrameTaskRunners::create(nullptr);
 
   m_loaderProxy = WorkerLoaderProxy::create(this);
-  m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this,
-                                              m_parentFrameTaskRunners.get());
+  m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this);
   InspectorInstrumentation::scriptImported(m_loadingDocument,
                                            m_mainScriptLoader->identifier(),
                                            m_mainScriptLoader->script());
   m_mainScriptLoader.clear();
 
-  workerThread()->start(std::move(startupData));
+  workerThread()->start(std::move(startupData), m_parentFrameTaskRunners.get());
   m_workerInspectorProxy->workerThreadCreated(toDocument(m_loadingDocument),
                                               workerThread(), m_url);
   m_client->workerScriptLoaded();

diff --git a/third_party/WebKit/Source/web/WebTextCheckingResult.cpp b/third_party/WebKit/Source/web/WebTextCheckingResult.cpp
index 630e238..736c7b5 100644
--- a/third_party/WebKit/Source/web/WebTextCheckingResult.cpp
+++ b/third_party/WebKit/Source/web/WebTextCheckingResult.cpp

@@ -40,7 +40,6 @@
   result.location = location;
   result.length = length;
   result.replacement = replacement;
-  result.hash = hash;
   if (result.decoration == TextDecorationTypeGrammar) {
     GrammarDetail detail;
     detail.location = 0;

diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 6ab6f18..0b13862 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp

@@ -3371,8 +3371,8 @@
   return hitTestResultForRootFramePos(pointInRootFrame);
 }
 
-void WebViewImpl::spellingMarkers(WebVector<uint32_t>* markers) {
-  Vector<uint32_t> result;
+void WebViewImpl::spellingMarkerOffsetsForTest(WebVector<unsigned>* offsets) {
+  Vector<unsigned> result;
   for (Frame* frame = m_page->mainFrame(); frame;
        frame = frame->tree().traverseNext()) {
     if (!frame->isLocalFrame())
@@ -3380,9 +3380,9 @@
     const DocumentMarkerVector& documentMarkers =
         toLocalFrame(frame)->document()->markers().markers();
     for (size_t i = 0; i < documentMarkers.size(); ++i)
-      result.push_back(documentMarkers[i]->hash());
+      result.push_back(documentMarkers[i]->startOffset());
   }
-  markers->assign(result);
+  offsets->assign(result);
 }
 
 void WebViewImpl::removeSpellingMarkersUnderWords(

diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
index 7e58d49..f94b6956 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.h
+++ b/third_party/WebKit/Source/web/WebViewImpl.h

@@ -236,7 +236,7 @@
   WebHitTestResult hitTestResultAt(const WebPoint&) override;
   WebHitTestResult hitTestResultForTap(const WebPoint&,
                                        const WebSize&) override;
-  void spellingMarkers(WebVector<uint32_t>* markers) override;
+  void spellingMarkerOffsetsForTest(WebVector<unsigned>* offsets) override;
   void removeSpellingMarkersUnderWords(
       const WebVector<WebString>& words) override;
   unsigned long createUniqueIdentifierForRequest() override;

diff --git a/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp b/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp
index cf978ab2..ab77c77 100644
--- a/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp
+++ b/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp

@@ -1006,4 +1006,62 @@
   }
 }
 
+// Ensure that vh units are correct when browser controls are in a locked
+// state. That is, normally we need to add the browser controls height to vh
+// units since 100vh includes the browser controls even if they're hidden while
+// the ICB height does not. When the controls are locked hidden, the ICB size
+// is the full viewport height so there's no need to add the browser controls
+// height.  crbug.com/688738.
+TEST_F(BrowserControlsTest, MAYBE(ViewportUnitsWhenControlsLocked)) {
+  // Initialize with the browser controls showing.
+  WebViewImpl* webView = initialize("vh-height.html");
+  webView->resizeWithBrowserControls(WebSize(400, 300), 100.f, true);
+  webView->updateBrowserControlsState(WebBrowserControlsBoth,
+                                      WebBrowserControlsShown, false);
+  webView->browserControls().setShownRatio(1);
+  webView->updateAllLifecyclePhases();
+
+  ASSERT_EQ(100.f, webView->browserControls().contentOffset());
+  ASSERT_EQ(300, frame()->view()->layoutSize().height());
+
+  Element* absPos = getElementById(WebString::fromUTF8("abs"));
+  Element* fixedPos = getElementById(WebString::fromUTF8("fixed"));
+
+  // Lock the browser controls to hidden.
+  {
+    webView->updateBrowserControlsState(WebBrowserControlsHidden,
+                                        WebBrowserControlsHidden, false);
+    webView->resizeWithBrowserControls(WebSize(400, 400), 100.f, false);
+    webView->updateAllLifecyclePhases();
+
+    ASSERT_EQ(0.f, webView->browserControls().contentOffset());
+    ASSERT_EQ(400, frame()->view()->layoutSize().height());
+
+    // Make sure we're not adding the browser controls height to the vh units
+    // as when they're locked to hidden, the ICB fills the entire viewport
+    // already.
+    EXPECT_FLOAT_EQ(200.f, absPos->getBoundingClientRect()->height());
+    EXPECT_FLOAT_EQ(200.f, fixedPos->getBoundingClientRect()->height());
+    EXPECT_EQ(400, frame()->view()->viewportSizeForViewportUnits().height());
+  }
+
+  // Lock the browser controls to shown. This should cause the vh units to
+  // behave as usual by including the browser controls region in 100vh.
+  {
+    webView->updateBrowserControlsState(WebBrowserControlsShown,
+                                        WebBrowserControlsShown, false);
+    webView->resizeWithBrowserControls(WebSize(400, 300), 100.f, true);
+    webView->updateAllLifecyclePhases();
+
+    ASSERT_EQ(100.f, webView->browserControls().contentOffset());
+    ASSERT_EQ(300, frame()->view()->layoutSize().height());
+
+    // Make sure we're not adding the browser controls height to the vh units as
+    // when they're locked to hidden, the ICB fills the entire viewport already.
+    EXPECT_FLOAT_EQ(200.f, absPos->getBoundingClientRect()->height());
+    EXPECT_FLOAT_EQ(200.f, fixedPos->getBoundingClientRect()->height());
+    EXPECT_EQ(400, frame()->view()->viewportSizeForViewportUnits().height());
+  }
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index c2d05760..43d8de1d 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -6252,27 +6252,23 @@
 
 class SpellCheckClient : public WebSpellCheckClient {
  public:
-  explicit SpellCheckClient(uint32_t hash = 0)
-      : m_numberOfTimesChecked(0), m_hash(hash) {}
+  SpellCheckClient() : m_numberOfTimesChecked(0) {}
   virtual ~SpellCheckClient() {}
   void requestCheckingOfText(const WebString&,
-                             const WebVector<uint32_t>&,
-                             const WebVector<unsigned>&,
                              WebTextCheckingCompletion* completion) override {
     ++m_numberOfTimesChecked;
     Vector<WebTextCheckingResult> results;
     const int misspellingStartOffset = 1;
     const int misspellingLength = 8;
-    results.push_back(WebTextCheckingResult(
-        WebTextDecorationTypeSpelling, misspellingStartOffset,
-        misspellingLength, WebString(), m_hash));
+    results.push_back(WebTextCheckingResult(WebTextDecorationTypeSpelling,
+                                            misspellingStartOffset,
+                                            misspellingLength, WebString()));
     completion->didFinishCheckingText(results);
   }
   int numberOfTimesChecked() const { return m_numberOfTimesChecked; }
 
  private:
   int m_numberOfTimesChecked;
-  uint32_t m_hash;
 };
 
 TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange) {
@@ -6369,44 +6365,17 @@
   document->execCommand("InsertText", false, " wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
 
-  WebVector<uint32_t> documentMarkers1;
-  webViewHelper.webView()->spellingMarkers(&documentMarkers1);
-  EXPECT_EQ(1U, documentMarkers1.size());
+  WebVector<unsigned> offsets1;
+  webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets1);
+  EXPECT_EQ(1U, offsets1.size());
 
   Vector<String> words;
   words.push_back("wellcome");
   frame->removeSpellingMarkersUnderWords(words);
 
-  WebVector<uint32_t> documentMarkers2;
-  webViewHelper.webView()->spellingMarkers(&documentMarkers2);
-  EXPECT_EQ(0U, documentMarkers2.size());
-}
-
-TEST_P(ParameterizedWebFrameTest, MarkerHashIdentifiers) {
-  registerMockedHttpURLLoad("spell.html");
-  FrameTestHelpers::WebViewHelper webViewHelper;
-  webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
-
-  static const uint32_t kHash = 42;
-  SpellCheckClient spellcheck(kHash);
-  webViewHelper.webView()->setSpellCheckClient(&spellcheck);
-
-  WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
-  Document* document = frame->frame()->document();
-  Element* element = document->getElementById("data");
-
-  webViewHelper.webView()->settings()->setEditingBehavior(
-      WebSettings::EditingBehaviorWin);
-
-  element->focus();
-  NonThrowableExceptionState exceptionState;
-  document->execCommand("InsertText", false, "wellcome.", exceptionState);
-  EXPECT_FALSE(exceptionState.hadException());
-
-  WebVector<uint32_t> documentMarkers;
-  webViewHelper.webView()->spellingMarkers(&documentMarkers);
-  EXPECT_EQ(1U, documentMarkers.size());
-  EXPECT_EQ(kHash, documentMarkers[0]);
+  WebVector<unsigned> offsets2;
+  webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets2);
+  EXPECT_EQ(0U, offsets2.size());
 }
 
 class StubbornSpellCheckClient : public WebSpellCheckClient {
@@ -6416,8 +6385,6 @@
 
   virtual void requestCheckingOfText(
       const WebString&,
-      const WebVector<uint32_t>&,
-      const WebVector<unsigned>&,
       WebTextCheckingCompletion* completion) override {
     m_completion = completion;
   }
@@ -6435,10 +6402,6 @@
 
   void kickGrammar() { kick(1, 8, WebTextDecorationTypeGrammar); }
 
-  void kickInvisibleSpellcheck() {
-    kick(1, 8, WebTextDecorationTypeInvisibleSpellcheck);
-  }
-
  private:
   void kick(int misspellingStartOffset,
             int misspellingLength,
@@ -6480,9 +6443,9 @@
 
   spellcheck.kick();
 
-  WebVector<uint32_t> documentMarkers;
-  webViewHelper.webView()->spellingMarkers(&documentMarkers);
-  EXPECT_EQ(0U, documentMarkers.size());
+  WebVector<unsigned> offsets;
+  webViewHelper.webView()->spellingMarkerOffsetsForTest(&offsets);
+  EXPECT_EQ(0U, offsets.size());
 }
 
 // This test verifies that cancelling spelling request does not cause a
@@ -6533,9 +6496,7 @@
                                 DocumentMarker::Spelling);
   document->markers().addMarker(range.startPosition(), range.endPosition(),
                                 DocumentMarker::Grammar);
-  document->markers().addMarker(range.startPosition(), range.endPosition(),
-                                DocumentMarker::InvisibleSpellcheck);
-  EXPECT_EQ(3U, document->markers().markers().size());
+  EXPECT_EQ(2U, document->markers().markers().size());
 
   spellcheck.kickNoResults();
   EXPECT_EQ(0U, document->markers().markers().size());
@@ -6576,12 +6537,6 @@
 
   document->execCommand("InsertText", false, "wellcome ", exceptionState);
   EXPECT_FALSE(exceptionState.hadException());
-
-  spellcheck.kickInvisibleSpellcheck();
-  ASSERT_EQ(1U, document->markers().markers().size());
-  ASSERT_NE(static_cast<DocumentMarker*>(0), document->markers().markers()[0]);
-  EXPECT_EQ(DocumentMarker::InvisibleSpellcheck,
-            document->markers().markers()[0]->type());
 }
 
 class TestAccessInitialDocumentWebFrameClient

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/bindings/bindings_tests.py b/third_party/WebKit/Tools/Scripts/webkitpy/bindings/bindings_tests.py
index 67ec54e..a80de506 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/bindings/bindings_tests.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/bindings/bindings_tests.py

@@ -38,7 +38,7 @@
 from code_generator_v8 import CodeGeneratorV8
 from code_generator_v8 import CodeGeneratorUnionType
 from code_generator_v8 import CodeGeneratorCallbackFunction
-from code_generator_web_module import CodeGeneratorWebModule
+from code_generator_web_agent_api import CodeGeneratorWebAgentAPI
 from compute_interfaces_info_individual import InterfaceInfoCollector
 from compute_interfaces_info_overall import (compute_interfaces_info_overall,
                                              interfaces_info)
@@ -337,7 +337,7 @@
                 options,
                 idl_filenames)
             generate_bindings(
-                CodeGeneratorWebModule,
+                CodeGeneratorWebAgentAPI,
                 info_provider,
                 options,
                 idl_filenames)

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl.py
index 0dce4c6..34b80cd 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl.py

@@ -16,24 +16,16 @@
 
 _log = logging.getLogger(__name__)
 
-_COMMANDS_THAT_REQUIRE_AUTH = (
-    'archive', 'comments', 'commit', 'description', 'diff', 'land', 'lint', 'owners', 'patch',
-    'presubmit', 'set-close', 'set-commit', 'status', 'try-results', 'try', 'upload',
-)
-
 
 class GitCL(object):
 
-    def __init__(self, host, auth_refresh_token_json=None, cwd=None):
+    def __init__(self, host, cwd=None):
         self._host = host
-        self._auth_refresh_token_json = auth_refresh_token_json
         self._cwd = cwd
 
     def run(self, args):
         """Runs git-cl with the given arguments and returns the output."""
         command = ['git', 'cl'] + args
-        if self._auth_refresh_token_json and args[0] in _COMMANDS_THAT_REQUIRE_AUTH:
-            command += ['--auth-refresh-token-json', self._auth_refresh_token_json]
         return self._host.executive.run_command(command, cwd=self._cwd)
 
     def get_issue_number(self):

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
index c67909e..b30bccdc 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/git_cl_unittest.py

@@ -20,21 +20,12 @@
         self.assertEqual(output, 'mock-output')
         self.assertEqual(host.executive.calls, [['git', 'cl', 'command']])
 
-    def test_run_with_auth(self):
+    def test_run_basic(self):
         host = MockHost()
         host.executive = MockExecutive(output='mock-output')
-        git_cl = GitCL(host, auth_refresh_token_json='token.json')
+        git_cl = GitCL(host)
         git_cl.run(['upload'])
-        self.assertEqual(
-            host.executive.calls,
-            [['git', 'cl', 'upload', '--auth-refresh-token-json', 'token.json']])
-
-    def test_some_commands_not_run_with_auth(self):
-        host = MockHost()
-        host.executive = MockExecutive(output='mock-output')
-        git_cl = GitCL(host, auth_refresh_token_json='token.json')
-        git_cl.run(['issue'])
-        self.assertEqual(host.executive.calls, [['git', 'cl', 'issue']])
+        self.assertEqual(host.executive.calls, [['git', 'cl', 'upload']])
 
     def test_get_issue_number(self):
         host = MockHost()

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld.py
deleted file mode 100644
index c1438fa..0000000
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld.py
+++ /dev/null

@@ -1,100 +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.
-
-"""Utility functions to communicate with Rietveld."""
-
-import json
-import logging
-import urllib2
-
-from webkitpy.common.net.buildbot import Build, filter_latest_builds
-
-_log = logging.getLogger(__name__)
-
-BASE_CODEREVIEW_URL = 'https://codereview.chromium.org/api'
-
-
-class Rietveld(object):
-
-    def __init__(self, web):
-        self.web = web
-
-    def latest_try_jobs(self, issue_number, builder_names=None, patchset_number=None):
-        """Returns a list of Build objects for builds on the latest patchset.
-
-        Args:
-            issue_number: A Rietveld issue number.
-            builder_names: A collection of builder names. If specified, only results
-                from the given list of builders will be kept.
-            patchset_number: If given, a specific patchset will be used instead of the latest one.
-
-        Returns:
-            A list of Build objects, where Build objects for completed jobs have a build number,
-            and Build objects for pending jobs have no build number.
-        """
-        try:
-            if patchset_number:
-                url = self._patchset_url(issue_number, patchset_number)
-            else:
-                url = self._latest_patchset_url(issue_number)
-            patchset_data = self._get_json(url)
-        except (urllib2.URLError, ValueError):
-            return []
-
-        builds = []
-        for result_dict in patchset_data['try_job_results']:
-            build = Build(result_dict['builder'], result_dict['buildnumber'])
-            # Normally, a value of -1 or 6 in the "result" field indicates the job is
-            # started or pending, and the "buildnumber" field is null.
-            if build.build_number and result_dict['result'] in (-1, 6):
-                _log.warning('Build %s has result %d, but unexpectedly has a build number.', build, result_dict['result'])
-                build.build_number = None
-            builds.append(build)
-
-        if builder_names is not None:
-            builds = [b for b in builds if b.builder_name in builder_names]
-
-        return filter_latest_builds(builds)
-
-    def changed_files(self, issue_number):
-        """Lists the files included in a CL that are changed but not deleted.
-
-        File paths are sorted and relative to the repository root.
-        """
-        try:
-            url = self._latest_patchset_url(issue_number)
-            issue_data = self._get_json(url)
-            return sorted(path for path, file_change in issue_data['files'].iteritems() if file_change['status'] != 'D')
-        except (urllib2.URLError, ValueError, KeyError):
-            _log.warning('Failed to list changed files for issue %s.', issue_number)
-            return None
-
-    def _latest_patchset_url(self, issue_number):
-        issue_data = self._get_json(self._issue_url(issue_number))
-        latest_patchset_number = issue_data["patchsets"][-1]
-        return self._patchset_url(issue_number, latest_patchset_number)
-
-    def _get_json(self, url):
-        """Fetches JSON from a URL, and logs errors if the request was unsuccessful.
-
-        Raises:
-            urllib2.URLError: Something went wrong with the request.
-            ValueError: The response wasn't valid JSON.
-        """
-        try:
-            contents = self.web.get_binary(url)
-        except urllib2.URLError:
-            _log.error('Request failed to URL: %s', url)
-            raise
-        try:
-            return json.loads(contents)
-        except ValueError:
-            _log.error('Invalid JSON: %s', contents)
-            raise
-
-    def _issue_url(self, issue_number):
-        return '%s/%s' % (BASE_CODEREVIEW_URL, issue_number)
-
-    def _patchset_url(self, issue_number, patchset_number):
-        return '%s/%s' % (self._issue_url(issue_number), patchset_number)

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py
deleted file mode 100644
index 8f39a5bd..0000000
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/net/rietveld_unittest.py
+++ /dev/null

@@ -1,95 +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.
-
-import json
-import urllib2
-
-from webkitpy.common.net.rietveld import Rietveld
-from webkitpy.common.net.buildbot import Build
-from webkitpy.common.net.web_mock import MockWeb
-from webkitpy.common.system.log_testing import LoggingTestCase
-
-
-class RietveldTest(LoggingTestCase):
-
-    def mock_web(self):
-        return MockWeb(urls={
-            'https://codereview.chromium.org/api/11112222': json.dumps({
-                'patchsets': [1, 2, 3],
-            }),
-            'https://codereview.chromium.org/api/11112222/2': json.dumps({
-                'try_job_results': [
-                    {
-                        'builder': 'foo-builder',
-                        'buildnumber': None,
-                        'result': -1
-                    },
-                    {
-                        'builder': 'bar-builder',
-                        'buildnumber': 50,
-                        'result': 0
-                    },
-                ],
-            }),
-            'https://codereview.chromium.org/api/11112222/3': json.dumps({
-                'try_job_results': [
-                    {
-                        'builder': 'foo-builder',
-                        'buildnumber': 20,
-                        'result': 1
-                    },
-                    {
-                        'builder': 'bar-builder',
-                        'buildnumber': 60,
-                        'result': 0
-                    },
-                ],
-                'files': {
-                    'some/path/foo.cc': {'status': 'M'},
-                    'some/path/bar.html': {'status': 'M'},
-                    'some/path/deleted.html': {'status': 'D'},
-                }
-            }),
-            'https://codereview.chromium.org/api/11113333': 'my non-JSON contents',
-        })
-
-    def test_latest_try_jobs(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertEqual(
-            rietveld.latest_try_jobs(11112222, ('bar-builder', 'other-builder')),
-            [Build('bar-builder', 60)])
-
-    def test_latest_try_jobs_http_error(self):
-        def raise_error(_):
-            raise urllib2.URLError('Some request error message')
-        web = self.mock_web()
-        web.get_binary = raise_error
-        rietveld = Rietveld(web)
-        self.assertEqual(rietveld.latest_try_jobs(11112222, ('bar-builder',)), [])
-        self.assertLog(['ERROR: Request failed to URL: https://codereview.chromium.org/api/11112222\n'])
-
-    def test_latest_try_jobs_non_json_response(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertEqual(rietveld.latest_try_jobs(11113333, ('bar-builder',)), [])
-        self.assertLog(['ERROR: Invalid JSON: my non-JSON contents\n'])
-
-    def test_latest_try_jobs_with_patchset(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertEqual(
-            rietveld.latest_try_jobs(11112222, ('bar-builder', 'other-builder'), patchset_number=2),
-            [Build('bar-builder', 50)])
-
-    def test_latest_try_jobs_no_relevant_builders(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertEqual(rietveld.latest_try_jobs(11112222, ('foo', 'bar')), [])
-
-    def test_changed_files(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertEqual(
-            rietveld.changed_files(11112222),
-            ['some/path/bar.html', 'some/path/foo.cc'])
-
-    def test_changed_files_no_results(self):
-        rietveld = Rietveld(self.mock_web())
-        self.assertIsNone(rietveld.changed_files(11113333))

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py
index 024faccc..ba162bf8 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor.py

@@ -62,7 +62,8 @@
             changed_files: A list of file paths relative to the repository root.
 
         Returns:
-            A dict mapping owner email addresses to lists of owned directories.
+            A dict mapping tuples of owner email addresses to lists of
+            owned directories.
         """
         tests = [self.finder.layout_test_name(path) for path in changed_files]
         tests = [t for t in tests if t is not None]
@@ -71,6 +72,5 @@
             owned_tests = [t for t in tests if t.startswith(directory)]
             if not owned_tests:
                 continue
-            for owner in owners:
-                email_map[owner].append(directory)
+            email_map[tuple(owners)].append(directory)
         return email_map

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py
index 3fbfc49..213e436b 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/directory_owners_extractor_unittest.py

@@ -37,9 +37,9 @@
 
     def test_list_owners(self):
         self.extractor.owner_map = {
-            'external/wpt/foo': ['a@chromium.org'],
+            'external/wpt/foo': ['a@chromium.org', 'c@chromium.org'],
             'external/wpt/bar': ['b@chromium.org'],
-            'external/wpt/baz': ['a@chromium.org'],
+            'external/wpt/baz': ['a@chromium.org', 'c@chromium.org'],
         }
         self.filesystem.files = {
             '/mock-checkout/third_party/WebKit/LayoutTests/external/wpt/foo/x/y.html': '',
@@ -54,7 +54,7 @@
         ]
         self.assertEqual(
             self.extractor.list_owners(changed_files),
-            {'a@chromium.org': ['external/wpt/foo', 'external/wpt/baz']})
+            {('a@chromium.org', 'c@chromium.org'): ['external/wpt/foo', 'external/wpt/baz']})
 
     def test_extract_owner_positive_cases(self):
         self.assertEqual(self.extractor.extract_owners('## Owners: foo@chromium.org'), ['foo@chromium.org'])

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
index d7d88950..4bb5a936 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

@@ -55,7 +55,7 @@
         if not self.checkout_is_okay(options.allow_local_commits):
             return 1
 
-        self.git_cl = GitCL(self.host, auth_refresh_token_json=options.auth_refresh_token_json)
+        self.git_cl = GitCL(self.host)
 
         _log.debug('Noting the current Chromium commit.')
         _, show_ref_output = self.run(['git', 'show-ref', 'HEAD'])
@@ -124,7 +124,7 @@
         parser.add_argument('--auto-update', action='store_true',
                             help='uploads CL and initiates commit queue.')
         parser.add_argument('--auth-refresh-token-json',
-                            help='Rietveld auth refresh JSON token.')
+                            help='Auth refresh JSON token (ignored, deprecated)')
         parser.add_argument('--ignore-exportable-commits', action='store_true',
                             help='Continue even if there are exportable commits that may be overwritten.')
         return parser.parse_args(argv)
@@ -344,7 +344,7 @@
             self.fetch_new_expectations_and_baselines()
 
         # Trigger CQ and wait for CQ try jobs to finish.
-        self.git_cl.run(['set-commit', '--rietveld'])
+        self.git_cl.run(['set-commit', '--gerrit'])
         try_results = self.git_cl.wait_for_try_jobs(
             poll_delay_seconds=POLL_DELAY_SECONDS, timeout_seconds=TIMEOUT_SECONDS)
 
@@ -371,13 +371,13 @@
         self.git_cl.run([
             'upload',
             '-f',
-            '--rietveld',
+            '--gerrit',
             '-m',
             description,
         ] + ['--cc=' + email_address for email_address in directory_owners])
 
     def get_directory_owners(self):
-        """Returns a list of email addresses of owners of changed tests."""
+        """Returns a mapping of email addresses to owners of changed tests."""
         _log.info('Gathering directory owners emails to CC.')
         changed_files = self.host.git().changed_files()
         extractor = DirectoryOwnersExtractor(self.fs)
@@ -385,6 +385,11 @@
         return extractor.list_owners(changed_files)
 
     def _cl_description(self, directory_owners):
+        """Returns a CL description string.
+
+        Args:
+            directory_owners: A dict of tuples of owner names to lists of directories.
+        """
         description = self.check_run(['git', 'log', '-1', '--format=%B'])
         build_link = current_build_link(self.host)
         if build_link:
@@ -403,9 +408,9 @@
     @staticmethod
     def _format_directory_owners(directory_owners):
         message_lines = ['Directory owners for changes in this CL:']
-        for owner, directories in sorted(directory_owners.items()):
-            message_lines.append(owner + ':')
-            message_lines.extend(['  ' + d for d in directories])
+        for owner_tuple, directories in sorted(directory_owners.items()):
+            message_lines.append(', '.join(owner_tuple) + ':')
+            message_lines.extend('  ' + d for d in directories)
         return '\n'.join(message_lines)
 
     def fetch_new_expectations_and_baselines(self):
@@ -415,7 +420,7 @@
         expectation_updater.run(args=[])
         message = 'Update test expectations and baselines.'
         self.check_run(['git', 'commit', '-a', '-m', message])
-        self.git_cl.run(['upload', '-m', message, '--rietveld'])
+        self.git_cl.run(['upload', '-m', message, '--gerrit'])
 
     def update_all_test_expectations_files(self, deleted_tests, renamed_tests):
         """Updates all test expectations files for tests that have been deleted or renamed."""

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
index fc838c4d..d6fbcd8a 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py

@@ -116,18 +116,18 @@
         host.executive = MockExecutive(output='Last commit message\n\n')
         importer = TestImporter(host)
         description = importer._cl_description(directory_owners={
-            'someone@chromium.org': ['external/wpt/foo', 'external/wpt/bar'],
-            'someone-else@chromium.org': ['external/wpt/baz'],
+            ('someone@chromium.org',): ['external/wpt/foo', 'external/wpt/bar'],
+            ('x@chromium.org', 'y@chromium.org'): ['external/wpt/baz'],
         })
         self.assertEqual(
             description,
             ('Last commit message\n\n'
              'Directory owners for changes in this CL:\n'
-             'someone-else@chromium.org:\n'
-             '  external/wpt/baz\n'
              'someone@chromium.org:\n'
              '  external/wpt/foo\n'
-             '  external/wpt/bar\n\n'
+             '  external/wpt/bar\n'
+             'x@chromium.org, y@chromium.org:\n'
+             '  external/wpt/baz\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
 
@@ -173,7 +173,7 @@
         git.changed_files = lambda: ['third_party/WebKit/LayoutTests/external/wpt/foo/x.html']
         host.git = lambda: git
         importer = TestImporter(host)
-        self.assertEqual(importer.get_directory_owners(), {'someone@chromium.org': ['external/wpt/foo']})
+        self.assertEqual(importer.get_directory_owners(), {('someone@chromium.org',): ['external/wpt/foo']})
 
     def test_get_directory_owners_no_changed_files(self):
         host = MockHost()

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py
index c495301..e65d5e6 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py

@@ -15,7 +15,6 @@
 
 from webkitpy.common.memoized import memoized
 from webkitpy.common.net.git_cl import GitCL
-from webkitpy.common.net.rietveld import Rietveld
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectationLine, TestExpectations
 from webkitpy.w3c.test_parser import TestParser
@@ -45,8 +44,7 @@
             _log.error('No issue on current branch.')
             return 1
 
-        rietveld = Rietveld(self.host.web)
-        builds = rietveld.latest_try_jobs(issue_number, self._get_try_bots())
+        builds = self.get_latest_try_jobs()
         _log.debug('Latest try jobs: %r', builds)
         if not builds:
             _log.error('No try job information was collected.')
@@ -72,6 +70,10 @@
         """Returns current CL number. Can be replaced in unit tests."""
         return GitCL(self.host).get_issue_number()
 
+    def get_latest_try_jobs(self):
+        """Returns the latest finished try jobs as Build objects."""
+        return GitCL(self.host).latest_try_jobs(self._get_try_bots())
+
     def get_failing_results_dict(self, build):
         """Returns a nested dict of failing test results.
 

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py
index 80e882201..b705cde 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater_unittest.py

@@ -2,14 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import json
 import copy
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.net.buildbot import Build
 from webkitpy.common.net.buildbot_mock import MockBuildBot
 from webkitpy.common.net.layout_test_results import LayoutTestResult, LayoutTestResults
-from webkitpy.common.net.web_mock import MockWeb
 from webkitpy.common.system.log_testing import LoggingTestCase
 from webkitpy.layout_tests.builder_list import BuilderList
 from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater, MARKER_COMMENT
@@ -420,28 +418,15 @@
         self.assertEqual(test_results_dict, test_results_dict_copy)
 
     def test_run_no_issue_number(self):
+        # TODO(qyearsley): For testing: Consider making a MockGitCL class
+        # and use that class to set fake return values when using git cl.
         updater = WPTExpectationsUpdater(self.mock_host())
         updater.get_issue_number = lambda: 'None'
         self.assertEqual(1, updater.run(args=[]))
         self.assertLog(['ERROR: No issue on current branch.\n'])
 
     def test_run_no_try_results(self):
-        host = self.mock_host()
-        host.web = MockWeb(urls={
-            'https://codereview.chromium.org/api/11112222': json.dumps({
-                'patchsets': [1],
-            }),
-            'https://codereview.chromium.org/api/11112222/1': json.dumps({
-                'try_job_results': []
-            })
-        })
-        updater = WPTExpectationsUpdater(host)
-        updater.get_issue_number = lambda: '11112222'
+        updater = WPTExpectationsUpdater(self.mock_host())
+        updater.get_latest_try_jobs = lambda: []
         self.assertEqual(1, updater.run(args=[]))
-        self.assertEqual(
-            host.web.urls_fetched,
-            [
-                'https://codereview.chromium.org/api/11112222',
-                'https://codereview.chromium.org/api/11112222/1'
-            ])
         self.assertLog(['ERROR: No try job information was collected.\n'])

diff --git a/third_party/WebKit/public/platform/modules/presentation/presentation.mojom b/third_party/WebKit/public/platform/modules/presentation/presentation.mojom
index 7af9140..7df477f 100644
--- a/third_party/WebKit/public/platform/modules/presentation/presentation.mojom
+++ b/third_party/WebKit/public/platform/modules/presentation/presentation.mojom

@@ -115,14 +115,6 @@
 
   //////////////////////////////////////////////////////////////////////////////
 
-  // Called when send() is called by the frame. The true in the
-  // result callback notifies that the service is ready for next message.
-  // The false in the result callback notifies the renderer to stop sending
-  // the send requests and invalidate all pending requests. This occurs
-  // for eg., when frame is deleted or navigated away.
-  SendConnectionMessage(PresentationSessionInfo sessionInfo,
-                     ConnectionMessage message_request) => (bool success);
-
   // Called when close() is called by the frame.
   CloseConnection(url.mojom.Url presentation_url, string presentation_id);
 

diff --git a/third_party/WebKit/public/web/WebContextMenuData.h b/third_party/WebKit/public/web/WebContextMenuData.h
index ebd769d..5782309 100644
--- a/third_party/WebKit/public/web/WebContextMenuData.h
+++ b/third_party/WebKit/public/web/WebContextMenuData.h

@@ -134,9 +134,6 @@
   // The editable (possibily) misspelled word.
   WebString misspelledWord;
 
-  // The identifier of the misspelling.
-  uint32_t misspellingHash;
-
   // If misspelledWord is not empty, holds suggestions from the dictionary.
   WebVector<WebString> dictionarySuggestions;
 
@@ -196,7 +193,6 @@
         hasImageContents(true),
         mediaFlags(MediaNone),
         isSpellCheckingEnabled(false),
-        misspellingHash(0),
         isEditable(false),
         writingDirectionDefault(CheckableMenuItemDisabled),
         writingDirectionLeftToRight(CheckableMenuItemEnabled),

diff --git a/third_party/WebKit/public/web/WebRemoteFrame.h b/third_party/WebKit/public/web/WebRemoteFrame.h
index 04659d0..7ca1af3 100644
--- a/third_party/WebKit/public/web/WebRemoteFrame.h
+++ b/third_party/WebKit/public/web/WebRemoteFrame.h

@@ -10,6 +10,7 @@
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebSandboxFlags.h"
+#include "v8/include/v8.h"
 
 namespace blink {
 
@@ -104,7 +105,7 @@
   // Temporary method to allow embedders to get the script context of a
   // remote frame. This should only be used by legacy code that has not yet
   // migrated over to the new OOPI infrastructure.
-  virtual v8::Local<v8::Context> deprecatedMainWorldScriptContext() const = 0;
+  virtual v8::Local<v8::Object> globalProxy() const = 0;
 
  protected:
   explicit WebRemoteFrame(WebTreeScopeType scope) : WebFrame(scope) {}

diff --git a/third_party/WebKit/public/web/WebSettings.h b/third_party/WebKit/public/web/WebSettings.h
index ef8014e4..6737d3c 100644
--- a/third_party/WebKit/public/web/WebSettings.h
+++ b/third_party/WebKit/public/web/WebSettings.h

@@ -202,6 +202,7 @@
   virtual void setMediaPlaybackRequiresUserGesture(bool) = 0;
   virtual void setMediaPlaybackGestureWhitelistScope(const WebString&) = 0;
   virtual void setPresentationRequiresUserGesture(bool) = 0;
+  virtual void setEmbeddedMediaExperienceEnabled(bool) = 0;
   virtual void setMinimumAccelerated2dCanvasSize(int) = 0;
   virtual void setMinimumFontSize(int) = 0;
   virtual void setMinimumLogicalFontSize(int) = 0;

diff --git a/third_party/WebKit/public/web/WebSpellCheckClient.h b/third_party/WebKit/public/web/WebSpellCheckClient.h
index aa60af6..0970719 100644
--- a/third_party/WebKit/public/web/WebSpellCheckClient.h
+++ b/third_party/WebKit/public/web/WebSpellCheckClient.h

@@ -56,8 +56,6 @@
   // returned by passed completion object.
   virtual void requestCheckingOfText(
       const WebString& textToCheck,
-      const WebVector<uint32_t>& markersInText,
-      const WebVector<unsigned>& markerOffsets,
       WebTextCheckingCompletion* completionCallback) {}
 
   // Clear all stored references to requests, so that it will not become a

diff --git a/third_party/WebKit/public/web/WebTextCheckingResult.h b/third_party/WebKit/public/web/WebTextCheckingResult.h
index 7b58085..b2dfce85 100644
--- a/third_party/WebKit/public/web/WebTextCheckingResult.h
+++ b/third_party/WebKit/public/web/WebTextCheckingResult.h

@@ -42,21 +42,16 @@
 // A checked entry of text checking.
 struct WebTextCheckingResult {
   WebTextCheckingResult()
-      : decoration(WebTextDecorationTypeSpelling),
-        location(0),
-        length(0),
-        hash(0) {}
+      : decoration(WebTextDecorationTypeSpelling), location(0), length(0) {}
 
   WebTextCheckingResult(WebTextDecorationType decoration,
                         int location,
                         int length,
-                        const WebString& replacement = WebString(),
-                        uint32_t hash = 0)
+                        const WebString& replacement = WebString())
       : decoration(decoration),
         location(location),
         length(length),
-        replacement(replacement),
-        hash(hash) {}
+        replacement(replacement) {}
 
 #if BLINK_IMPLEMENTATION
   operator TextCheckingResult() const;
@@ -66,7 +61,6 @@
   int location;
   int length;
   WebString replacement;
-  uint32_t hash;
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/public/web/WebTextDecorationType.h b/third_party/WebKit/public/web/WebTextDecorationType.h
index e010c4f..e63b921 100644
--- a/third_party/WebKit/public/web/WebTextDecorationType.h
+++ b/third_party/WebKit/public/web/WebTextDecorationType.h

@@ -36,7 +36,6 @@
 enum WebTextDecorationType {
   WebTextDecorationTypeSpelling = 1 << 1,
   WebTextDecorationTypeGrammar = 1 << 2,
-  WebTextDecorationTypeInvisibleSpellcheck = 1 << 3,
 };
 
 }  // namespace blink

diff --git a/third_party/WebKit/public/web/WebView.h b/third_party/WebKit/public/web/WebView.h
index 2701d38..92bdf07 100644
--- a/third_party/WebKit/public/web/WebView.h
+++ b/third_party/WebKit/public/web/WebView.h

@@ -365,7 +365,7 @@
                                                const WebSize& tapArea) = 0;
 
   // Retrieves a list of spelling markers.
-  virtual void spellingMarkers(WebVector<uint32_t>* markers) = 0;
+  virtual void spellingMarkerOffsetsForTest(WebVector<unsigned>* offsets) = 0;
   virtual void removeSpellingMarkersUnderWords(
       const WebVector<WebString>& words) = 0;
 

diff --git a/third_party/android_opengl/OWNERS b/third_party/android_opengl/OWNERS
index 540d858..242d6402 100644
--- a/third_party/android_opengl/OWNERS
+++ b/third_party/android_opengl/OWNERS

@@ -1,2 +1,4 @@
 dtrainor@chromium.org
-powei@chromium.org
\ No newline at end of file
+powei@chromium.org
+
+# COMPONENT: Mobile

diff --git a/third_party/node/node_modules.tar.gz.sha1 b/third_party/node/node_modules.tar.gz.sha1
index 8ca3525..cfef949 100644
--- a/third_party/node/node_modules.tar.gz.sha1
+++ b/third_party/node/node_modules.tar.gz.sha1

@@ -1 +1 @@
-174a7d3b8aee162a03433abb22d1fb2771eeb00e
+72d6150ddcff29c0bc48dfb8b175320cb3830d64

diff --git a/third_party/node/package.json b/third_party/node/package.json
index 3558ae7..dbe54d9 100644
--- a/third_party/node/package.json
+++ b/third_party/node/package.json

@@ -4,7 +4,7 @@
   "author": "dpapad@chromium.org",
   "dependencies": {
     "crisper": "2.0.2",
-    "polymer-css-build": "0.0.7",
+    "polymer-css-build": "0.0.9",
     "uglifyjs": "2.4.10",
     "vulcanize": "1.15.2"
   }

diff --git a/tools/chrome_proxy/webdriver/common.py b/tools/chrome_proxy/webdriver/common.py
index 2572a64..47917bf 100644
--- a/tools/chrome_proxy/webdriver/common.py
+++ b/tools/chrome_proxy/webdriver/common.py

@@ -327,9 +327,18 @@
     """
     return self.ExecuteJavascript("return " + script, timeout)
 
-  def GetHistogram(self, histogram):
+  def GetHistogram(self, histogram, timeout=30):
+    """Gets a Chrome histogram as a dictionary object.
+
+    Args:
+      histogram: the name of the histogram to fetch
+      timeout: timeout for the underlying Javascript query.
+
+    Returns:
+      A dictionary object containing information about the histogram.
+    """
     js_query = 'statsCollectionController.getBrowserHistogram("%s")' % histogram
-    string_response = self.ExecuteJavascriptStatement(js_query)
+    string_response = self.ExecuteJavascriptStatement(js_query, timeout)
     self._logger.debug('Got %s histogram=%s', histogram, string_response)
     return json.loads(string_response)
 
@@ -382,6 +391,27 @@
     self._has_logs = False
     return all_messages
 
+  def SleepUntilHistogramHasEntry(self, histogram_name, sleep_intervals=10):
+    """Polls if a histogram exists in 1-6 second intervals for 10 intervals.
+    Allows script to run with a timeout of 5 seconds, so the default behavior
+    allows up to 60 seconds until timeout.
+
+    Args:
+      histogram_name: The name of the histogram to wait for
+      sleep_intervals: The number of polling intervals, each polling cycle takes
+      no more than 6 seconds.
+    Returns:
+      Whether the histogram exists
+    """
+    histogram = {}
+    while(not histogram and sleep_intervals > 0):
+      histogram = self.GetHistogram(histogram_name, 5)
+      if (not histogram):
+        time.sleep(1)
+        sleep_intervals -= 1
+
+    return bool(histogram)
+
   def GetHTTPResponses(self, include_favicon=False, skip_domainless_pages=True):
     """Parses the Performance Logs and returns a list of HTTPResponse objects.
 

diff --git a/tools/chrome_proxy/webdriver/fallback.py b/tools/chrome_proxy/webdriver/fallback.py
new file mode 100644
index 0000000..4de3956
--- /dev/null
+++ b/tools/chrome_proxy/webdriver/fallback.py

@@ -0,0 +1,40 @@
+# Copyright 2017 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.
+
+import common
+from common import TestDriver
+from common import IntegrationTest
+
+class Fallback(IntegrationTest):
+
+  # Ensure that when a carrier blocks using the secure proxy, requests fallback
+  # to the HTTP proxy server.
+  def testSecureProxyProbeFallback(self):
+    with TestDriver() as test_driver:
+      test_driver.AddChromeArg('--enable-spdy-proxy-auth')
+
+      # Set the secure proxy check URL to the google.com favicon, which will be
+      # interpreted as a secure proxy check failure since the response body is
+      # not "OK". The google.com favicon is used because it will load reliably
+      # fast, and there have been problems with chromeproxy-test.appspot.com
+      # being slow and causing tests to flake.
+      test_driver.AddChromeArg(
+          '--data-reduction-proxy-secure-proxy-check-url='
+          'http://www.google.com/favicon.ico')
+
+      # Start chrome to begin the secure proxy check
+      test_driver.LoadURL('http://www.google.com/favicon.ico')
+
+      self.assertTrue(
+        test_driver.SleepUntilHistogramHasEntry("DataReductionProxy.ProbeURL"))
+
+      test_driver.LoadURL('http://check.googlezip.net/test.html')
+      responses = test_driver.GetHTTPResponses()
+      self.assertNotEqual(0, len(responses))
+      for response in responses:
+          self.assertHasChromeProxyViaHeader(response)
+          self.assertEqual(u'http/1.1', response.protocol)
+
+if __name__ == '__main__':
+  IntegrationTest.RunAllTests()

diff --git a/tools/chrome_proxy/webdriver/lofi.py b/tools/chrome_proxy/webdriver/lofi.py
new file mode 100644
index 0000000..3e49e510
--- /dev/null
+++ b/tools/chrome_proxy/webdriver/lofi.py

@@ -0,0 +1,46 @@
+# Copyright 2017 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.
+
+import common
+from common import TestDriver
+from common import IntegrationTest
+
+
+class LoFi(IntegrationTest):
+
+  #  Checks that the compressed image is below a certain threshold.
+  #  The test page is uncacheable otherwise a cached page may be served that
+  #  doesn't have the correct via headers.
+  def testLoFi(self):
+    with TestDriver() as test_driver:
+      test_driver.AddChromeArg('--enable-spdy-proxy-auth')
+      test_driver.AddChromeArg('--data-reduction-proxy-lo-fi=always-on')
+      # Disable server experiments such as tamper detection.
+      test_driver.AddChromeArg('--data-reduction-proxy-server-experiments-'
+                               'disabled')
+      test_driver.AddChromeArg('--disable-quic')
+
+      test_driver.LoadURL('http://check.googlezip.net/static/index.html')
+
+      lofi_responses = 0
+      for response in test_driver.GetHTTPResponses():
+        if not response.url.endswith('png'):
+          continue
+        if not response.request_headers:
+          continue
+        self.assertHasChromeProxyViaHeader(response)
+        content_length = response.response_headers['content-length']
+        cpat_request = response.request_headers['chrome-proxy-accept-transform']
+        cpct_response = response.response_headers[
+                          'chrome-proxy-content-transform']
+        if ('empty-image' in cpct_response):
+          lofi_responses = lofi_responses + 1
+          self.assertIn('empty-image', cpat_request)
+          self.assertTrue(int(content_length) < 100)
+
+      # Verify that Lo-Fi responses were seen.
+      self.assertNotEqual(0, lofi_responses)
+
+if __name__ == '__main__':
+  IntegrationTest.RunAllTests()

diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 9a667cb..4d64ec16 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py

@@ -27,14 +27,14 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION = '289944'
+CLANG_REVISION = '295793'
 
 use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ
 if use_head_revision:
   CLANG_REVISION = 'HEAD'
 
 # This is incremented when pushing a new build of Clang at the same revision.
-CLANG_SUB_REVISION=2
+CLANG_SUB_REVISION=1
 
 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)
 
@@ -71,7 +71,7 @@
                                 'Linux_x64', 'Release', 'bin')
 BFD_PLUGINS_DIR = os.path.join(BINUTILS_DIR, 'Linux_x64', 'Release',
                                'lib', 'bfd-plugins')
-VERSION = '4.0.0'
+VERSION = '5.0.0'
 ANDROID_NDK_DIR = os.path.join(
     CHROMIUM_DIR, 'third_party', 'android_tools', 'ndk')
 
@@ -867,11 +867,6 @@
       print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).'
       return 0
 
-  if use_head_revision:
-    # TODO(hans): Trunk was updated; remove after the next roll.
-    global VERSION
-    VERSION = '5.0.0'
-
   global CLANG_REVISION, PACKAGE_VERSION
   if args.print_revision:
     if use_head_revision or args.llvm_force_head_revision:

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index ab7dbcf..b4417b8 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl

@@ -107,6 +107,7 @@
       'CFI Linux': 'cfi_release_static',
       'CFI Linux Full': 'cfi_full_release_static',
       'Chromium Linux Goma Canary': 'release_bot',
+      'Chromium Linux Goma Canary': 'release_bot',
       'Chromium Linux Goma Canary (clobber)': 'release_bot',
       'Chromium Linux Goma Canary LocalOutputCache': 'release_bot',
       'Chromium Linux Precise Goma LinkTest': 'release_bot',
@@ -188,6 +189,7 @@
       'Libfuzzer Upload Linux UBSan': 'release_libfuzzer_ubsan',
       'Libfuzzer Upload Mac ASan': 'release_libfuzzer_mac_asan',
       'Linux ARM': 'release_bot_arm',
+      'Linux Clang Analyzer': 'linux_chromium_analysis',
       'Linux deterministic': 'release_bot',
       'Linux deterministic (dbg)': 'debug_bot',
       'Linux remote_run Builder': 'release_bot',
@@ -250,6 +252,7 @@
       'GPU Win x64 Builder (dbg)': 'gpu_tests_deqp_gles_debug_trybot',
       'Linux ChromiumOS Builder': 'gpu_fyi_tests_chromeos_release_trybot',
       'Linux ChromiumOS Ozone Builder': 'gpu_fyi_tests_chromeos_ozone_release_trybot',
+      'Linux GPU TSAN Release': 'gpu_fyi_tests_release_trybot_tsan',
       'Mac GPU ASAN Release': 'gpu_fyi_tests_release_trybot_asan',
     },
 
@@ -1203,7 +1206,7 @@
     ],
 
     'gpu_fyi_tests_chromeos_ozone_release_trybot': [
-      'gpu_fyi_tests', 'release_trybot', 'chromeos', 'ozone_linux', 'system_gbm_libdrm',
+      'gpu_fyi_tests', 'release_trybot', 'chromeos', 'ozone', 'ozone_linux', 'system_gbm_libdrm',
     ],
 
     'gpu_fyi_tests_chromeos_release_trybot': [
@@ -1222,6 +1225,10 @@
       'gpu_fyi_tests', 'release_trybot', 'asan', 'full_symbols', 'disable_nacl',
     ],
 
+    'gpu_fyi_tests_release_trybot_tsan': [
+      'gpu_fyi_tests', 'release_trybot', 'tsan', 'full_symbols', 'disable_nacl',
+    ],
+
     'gpu_fyi_tests_win_clang_debug_bot': [
       'gpu_tests', 'internal_gles2_conform_tests', 'clang', 'debug_bot', 'minimal_symbols',
     ],
@@ -1285,6 +1292,10 @@
     # build files.
     'ios': [ 'error'],
 
+    'linux_chromium_analysis': [
+      'analysis'
+    ],
+
     'mac_views_browser_release_bot': [
       'mac_views_browser', 'release_bot',
     ],
@@ -1515,6 +1526,8 @@
   'mixins': {
     'afl': { 'gn_args': 'use_afl=true' },
 
+    'analysis': { 'gn_args': 'use_clang_static_analyzer=true'},
+
     # We build Android with codecs on most bots to ensure maximum test
     # coverage, but use 'android_without_codecs' on bots responsible for
     # building publicly advertised non-Official Android builds --

diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 8aef59a..18e186e 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml

@@ -2170,6 +2170,15 @@
   </summary>
 </histogram>
 
+<histogram name="Ash.Wallpaper.TimeSpentExtractingColors" units="ms">
+  <owner>bruthig@chromium.org</owner>
+  <owner>tbuckley@chromium.org</owner>
+  <summary>
+    The time taken to extract colors from wallpapers. Recorded each time the
+    wallpaper image changes.
+  </summary>
+</histogram>
+
 <histogram name="Ash.Wallpaper.Type" enum="WallpaperType">
   <owner>kuscher@google.com</owner>
   <summary>The wallpaper type. Recorded at user login.</summary>
@@ -50990,6 +50999,16 @@
   </summary>
 </histogram>
 
+<histogram name="Precache.Fetch.MinWeight" units="thousandths">
+  <owner>twifkak@chromium.org</owner>
+  <summary>
+    The minimum resource weight that is fetched in a given precache run.
+    Reported if the precache completed successfully or was canceled due to the
+    byte cap, but not if it was cancelled due to an ill-formed manifest or
+    exceeding the time limit. Reported only if global_ranking is true.
+  </summary>
+</histogram>
+
 <histogram name="Precache.Fetch.PercentCompleted" units="%">
   <owner>twifkak@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
@@ -74691,6 +74710,21 @@
   </summary>
 </histogram>
 
+<histogram name="WebApk.Install.GooglePlayInstallState"
+    enum="WebApkGooglePlayInstallState">
+  <owner>hanxi@chromium.org</owner>
+  <owner>pkotwicz@chromium.org</owner>
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    On web app and WebAPK installation, records whether a WebAPK could be
+    installed via the Google Play flow. If not, records why the WebAPK could not
+    be installed via the Google Play flow (and a web app was added to the
+    homescreen instead). Warning: This metric is recorded whenever a site is
+    added to the homescreeen as a web app, not just for sites with a WebAPK
+    compatible Web Manifest.
+  </summary>
+</histogram>
+
 <histogram name="WebApk.Install.InfoBarShown" enum="WebApkInstallInfoBarShown">
   <owner>hanxi@chromium.org</owner>
   <owner>pkotwicz@chromium.org</owner>
@@ -94586,6 +94620,8 @@
   <int value="-2005270485" label="DXGI_ERROR_ACCESS_DENIED"/>
   <int value="-2005270484" label="DXGI_ERROR_NAME_ALREADY_EXISTS"/>
   <int value="-2005270483" label="DXGI_ERROR_SDK_COMPONENT_MISSING"/>
+  <int value="-2004287480" label="AUDCLNT_E_UNSUPPORTED_FORMAT"/>
+  <int value="-2004287478" label="AUDCLNT_E_DEVICE_IN_USE"/>
   <int value="-1606219753" label="GOOPDATE_E_NON_BLOCKING_CALL_PENDING"/>
   <int value="-1606219747" label="GOOPDATE_E_APP_USING_EXTERNAL_UPDATER"/>
 </enum>
@@ -97483,6 +97519,7 @@
   <int value="-1654344175" label="disable-extension-info-dialog"/>
   <int value="-1649778035" label="disable-clear-browsing-data-counters"/>
   <int value="-1648216169" label="NewOmniboxAnswerTypes:disabled"/>
+  <int value="-1634154256" label="ZeroSuggestRedirectToChrome:enabled"/>
   <int value="-1631329950" label="ssl-version-max"/>
   <int value="-1630419335" label="enable-download-notification"/>
   <int value="-1624854957" label="enable-es3-apis"/>
@@ -97586,6 +97623,7 @@
   <int value="-1203955801" label="enable-password-change-support:disabled"/>
   <int value="-1203742042" label="enable-gesture-selection"/>
   <int value="-1201183153" label="enable-centered-app-list"/>
+  <int value="-1197035323" label="ZeroSuggestRedirectToChrome:disabled"/>
   <int value="-1184904651" label="enable-npapi"/>
   <int value="-1184480269" label="LsdPermissionPrompt:enabled"/>
   <int value="-1177802205" label="enable-hosted-app-quit-notification"/>
@@ -97850,6 +97888,7 @@
   <int value="-45074716" label="SystemDownloadManager:disabled"/>
   <int value="-23090520" label="disable-search-button-in-omnibox"/>
   <int value="-22544408" label="enable-video-player-chromecast-support"/>
+  <int value="-16824589" label="ash-shelf-color"/>
   <int value="-13918890" label="disable-download-notification"/>
   <int value="-11260186" label="enable-offline-pages-as-saved-pages"/>
   <int value="-5052940" label="enable-simplified-fullscreen"/>
@@ -111285,6 +111324,14 @@
   <int value="4" label="Session, Warmup"/>
 </enum>
 
+<enum name="WebApkGooglePlayInstallState" type="int">
+  <int value="0" label="Play installation supported."/>
+  <int value="1" label="Play installation disabled for other reason."/>
+  <int value="2" label="Google Play Services unavailable."/>
+  <int value="3" label="Play installation disabled by variations."/>
+  <int value="4" label="Play installation disabled by Play."/>
+</enum>
+
 <enum name="WebApkInstallEvent" type="int">
   <int value="0" label="Infobar is ignored"/>
   <int value="1" label="Infobar is dismissed before installation"/>

diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
index 3c66450..3c0fcc33 100644
--- a/tools/perf/benchmarks/system_health.py
+++ b/tools/perf/benchmarks/system_health.py

@@ -44,7 +44,10 @@
         'powerMetric',
         'tracingMetric'
     ])
+    # TODO(ulan): Remove dependency on page_cycler_v2.
     page_cycler_v2.AugmentOptionsForLoadingMetrics(options)
+    # The EQT metric depends on the same categories as the loading metric.
+    options.AddTimelineBasedMetric('expectedQueueingTimeMetric')
     return options
 
   def CreateStorySet(self, options):

diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index 4a8622b3..87949d75 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn

@@ -17,6 +17,8 @@
   sources = [
     "ax_action_data.cc",
     "ax_action_data.h",
+    "ax_host_delegate.cc",
+    "ax_host_delegate.h",
     "ax_node.cc",
     "ax_node.h",
     "ax_node_data.cc",

diff --git a/ui/accessibility/ax_host_delegate.cc b/ui/accessibility/ax_host_delegate.cc
new file mode 100644
index 0000000..a7ecd1b
--- /dev/null
+++ b/ui/accessibility/ax_host_delegate.cc

@@ -0,0 +1,22 @@
+// Copyright 2017 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 "ui/accessibility/ax_host_delegate.h"
+
+#include "ui/accessibility/ax_tree_id_registry.h"
+
+namespace ui {
+
+AXHostDelegate::AXHostDelegate()
+    : tree_id_(AXTreeIDRegistry::GetInstance()->GetOrCreateAXTreeID(this)) {}
+
+AXHostDelegate::AXHostDelegate(int32_t tree_id) : tree_id_(tree_id) {
+  AXTreeIDRegistry::GetInstance()->SetDelegateForID(this, tree_id);
+}
+
+AXHostDelegate::~AXHostDelegate() {
+  AXTreeIDRegistry::GetInstance()->RemoveAXTreeID(tree_id_);
+}
+
+}  // namespace ui

diff --git a/ui/accessibility/ax_host_delegate.h b/ui/accessibility/ax_host_delegate.h
new file mode 100644
index 0000000..bc5091d9
--- /dev/null
+++ b/ui/accessibility/ax_host_delegate.h

@@ -0,0 +1,46 @@
+// Copyright 2017 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 UI_ACCESSIBILITY_AX_HOST_DELEGATE_H_
+#define UI_ACCESSIBILITY_AX_HOST_DELEGATE_H_
+
+#include "ui/accessibility/ax_action_data.h"
+
+namespace ui {
+
+// Classes that host an accessibility tree in the browser process that also wish
+// to become visible to accessibility clients (e.g. for relaying targets to
+// source accessibility trees), can subclass this delegate.
+//
+// Subclasses can use |tree_id| when annotating their |AXNodeData| for clients
+// to respond with the appropriate target node id.
+class AX_EXPORT AXHostDelegate {
+ public:
+  virtual ~AXHostDelegate();
+
+  // Handle an action from an accessibility client.
+  virtual void PerformAction(const ui::AXActionData& data) = 0;
+
+ protected:
+  // A delegate with an automatically assigned tree id.
+  AXHostDelegate();
+
+  // A delegate with an explicit tree id. The caller is responsible for ensuring
+  // the uniqueness of the id.
+  explicit AXHostDelegate(int32_t tree_id);
+
+  // A tree id appropriate for annotating events sent to an accessibility
+  // client.
+  int32_t tree_id() { return tree_id_; }
+
+ private:
+  // Register or unregister this class with |AXTreeIDRegistry|.
+  void UpdateActiveState(bool active);
+
+  int32_t tree_id_;
+};
+
+}  // namespace ui
+
+#endif  // UI_ACCESSIBILITY_AX_HOST_DELEGATE_H_

diff --git a/ui/accessibility/ax_tree_id_registry.cc b/ui/accessibility/ax_tree_id_registry.cc
index 35e5d2ad..d880b79 100644
--- a/ui/accessibility/ax_tree_id_registry.cc
+++ b/ui/accessibility/ax_tree_id_registry.cc

@@ -5,6 +5,7 @@
 #include "ui/accessibility/ax_tree_id_registry.h"
 
 #include "base/memory/singleton.h"
+#include "ui/accessibility/ax_host_delegate.h"
 
 namespace ui {
 
@@ -20,8 +21,7 @@
     int process_id,
     int routing_id) {
   FrameID frame_id(process_id, routing_id);
-  std::map<FrameID, AXTreeID>::iterator it;
-  it = frame_to_ax_tree_id_map_.find(frame_id);
+  auto it = frame_to_ax_tree_id_map_.find(frame_id);
   if (it != frame_to_ax_tree_id_map_.end())
     return it->second;
 
@@ -32,27 +32,49 @@
   return new_id;
 }
 
-int AXTreeIDRegistry::CreateID() {
-  return ++ax_tree_id_counter_;
-}
-
 AXTreeIDRegistry::FrameID AXTreeIDRegistry::GetFrameID(
     AXTreeIDRegistry::AXTreeID ax_tree_id) {
-  std::map<AXTreeID, FrameID>::iterator it;
-  it = ax_tree_to_frame_id_map_.find(ax_tree_id);
+  auto it = ax_tree_to_frame_id_map_.find(ax_tree_id);
   if (it != ax_tree_to_frame_id_map_.end())
     return it->second;
 
   return FrameID(-1, -1);
 }
 
-void AXTreeIDRegistry::RemoveAXTreeID(AXTreeIDRegistry::AXTreeID ax_tree_id) {
-  std::map<AXTreeID, FrameID>::iterator it;
-  it = ax_tree_to_frame_id_map_.find(ax_tree_id);
-  if (it != ax_tree_to_frame_id_map_.end()) {
-    frame_to_ax_tree_id_map_.erase(it->second);
-    ax_tree_to_frame_id_map_.erase(it);
+AXTreeIDRegistry::AXTreeID AXTreeIDRegistry::GetOrCreateAXTreeID(
+    AXHostDelegate* delegate) {
+  for (auto it : id_to_host_delegate_) {
+    if (it.second == delegate)
+      return it.first;
   }
+  id_to_host_delegate_[++ax_tree_id_counter_] = delegate;
+  return ax_tree_id_counter_;
+}
+
+AXHostDelegate* AXTreeIDRegistry::GetHostDelegate(
+    AXTreeIDRegistry::AXTreeID ax_tree_id) {
+  auto it = id_to_host_delegate_.find(ax_tree_id);
+  if (it == id_to_host_delegate_.end())
+    return nullptr;
+  return it->second;
+}
+
+void AXTreeIDRegistry::SetDelegateForID(AXHostDelegate* delegate,
+                                        AXTreeIDRegistry::AXTreeID id) {
+  id_to_host_delegate_[id] = delegate;
+}
+
+void AXTreeIDRegistry::RemoveAXTreeID(AXTreeIDRegistry::AXTreeID ax_tree_id) {
+  auto frame_it = ax_tree_to_frame_id_map_.find(ax_tree_id);
+  if (frame_it != ax_tree_to_frame_id_map_.end()) {
+    frame_to_ax_tree_id_map_.erase(frame_it->second);
+    ax_tree_to_frame_id_map_.erase(frame_it);
+    return;
+  }
+
+  auto action_it = id_to_host_delegate_.find(ax_tree_id);
+  if (action_it != id_to_host_delegate_.end())
+    id_to_host_delegate_.erase(action_it);
 }
 
 AXTreeIDRegistry::AXTreeIDRegistry() : ax_tree_id_counter_(-1) {

diff --git a/ui/accessibility/ax_tree_id_registry.h b/ui/accessibility/ax_tree_id_registry.h
index 7c16405..d983ecd 100644
--- a/ui/accessibility/ax_tree_id_registry.h
+++ b/ui/accessibility/ax_tree_id_registry.h

@@ -18,7 +18,16 @@
 
 namespace ui {
 
-// A class which generates a unique id.
+class AXHostDelegate;
+
+// This class generates and saves a runtime id for an accessibility tree.
+// It provides a few distinct forms of generating an id:
+//     - from a frame id (which consists of a process and routing id)
+//     - from a backing |AXHostDelegate| object
+//
+// The first form allows underlying instances to change but refer to the same
+// frame.
+// The second form allows this registry to track the object for later retrieval.
 class AX_EXPORT AXTreeIDRegistry {
  public:
   using FrameID = std::pair<int, int>;
@@ -30,17 +39,22 @@
   // Get the single instance of this class.
   static AXTreeIDRegistry* GetInstance();
 
-  // Obtains a unique id given a |process_id| and |routing_id|. Placeholder
-  // for full implementation once out of process iframe accessibility finalizes.
+  // Methods for FrameID ax tree id generation, and retrieval.
   AXTreeID GetOrCreateAXTreeID(int process_id, int routing_id);
   FrameID GetFrameID(AXTreeID ax_tree_id);
-  void RemoveAXTreeID(AXTreeID ax_tree_id);
 
-  // Create an id not associated with any process.
-  int CreateID();
+  // Retrieve an |AXHostDelegate|.
+  AXHostDelegate* GetHostDelegate(AXTreeID ax_tree_id);
+
+  void RemoveAXTreeID(AXTreeID ax_tree_id);
 
  private:
   friend struct base::DefaultSingletonTraits<AXTreeIDRegistry>;
+  friend AXHostDelegate;
+
+  // Methods for AXHostDelegate ax tree id generation.
+  AXTreeID GetOrCreateAXTreeID(AXHostDelegate* delegate);
+  void SetDelegateForID(AXHostDelegate* delegate, AXTreeID id);
 
   AXTreeIDRegistry();
   virtual ~AXTreeIDRegistry();
@@ -54,6 +68,9 @@
   // Maps frames to an accessibility tree via ids.
   std::map<FrameID, AXTreeID> frame_to_ax_tree_id_map_;
 
+  // Maps an id to its host delegate.
+  std::map<AXTreeID, AXHostDelegate*> id_to_host_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(AXTreeIDRegistry);
 };
 

diff --git a/ui/android/OWNERS b/ui/android/OWNERS
index 33541c8..e59d378f 100644
--- a/ui/android/OWNERS
+++ b/ui/android/OWNERS

@@ -8,3 +8,5 @@
 
 # for display/window/view_android
 boliu@chromium.org
+
+# COMPONENT: UI

diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc
index 8761d99..4dd6704 100644
--- a/ui/app_list/views/app_list_item_view.cc
+++ b/ui/app_list/views/app_list_item_view.cc

@@ -87,7 +87,7 @@
   shadow_animator_.animation()->SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
   shadow_animator_.SetStartAndEndShadows(IconStartShadows(), IconEndShadows());
 
-  icon_->set_interactive(false);
+  icon_->set_can_process_events_within_subtree(false);
   icon_->SetVerticalAlignment(views::ImageView::LEADING);
 
   title_->SetBackgroundColor(0);

diff --git a/ui/app_list/views/search_result_view.cc b/ui/app_list/views/search_result_view.cc
index 09c5768..9e5f983a 100644
--- a/ui/app_list/views/search_result_view.cc
+++ b/ui/app_list/views/search_result_view.cc

@@ -81,8 +81,8 @@
       badge_icon_(new views::ImageView),
       actions_view_(new SearchResultActionsView(this)),
       progress_bar_(new views::ProgressBar) {
-  icon_->set_interactive(false);
-  badge_icon_->set_interactive(false);
+  icon_->set_can_process_events_within_subtree(false);
+  badge_icon_->set_can_process_events_within_subtree(false);
 
   AddChildView(icon_);
   AddChildView(badge_icon_);

diff --git a/ui/app_list/views/tile_item_view.cc b/ui/app_list/views/tile_item_view.cc
index 8cdb79a..0d2b7ce 100644
--- a/ui/app_list/views/tile_item_view.cc
+++ b/ui/app_list/views/tile_item_view.cc

@@ -28,7 +28,7 @@
       title_(new views::Label),
       selected_(false) {
   // Prevent the icon view from interfering with our mouse events.
-  icon_->set_interactive(false);
+  icon_->set_can_process_events_within_subtree(false);
   icon_->SetVerticalAlignment(views::ImageView::LEADING);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

diff --git a/ui/aura/mus/property_converter.cc b/ui/aura/mus/property_converter.cc
index 9787d57..b40df0b 100644
--- a/ui/aura/mus/property_converter.cc
+++ b/ui/aura/mus/property_converter.cc

@@ -27,27 +27,67 @@
       mojo::ConvertTo<std::vector<uint8_t>>(*value));
 }
 
+// A validator that always returns true regardless of its input.
+bool AlwaysTrue(int64_t value) {
+  return true;
+}
+
+bool ValidateResizeBehaviour(int64_t value) {
+  // Resize behaviour is a 3 bitfield.
+  return value >= 0 &&
+         value <= (ui::mojom::kResizeBehaviorCanMaximize |
+                   ui::mojom::kResizeBehaviorCanMinimize |
+                   ui::mojom::kResizeBehaviorCanResize);
+}
+
+bool ValidateShowState(int64_t value) {
+  return value == int64_t(ui::mojom::ShowState::DEFAULT) ||
+         value == int64_t(ui::mojom::ShowState::NORMAL) ||
+         value == int64_t(ui::mojom::ShowState::MINIMIZED) ||
+         value == int64_t(ui::mojom::ShowState::MAXIMIZED) ||
+         value == int64_t(ui::mojom::ShowState::INACTIVE) ||
+         value == int64_t(ui::mojom::ShowState::FULLSCREEN) ||
+         value == int64_t(ui::mojom::ShowState::DOCKED);
+}
+
 }  // namespace
 
+PropertyConverter::PrimitiveProperty::PrimitiveProperty() {}
+
+PropertyConverter::PrimitiveProperty::PrimitiveProperty(
+    const PrimitiveProperty& property) = default;
+
+PropertyConverter::PrimitiveProperty::~PrimitiveProperty() {}
+
+// static
+base::RepeatingCallback<bool(int64_t)>
+PropertyConverter::CreateAcceptAnyValueCallback() {
+  return base::Bind(&AlwaysTrue);
+}
+
 PropertyConverter::PropertyConverter() {
   // Add known aura properties with associated mus properties.
   RegisterProperty(client::kAlwaysOnTopKey,
-                   ui::mojom::WindowManager::kAlwaysOnTop_Property);
+                   ui::mojom::WindowManager::kAlwaysOnTop_Property,
+                   CreateAcceptAnyValueCallback());
   RegisterProperty(client::kAppIconKey,
                    ui::mojom::WindowManager::kAppIcon_Property);
   RegisterProperty(client::kAppIdKey,
                    ui::mojom::WindowManager::kAppID_Property);
   RegisterProperty(client::kImmersiveFullscreenKey,
-                   ui::mojom::WindowManager::kImmersiveFullscreen_Property);
+                   ui::mojom::WindowManager::kImmersiveFullscreen_Property,
+                   CreateAcceptAnyValueCallback());
   RegisterProperty(client::kNameKey, ui::mojom::WindowManager::kName_Property);
   RegisterProperty(client::kPreferredSize,
                    ui::mojom::WindowManager::kPreferredSize_Property);
   RegisterProperty(client::kResizeBehaviorKey,
-                   ui::mojom::WindowManager::kResizeBehavior_Property);
+                   ui::mojom::WindowManager::kResizeBehavior_Property,
+                   base::Bind(&ValidateResizeBehaviour));
   RegisterProperty(client::kRestoreBoundsKey,
                    ui::mojom::WindowManager::kRestoreBounds_Property);
   RegisterProperty(client::kShowStateKey,
-                   ui::mojom::WindowManager::kShowState_Property);
+                   ui::mojom::WindowManager::kShowState_Property,
+                   base::Bind(&ValidateShowState));
   RegisterProperty(client::kWindowIconKey,
                    ui::mojom::WindowManager::kWindowIcon_Property);
   RegisterProperty(client::kTitleKey,
@@ -158,6 +198,11 @@
         return;
       }
       const PrimitiveType value = mojo::ConvertTo<PrimitiveType>(*data);
+      if (!primitive_property.second.validator.Run(value)) {
+        DVLOG(2) << "Property value rejected (PrimitiveType): "
+                 << transport_name;
+        return;
+      }
       // TODO(msw): Should aura::Window just store all properties by name?
       window->SetPropertyInternal(
           primitive_property.first, primitive_property.second.property_name,
@@ -233,7 +278,13 @@
   }
   for (const auto& primitive_property : primitive_properties_) {
     if (primitive_property.second.transport_name == transport_name) {
-      *value = mojo::ConvertTo<PrimitiveType>(transport_data);
+      PrimitiveType v = mojo::ConvertTo<PrimitiveType>(transport_data);
+      if (!primitive_property.second.validator.Run(v)) {
+        DVLOG(2) << "Property value rejected (PrimitiveType): "
+                 << transport_name;
+        return false;
+      }
+      *value = v;
       return true;
     }
   }

diff --git a/ui/aura/mus/property_converter.h b/ui/aura/mus/property_converter.h
index dbe1085..b523a9a5d7 100644
--- a/ui/aura/mus/property_converter.h
+++ b/ui/aura/mus/property_converter.h

@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 
+#include "base/callback_forward.h"
 #include "base/macros.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/window.h"
@@ -36,6 +37,10 @@
   PropertyConverter();
   ~PropertyConverter();
 
+  // Creates a validation callback for use in RegisterProperty() which will
+  // accept any value.
+  static base::RepeatingCallback<bool(int64_t)> CreateAcceptAnyValueCallback();
+
   // Returns true if RegisterProperty() has been called with the specified
   // transport name.
   bool IsTransportNameRegistered(const std::string& name) const;
@@ -71,14 +76,19 @@
       PrimitiveType* value);
 
   // Register a property to support conversion between mus and aura.
-  template<typename T>
-  void RegisterProperty(const WindowProperty<T>* property,
-                        const char* transport_name) {
+  // |validator| is a callback used to validate incoming values from
+  // transport_data; if it returns false, the value is rejected.
+  template <typename T>
+  void RegisterProperty(
+      const WindowProperty<T>* property,
+      const char* transport_name,
+      const base::RepeatingCallback<bool(int64_t)>& validator) {
     PrimitiveProperty primitive_property;
     primitive_property.property_name = property->name;
     primitive_property.transport_name = transport_name;
     primitive_property.default_value =
         ui::ClassPropertyCaster<T>::ToInt64(property->default_value);
+    primitive_property.validator = validator;
     primitive_properties_[property] = primitive_property;
     transport_names_.insert(transport_name);
   }
@@ -97,13 +107,19 @@
 
  private:
   // Contains data needed to store and convert primitive-type properties.
-  struct PrimitiveProperty {
+  struct AURA_EXPORT PrimitiveProperty {
+    PrimitiveProperty();
+    PrimitiveProperty(const PrimitiveProperty& property);
+    ~PrimitiveProperty();
+
     // The aura::WindowProperty::name used for storage.
     const char* property_name = nullptr;
     // The mus property name used for transport.
     const char* transport_name = nullptr;
     // The aura::WindowProperty::default_value stored using PrimitiveType.
     PrimitiveType default_value = 0;
+    // A callback used to validate incoming values.
+    base::RepeatingCallback<bool(int64_t)> validator;
   };
 
   // A map of aura::WindowProperty<T> to PrimitiveProperty structs.

diff --git a/ui/aura/mus/property_converter_unittest.cc b/ui/aura/mus/property_converter_unittest.cc
index e39c827..c5c28ed 100644
--- a/ui/aura/mus/property_converter_unittest.cc
+++ b/ui/aura/mus/property_converter_unittest.cc

@@ -77,7 +77,8 @@
                            const char* transport_name,
                            T value_1,
                            T value_2) {
-  property_converter->RegisterProperty(key, transport_name);
+  property_converter->RegisterProperty(
+      key, transport_name, PropertyConverter::CreateAcceptAnyValueCallback());
   EXPECT_EQ(transport_name,
             property_converter->GetTransportNameForPropertyKey(key));
   EXPECT_TRUE(property_converter->IsTransportNameRegistered(transport_name));
@@ -112,6 +113,10 @@
   EXPECT_EQ(value_2, static_cast<T>(decoded_value_2));
 }
 
+bool OnlyAllowNegativeNumbers(int64_t number) {
+  return number < 0;
+}
+
 }  // namespace
 
 using PropertyConverterTest = test::AuraTestBase;
@@ -165,6 +170,30 @@
                         kTestPropertyServerKey9, value_9a, value_9b);
 }
 
+TEST_F(PropertyConverterTest, TestPrimitiveVerifier) {
+  std::unique_ptr<Window> window(CreateNormalWindow(1, root_window(), nullptr));
+
+  PropertyConverter property_converter;
+  property_converter.RegisterProperty(kTestPropertyKey8,
+                                      kTestPropertyServerKey8,
+                                      base::Bind(&OnlyAllowNegativeNumbers));
+
+  // Test that we reject invalid TransportValues during
+  // GetPropertyValueFromTransportValue().
+  int64_t int_value = 5;
+  std::vector<uint8_t> transport =
+      mojo::ConvertTo<std::vector<uint8_t>>(int_value);
+  EXPECT_FALSE(property_converter.GetPropertyValueFromTransportValue(
+      kTestPropertyServerKey8, transport, &int_value));
+
+  // Test that we reject invalid TransportValues during
+  // SetPropertyFromTransportValue().
+  EXPECT_EQ(-1, window->GetProperty(kTestPropertyKey8));
+  property_converter.SetPropertyFromTransportValue(
+      window.get(), kTestPropertyServerKey8, &transport);
+  EXPECT_EQ(-1, window->GetProperty(kTestPropertyKey8));
+}
+
 // Verifies property setting behavior for a gfx::ImageSkia* property.
 TEST_F(PropertyConverterTest, ImageSkiaProperty) {
   PropertyConverter property_converter;

diff --git a/ui/aura/mus/window_tree_client_unittest.cc b/ui/aura/mus/window_tree_client_unittest.cc
index 76dcf10..86c9d4ce 100644
--- a/ui/aura/mus/window_tree_client_unittest.cc
+++ b/ui/aura/mus/window_tree_client_unittest.cc

@@ -73,9 +73,15 @@
 
 // Register some test window properties for aura/mus conversion.
 void RegisterTestProperties(PropertyConverter* converter) {
-  converter->RegisterProperty(kTestPropertyKey1, kTestPropertyServerKey1);
-  converter->RegisterProperty(kTestPropertyKey2, kTestPropertyServerKey2);
-  converter->RegisterProperty(kTestPropertyKey3, kTestPropertyServerKey3);
+  converter->RegisterProperty(
+      kTestPropertyKey1, kTestPropertyServerKey1,
+      PropertyConverter::CreateAcceptAnyValueCallback());
+  converter->RegisterProperty(
+      kTestPropertyKey2, kTestPropertyServerKey2,
+      PropertyConverter::CreateAcceptAnyValueCallback());
+  converter->RegisterProperty(
+      kTestPropertyKey3, kTestPropertyServerKey3,
+      PropertyConverter::CreateAcceptAnyValueCallback());
 }
 
 // Convert a primitive aura property value to a mus transport value.

diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc
index ae808387..894f5c1 100644
--- a/ui/base/ui_base_switches.cc
+++ b/ui/base/ui_base_switches.cc

@@ -79,4 +79,7 @@
 // throughout Chrome (not just top Chrome).
 const char kExtendMdToSecondaryUi[] = "secondary-ui-md";
 
+// Use an fp16 scRGB swap chain compatible with HDR output.
+const char kEnableHDROutput[] = "enable-hdr-output";
+
 }  // namespace switches

diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h
index eb581ac..2b54818 100644
--- a/ui/base/ui_base_switches.h
+++ b/ui/base/ui_base_switches.h

@@ -40,6 +40,7 @@
 UI_BASE_EXPORT extern const char kTopChromeMDNonMaterial[];
 UI_BASE_EXPORT extern const char kUseNewVirtualKeyboardBehavior[];
 UI_BASE_EXPORT extern const char kExtendMdToSecondaryUi[];
+UI_BASE_EXPORT extern const char kEnableHDROutput[];
 
 }  // namespace switches
 

diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
index 3f3cba3..a3c781b 100644
--- a/ui/compositor/BUILD.gn
+++ b/ui/compositor/BUILD.gn

@@ -85,6 +85,7 @@
     "//cc/surfaces:surfaces",
     "//gpu/command_buffer/common",
     "//skia",
+    "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",

diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS
index 7070d85..65c25f7 100644
--- a/ui/compositor/DEPS
+++ b/ui/compositor/DEPS

@@ -6,6 +6,7 @@
   "+skia/ext/refptr.h",
   "+third_party/khronos/GLES2/gl2.h",
   "+third_party/skia",
+  "+ui/base",
   "+ui/gfx",
   "+ui/gl",
 ]

diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 333be43..7b49226 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc

@@ -33,6 +33,7 @@
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/compositor_vsync_manager.h"
@@ -162,7 +163,8 @@
 
   settings.enable_color_correct_rendering =
       command_line->HasSwitch(cc::switches::kEnableColorCorrectRendering) ||
-      command_line->HasSwitch(cc::switches::kEnableTrueColorRendering);
+      command_line->HasSwitch(cc::switches::kEnableTrueColorRendering) ||
+      command_line->HasSwitch(switches::kEnableHDROutput);
   settings.renderer_settings.enable_color_correct_rendering =
       settings.enable_color_correct_rendering;
 
@@ -352,8 +354,14 @@
 }
 
 void Compositor::SetDisplayColorSpace(const gfx::ColorSpace& color_space) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableHDROutput)) {
+    color_space_ = gfx::ColorSpace::CreateSCRGBLinear();
+  } else {
+    color_space_ = color_space;
+  }
+  // TODO(Hubbe): Should maybe be color_space_, but currently that crashes skia.
   host_->SetDeviceColorSpace(color_space);
-  color_space_ = color_space;
   // Color space is reset when the output surface is lost, so this must also be
   // updated then.
   // TODO(fsamuel): Get rid of this.

diff --git a/ui/events/gesture_detection/gesture_event_data_packet.cc b/ui/events/gesture_detection/gesture_event_data_packet.cc
index 9b3af05..fd63932d 100644
--- a/ui/events/gesture_detection/gesture_event_data_packet.cc
+++ b/ui/events/gesture_detection/gesture_event_data_packet.cc

@@ -68,9 +68,8 @@
       touch_location_(other.touch_location_),
       raw_touch_location_(other.raw_touch_location_),
       gesture_source_(other.gesture_source_),
-      ack_state_(AckState::PENDING),
-      unique_touch_event_id_(other.unique_touch_event_id_) {
-}
+      ack_state_(other.ack_state_),
+      unique_touch_event_id_(other.unique_touch_event_id_) {}
 
 GestureEventDataPacket::~GestureEventDataPacket() {
 }

diff --git a/ui/gfx/vector_icons/BUILD.gn b/ui/gfx/vector_icons/BUILD.gn
index 7dad812..190ff1d5 100644
--- a/ui/gfx/vector_icons/BUILD.gn
+++ b/ui/gfx/vector_icons/BUILD.gn

@@ -17,7 +17,6 @@
     "account_child.icon",
     "account_child_circle.icon",
     "account_circle.icon",
-    "apps.icon",
     "blocked_badge.icon",
     "business.icon",
     "check_circle.1x.icon",
@@ -28,10 +27,8 @@
     "default_favicon.icon",
     "eol.icon",
     "extension.icon",
-    "extension_crashed.icon",
     "file_download.icon",
     "fullscreen.icon",
-    "globe.icon",
     "help_outline.icon",
     "image.icon",
     "info_outline.icon",
@@ -46,14 +43,12 @@
     # TODO(estade): this is the same as the one in components/omnibox, but it's
     # referenced from Ash. De-dupe this soon.
     "omnibox_search.icon",
-    "paintbrush.icon",
     "pdf.1x.icon",
     "pdf.icon",
     "photo_camera.icon",
     "protocol_handler.icon",
     "remove_box.icon",
     "remove_circle.icon",
-    "sad_tab.icon",
     "settings.icon",
     "subresource_filter_active.icon",
     "supervisor_account.icon",
@@ -64,9 +59,12 @@
     "warning.icon",
     "warning_badge.icon",
     "web.icon",
-    "${branding_path_component}/product.icon",
   ]
 
+  if (is_mac) {
+    icons += [ "google_search_mac_touchbar.icon" ]
+  }
+
   output_cc = "$target_gen_dir/vector_icons.cc"
   output_h = "$target_gen_dir/vector_icons.h"
 

diff --git a/ui/gfx/vector_icons/google_search_mac_touchbar.icon b/ui/gfx/vector_icons/google_search_mac_touchbar.icon
new file mode 100644
index 0000000..d8ee51b
--- /dev/null
+++ b/ui/gfx/vector_icons/google_search_mac_touchbar.icon

@@ -0,0 +1,49 @@
+// Copyright 2017 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.
+
+CANVAS_DIMENSIONS, 32,
+PATH_COLOR_ARGB, 0xFF, 0x42, 0x85, 0xF4,
+MOVE_TO, 31.9f, 16.36f,
+R_CUBIC_TO, 0, -1.13f, -0.1f, -2.22f, -0.3f, -3.27f,
+H_LINE_TO, 16.27f,
+R_V_LINE_TO, 6.15f,
+R_H_LINE_TO, 8.76f,
+R_CUBIC_TO, -0.38f, 2, -1.53f, 3.7f, -3.25f, 4.83f,
+R_V_LINE_TO, 4,
+R_H_LINE_TO, 5.26f,
+R_CUBIC_TO, 3.08f, -2.77f, 4.85f, -6.87f, 4.85f, -11.75f,
+CLOSE,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0x34, 0xA8, 0x53,
+MOVE_TO, 16.27f, 32,
+R_CUBIC_TO, 4.4f, 0, 8.08f, -1.43f, 10.77f, -3.88f,
+R_LINE_TO, -5.26f, -4,
+R_CUBIC_TO, -1.46f, 0.95f, -3.32f, 1.52f, -5.5f, 1.52f,
+R_CUBIC_TO, -4.25f, 0, -7.83f, -2.82f, -9.1f, -6.6f,
+H_LINE_TO, 1.72f,
+R_V_LINE_TO, 4.15f,
+CUBIC_TO, 4.4f, 28.4f, 9.9f, 32, 16.27f, 32,
+CLOSE,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0xFB, 0xBC, 0x05,
+MOVE_TO, 7.17f, 19.04f,
+R_CUBIC_TO, -0.33f, -0.96f, -0.5f, -2, -0.5f, -3.04f,
+R_CUBIC_TO, 0, -1.05f, 0.17f, -2.08f, 0.5f, -3.04f,
+V_LINE_TO, 8.8f,
+H_LINE_TO, 1.73f,
+CUBIC_TO, 0.63f, 10.98f, 0, 13.43f, 0, 16,
+R_CUBIC_TO, 0, 2.57f, 0.63f, 5.03f, 1.73f, 7.2f,
+R_LINE_TO, 5.44f, -4.16f,
+CLOSE,
+NEW_PATH,
+PATH_COLOR_ARGB, 0xFF, 0xEA, 0x43, 0x35,
+MOVE_TO, 16.27f, 6.36f,
+R_CUBIC_TO, 2.4f, 0, 4.53f, 0.8f, 6.22f, 2.4f,
+R_LINE_TO, 4.63f, -4.6f,
+CUBIC_TO, 24.33f, 1.6f, 20.63f, 0, 16.23f, 0,
+CUBIC_TO, 9.96f, 0, 4.46f, 3.6f, 1.78f, 8.8f,
+R_LINE_TO, 5.43f, 4.16f,
+R_CUBIC_TO, 1.27f, -3.78f, 4.85f, -6.6f, 9.1f, -6.6f,
+CLOSE,
+END

diff --git a/ui/gl/init/gl_factory.h b/ui/gl/init/gl_factory.h
index c3908fa..52dcbe1 100644
--- a/ui/gl/init/gl_factory.h
+++ b/ui/gl/init/gl_factory.h

@@ -5,6 +5,7 @@
 #ifndef UI_GL_INIT_GL_FACTORY_H_
 #define UI_GL_INIT_GL_FACTORY_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ -15,6 +16,10 @@
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/init/gl_init_export.h"
 
+namespace gfx {
+class VSyncProvider;
+}  // namespace gfx
+
 namespace gl {
 
 class GLContext;
@@ -59,6 +64,13 @@
 GL_INIT_EXPORT scoped_refptr<GLSurface> CreateViewGLSurface(
     gfx::AcceleratedWidget window);
 
+#if defined(OS_WIN)
+// Creates a GL surface that renders directly into a native window.
+GL_INIT_EXPORT scoped_refptr<GLSurface> CreateNativeViewGLSurfaceEGL(
+    gfx::AcceleratedWidget window,
+    std::unique_ptr<gfx::VSyncProvider> sync_provider);
+#endif
+
 #if defined(USE_OZONE)
 // Creates a GL surface that renders directly into a window with surfaceless
 // semantics - there is no default framebuffer and the primary surface must

diff --git a/ui/gl/init/gl_factory_win.cc b/ui/gl/init/gl_factory_win.cc
index da07adc..198147d 100644
--- a/ui/gl/init/gl_factory_win.cc
+++ b/ui/gl/init/gl_factory_win.cc

@@ -82,15 +82,9 @@
       return InitializeGLSurface(new GLSurfaceOSMesaWin(window));
     case kGLImplementationSwiftShaderGL:
     case kGLImplementationEGLGLES2: {
-      DCHECK(window != gfx::kNullAcceleratedWidget);
-      scoped_refptr<NativeViewGLSurfaceEGL> surface(
-          new NativeViewGLSurfaceEGL(window));
-      std::unique_ptr<gfx::VSyncProvider> sync_provider;
-      sync_provider.reset(new VSyncProviderWin(window));
-      if (!surface->Initialize(std::move(sync_provider)))
-        return nullptr;
-
-      return surface;
+      std::unique_ptr<gfx::VSyncProvider> sync_provider(
+          new VSyncProviderWin(window));
+      return CreateNativeViewGLSurfaceEGL(window, std::move(sync_provider));
     }
     case kGLImplementationDesktopGL:
       return InitializeGLSurface(new NativeViewGLSurfaceWGL(window));
@@ -103,6 +97,21 @@
   }
 }
 
+scoped_refptr<GLSurface> CreateNativeViewGLSurfaceEGL(
+    gfx::AcceleratedWidget window,
+    std::unique_ptr<gfx::VSyncProvider> sync_provider) {
+  DCHECK_EQ(kGLImplementationEGLGLES2, GetGLImplementation());
+  DCHECK(window != gfx::kNullAcceleratedWidget);
+
+  scoped_refptr<NativeViewGLSurfaceEGL> surface(
+      new NativeViewGLSurfaceEGL(window));
+
+  if (!surface->Initialize(std::move(sync_provider)))
+    return nullptr;
+
+  return surface;
+}
+
 scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
     const gfx::Size& size, GLSurfaceFormat format) {
   TRACE_EVENT0("gpu", "gl::init::CreateOffscreenGLSurface");

diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index e1db2cc3..bac99ec8 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc

@@ -276,20 +276,9 @@
                                          extra.menu_item);
       return;
     default:
-      break;
+      PaintIndirect(canvas, part, state, rect, extra);
+      return;
   }
-
-  HDC surface = skia::GetNativeDrawingContext(canvas);
-
-  // When drawing the task manager or the bookmark editor, we draw into an
-  // offscreen buffer, where we can use OS-specific drawing routines for
-  // UI features like scrollbars. However, we need to set up that buffer,
-  // and then read it back when it's done and blit it onto the screen.
-
-  if (surface)
-    PaintDirect(canvas, surface, part, state, rect, extra);
-  else
-    PaintIndirect(canvas, part, state, rect, extra);
 }
 
 NativeThemeWin::NativeThemeWin()
@@ -677,9 +666,12 @@
                                    const gfx::Rect& rect,
                                    const ExtraParams& extra) const {
   // TODO(asvitkine): This path is pretty inefficient - for each paint operation
-  //                  it creates a new offscreen bitmap Skia canvas. This can
-  //                  be sped up by doing it only once per part/state and
-  //                  keeping a cache of the resulting bitmaps.
+  // it creates a new offscreen bitmap Skia canvas. This can be sped up by doing
+  // it only once per part/state and keeping a cache of the resulting bitmaps.
+  //
+  // TODO(enne): This could also potentially be sped up for software raster
+  // by moving these draw ops into PaintRecord itself and then moving the
+  // PaintDirect code to be part of the raster for PaintRecord.
 
   // If this process doesn't have access to GDI, we'd need to use shared memory
   // segment instead but that is not supported right now.

diff --git a/ui/ozone/demo/ozone_demo.cc b/ui/ozone/demo/ozone_demo.cc
index 109aa53e..a501fe79 100644
--- a/ui/ozone/demo/ozone_demo.cc
+++ b/ui/ozone/demo/ozone_demo.cc

@@ -292,7 +292,7 @@
   windows_.clear();
 
   gfx::Point origin;
-  for (auto display : displays) {
+  for (auto* display : displays) {
     if (!display->native_mode()) {
       LOG(ERROR) << "Display " << display->display_id()
                  << " doesn't have a native mode";

diff --git a/ui/ozone/platform/wayland/fake_server.cc b/ui/ozone/platform/wayland/fake_server.cc
index 916e7c2d..ecfda322 100644
--- a/ui/ozone/platform/wayland/fake_server.cc
+++ b/ui/ozone/platform/wayland/fake_server.cc

@@ -29,7 +29,7 @@
 // wl_compositor
 
 void CreateSurface(wl_client* client, wl_resource* resource, uint32_t id) {
-  auto compositor =
+  auto* compositor =
       static_cast<MockCompositor*>(wl_resource_get_user_data(resource));
   wl_resource* surface_resource = wl_resource_create(
       client, &wl_surface_interface, wl_resource_get_version(resource), id);
@@ -96,7 +96,7 @@
                    wl_resource* resource,
                    uint32_t id,
                    wl_resource* surface_resource) {
-  auto surface =
+  auto* surface =
       static_cast<MockSurface*>(wl_resource_get_user_data(surface_resource));
   if (surface->xdg_surface) {
     wl_resource_post_error(resource, XDG_SHELL_ERROR_ROLE,
@@ -127,7 +127,7 @@
 // wl_seat
 
 void GetPointer(wl_client* client, wl_resource* resource, uint32_t id) {
-  auto seat = static_cast<MockSeat*>(wl_resource_get_user_data(resource));
+  auto* seat = static_cast<MockSeat*>(wl_resource_get_user_data(resource));
   wl_resource* pointer_resource = wl_resource_create(
       client, &wl_pointer_interface, wl_resource_get_version(resource), id);
   if (!pointer_resource) {
@@ -138,7 +138,7 @@
 }
 
 void GetKeyboard(wl_client* client, wl_resource* resource, uint32_t id) {
-  auto seat = static_cast<MockSeat*>(wl_resource_get_user_data(resource));
+  auto* seat = static_cast<MockSeat*>(wl_resource_get_user_data(resource));
   wl_resource* keyboard_resource = wl_resource_create(
       client, &wl_keyboard_interface, wl_resource_get_version(resource), id);
   if (!keyboard_resource) {
@@ -228,7 +228,7 @@
 
 // static
 void ServerObject::OnResourceDestroyed(wl_resource* resource) {
-  auto obj = static_cast<ServerObject*>(wl_resource_get_user_data(resource));
+  auto* obj = static_cast<ServerObject*>(wl_resource_get_user_data(resource));
   obj->resource_ = nullptr;
 }
 
@@ -292,7 +292,7 @@
                   void* data,
                   uint32_t version,
                   uint32_t id) {
-  auto global = static_cast<Global*>(data);
+  auto* global = static_cast<Global*>(data);
   wl_resource* resource = wl_resource_create(
       client, global->interface_, std::min(version, global->version_), id);
   if (!resource) {
@@ -308,7 +308,7 @@
 
 // static
 void Global::OnResourceDestroyed(wl_resource* resource) {
-  auto global = static_cast<Global*>(wl_resource_get_user_data(resource));
+  auto* global = static_cast<Global*>(wl_resource_get_user_data(resource));
   if (global->resource_ == resource)
     global->resource_ = nullptr;
 }

diff --git a/ui/ozone/platform/wayland/wayland_keyboard_unittest.cc b/ui/ozone/platform/wayland/wayland_keyboard_unittest.cc
index 9975b79..7738ec4 100644
--- a/ui/ozone/platform/wayland/wayland_keyboard_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_keyboard_unittest.cc

@@ -61,7 +61,7 @@
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsKeyEvent());
 
-  auto key_event = event->AsKeyEvent();
+  auto* key_event = event->AsKeyEvent();
   EXPECT_EQ(ui::VKEY_A, key_event->key_code());
   EXPECT_EQ(ET_KEY_PRESSED, key_event->type());
 

diff --git a/ui/ozone/platform/wayland/wayland_pointer_unittest.cc b/ui/ozone/platform/wayland/wayland_pointer_unittest.cc
index 309221d..8b5b0b04 100644
--- a/ui/ozone/platform/wayland/wayland_pointer_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_pointer_unittest.cc

@@ -86,7 +86,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseEvent());
-  auto mouse_event = event->AsMouseEvent();
+  auto* mouse_event = event->AsMouseEvent();
   EXPECT_EQ(ET_MOUSE_MOVED, mouse_event->type());
   EXPECT_EQ(0, mouse_event->button_flags());
   EXPECT_EQ(0, mouse_event->changed_button_flags());
@@ -110,7 +110,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseEvent());
-  auto mouse_event = event->AsMouseEvent();
+  auto* mouse_event = event->AsMouseEvent();
   EXPECT_EQ(ET_MOUSE_DRAGGED, mouse_event->type());
   EXPECT_EQ(EF_MIDDLE_MOUSE_BUTTON, mouse_event->button_flags());
   EXPECT_EQ(0, mouse_event->changed_button_flags());
@@ -135,7 +135,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseEvent());
-  auto mouse_event = event->AsMouseEvent();
+  auto* mouse_event = event->AsMouseEvent();
   EXPECT_EQ(ET_MOUSE_PRESSED, mouse_event->type());
   EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
             mouse_event->button_flags());
@@ -163,7 +163,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseEvent());
-  auto mouse_event = event->AsMouseEvent();
+  auto* mouse_event = event->AsMouseEvent();
   EXPECT_EQ(ET_MOUSE_RELEASED, mouse_event->type());
   EXPECT_EQ(EF_LEFT_MOUSE_BUTTON | EF_BACK_MOUSE_BUTTON,
             mouse_event->button_flags());
@@ -190,7 +190,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseWheelEvent());
-  auto mouse_wheel_event = event->AsMouseWheelEvent();
+  auto* mouse_wheel_event = event->AsMouseWheelEvent();
   EXPECT_EQ(gfx::Vector2d(0, -2 * MouseWheelEvent::kWheelDelta),
             mouse_wheel_event->offset());
   EXPECT_EQ(EF_RIGHT_MOUSE_BUTTON, mouse_wheel_event->button_flags());
@@ -218,7 +218,7 @@
 
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseWheelEvent());
-  auto mouse_wheel_event = event->AsMouseWheelEvent();
+  auto* mouse_wheel_event = event->AsMouseWheelEvent();
   EXPECT_EQ(gfx::Vector2d(MouseWheelEvent::kWheelDelta, 0),
             mouse_wheel_event->offset());
   EXPECT_EQ(EF_LEFT_MOUSE_BUTTON, mouse_wheel_event->button_flags());

diff --git a/ui/ozone/platform/wayland/wayland_window_unittest.cc b/ui/ozone/platform/wayland/wayland_window_unittest.cc
index 0493c8f..66b50db 100644
--- a/ui/ozone/platform/wayland/wayland_window_unittest.cc
+++ b/ui/ozone/platform/wayland/wayland_window_unittest.cc

@@ -94,7 +94,7 @@
   window.DispatchEvent(&test_mouse_event);
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->IsMouseEvent());
-  auto mouse_event = event->AsMouseEvent();
+  auto* mouse_event = event->AsMouseEvent();
   EXPECT_EQ(mouse_event->location_f(), test_mouse_event.location_f());
   EXPECT_EQ(mouse_event->root_location_f(), test_mouse_event.root_location_f());
   EXPECT_EQ(mouse_event->time_stamp(), test_mouse_event.time_stamp());

diff --git a/ui/vector_icons/BUILD.gn b/ui/vector_icons/BUILD.gn
index f4fd78e0..f8228a62 100644
--- a/ui/vector_icons/BUILD.gn
+++ b/ui/vector_icons/BUILD.gn

@@ -14,7 +14,6 @@
     "close.1x.icon",
     "close.icon",
     "error_circle.icon",
-    "extension.icon",
     "forward_arrow.1x.icon",
     "forward_arrow.icon",
     "location_on.icon",

diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index cd2138d..1f3fd2a 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn

@@ -913,6 +913,7 @@
     "//base:i18n",
     "//base/test:test_support",
     "//cc",
+    "//cc/paint",
     "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",

diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index 4d56b36..85e62b8 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc

@@ -127,7 +127,9 @@
 
 void InkDropHostView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   old_paint_to_layer_ = layer() != nullptr;
-  SetPaintToLayer();
+  if (!old_paint_to_layer_)
+    SetPaintToLayer();
+
   layer()->SetFillsBoundsOpaquely(false);
   ink_drop_mask_ = CreateInkDropMask();
   if (ink_drop_mask_)

diff --git a/ui/views/border_unittest.cc b/ui/views/border_unittest.cc
index 09d2b4e..ebaab0a3 100644
--- a/ui/views/border_unittest.cc
+++ b/ui/views/border_unittest.cc

@@ -10,6 +10,7 @@
 #include <utility>
 #include <vector>
 
+#include "cc/paint/paint_recorder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ -145,27 +146,42 @@
 
 class BorderTest : public ViewsTestBase {
  public:
+  enum {
+    // The canvas should be much bigger than the view.
+    kCanvasWidth = 1000,
+    kCanvasHeight = 500,
+  };
+
   void SetUp() override {
     ViewsTestBase::SetUp();
 
     view_.reset(new views::View());
     view_->SetSize(gfx::Size(100, 50));
-    // The canvas should be much bigger than the view.
-    sk_canvas_.reset(new MockCanvas(1000, 500));
-    canvas_.reset(new gfx::Canvas(sk_canvas_.get(), 1.0f));
+    recorder_.reset(new cc::PaintRecorder());
+    canvas_.reset(new gfx::Canvas(
+        recorder_->beginRecording(SkRect::MakeWH(kCanvasWidth, kCanvasHeight)),
+        1.0f));
   }
 
   void TearDown() override {
     ViewsTestBase::TearDown();
 
     canvas_.reset();
-    sk_canvas_.reset();
+    recorder_.reset();
     view_.reset();
   }
 
+  std::unique_ptr<MockCanvas> DrawIntoMockCanvas() {
+    sk_sp<cc::PaintRecord> record = recorder_->finishRecordingAsPicture();
+    std::unique_ptr<MockCanvas> mock(
+        new MockCanvas(kCanvasWidth, kCanvasHeight));
+    record->playback(mock.get());
+    return mock;
+  }
+
  protected:
+  std::unique_ptr<cc::PaintRecorder> recorder_;
   std::unique_ptr<views::View> view_;
-  std::unique_ptr<MockCanvas> sk_canvas_;
   std::unique_ptr<gfx::Canvas> canvas_;
 };
 
@@ -181,13 +197,16 @@
   EXPECT_EQ(gfx::Insets(3, 3, 3, 3), border->GetInsets());
   border->Paint(*view_, canvas_.get());
 
+  std::unique_ptr<MockCanvas> mock = DrawIntoMockCanvas();
+  std::vector<MockCanvas::DrawRectCall> draw_rect_calls =
+      mock->draw_rect_calls();
+
   gfx::Rect bounds = view_->GetLocalBounds();
   bounds.Inset(border->GetInsets());
 
-  ASSERT_EQ(1u, sk_canvas_->draw_paint_calls().size());
-  EXPECT_EQ(kBorderColor, sk_canvas_->draw_paint_calls()[0].getColor());
-  EXPECT_EQ(gfx::RectF(bounds),
-            gfx::SkRectToRectF(sk_canvas_->last_clip_bounds()));
+  ASSERT_EQ(1u, mock->draw_paint_calls().size());
+  EXPECT_EQ(kBorderColor, mock->draw_paint_calls()[0].getColor());
+  EXPECT_EQ(gfx::RectF(bounds), gfx::SkRectToRectF(mock->last_clip_bounds()));
 }
 
 TEST_F(BorderTest, RoundedRectBorder) {
@@ -196,11 +215,12 @@
   EXPECT_EQ(gfx::Insets(3, 3, 3, 3), border->GetInsets());
   border->Paint(*view_, canvas_.get());
 
+  std::unique_ptr<MockCanvas> mock = DrawIntoMockCanvas();
   SkRRect expected_rrect;
   expected_rrect.setRectXY(SkRect::MakeLTRB(1.5, 1.5, 98.5, 48.5), 4, 4);
-  EXPECT_TRUE(sk_canvas_->draw_rect_calls().empty());
+  EXPECT_TRUE(mock->draw_rect_calls().empty());
   std::vector<MockCanvas::DrawRRectCall> draw_rrect_calls =
-      sk_canvas_->draw_rrect_calls();
+      mock->draw_rrect_calls();
   ASSERT_EQ(1u, draw_rrect_calls.size());
   EXPECT_EQ(expected_rrect, draw_rrect_calls[0].rrect);
   EXPECT_EQ(3, draw_rrect_calls[0].paint.getStrokeWidth());
@@ -235,13 +255,16 @@
   EXPECT_EQ(kInsets, border->GetInsets());
   border->Paint(*view_, canvas_.get());
 
+  std::unique_ptr<MockCanvas> mock = DrawIntoMockCanvas();
+  std::vector<MockCanvas::DrawRectCall> draw_rect_calls =
+      mock->draw_rect_calls();
+
   gfx::Rect bounds = view_->GetLocalBounds();
   bounds.Inset(border->GetInsets());
 
-  ASSERT_EQ(1u, sk_canvas_->draw_paint_calls().size());
-  EXPECT_EQ(kBorderColor, sk_canvas_->draw_paint_calls()[0].getColor());
-  EXPECT_EQ(gfx::RectF(bounds),
-            gfx::SkRectToRectF(sk_canvas_->last_clip_bounds()));
+  ASSERT_EQ(1u, mock->draw_paint_calls().size());
+  EXPECT_EQ(kBorderColor, mock->draw_paint_calls()[0].getColor());
+  EXPECT_EQ(gfx::RectF(bounds), gfx::SkRectToRectF(mock->last_clip_bounds()));
 }
 
 TEST_F(BorderTest, BorderPainter) {

diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 28242d0..4a7cfd9 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc

@@ -104,7 +104,7 @@
   ink_drop_container_->SetVisible(false);
 
   AddChildView(image_);
-  image_->set_interactive(false);
+  image_->set_can_process_events_within_subtree(false);
 
   AddChildView(label_);
   label_->SetFontList(cached_normal_font_list_);

diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
index 19eeac35..b5e6c1b 100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc

@@ -194,7 +194,7 @@
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
   const int minimum_width =
-      ViewsDelegate::GetInstance()->GetDialogButtonMinimumWidth();
+      ViewsDelegate::GetInstance()->GetButtonMinimumWidth();
   SetMinSize(gfx::Size(minimum_width, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);

diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index edd639e..024155d 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc

@@ -12,7 +12,6 @@
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
-#include "ui/views/painter.h"
 
 namespace views {
 
@@ -35,14 +34,10 @@
     : image_size_set_(false),
       horiz_alignment_(CENTER),
       vert_alignment_(CENTER),
-      interactive_(true),
       last_paint_scale_(0.f),
-      last_painted_bitmap_pixels_(NULL),
-      focus_painter_(Painter::CreateDashedFocusPainter()) {
-}
+      last_painted_bitmap_pixels_(NULL) {}
 
-ImageView::~ImageView() {
-}
+ImageView::~ImageView() {}
 
 void ImageView::SetImage(const gfx::ImageSkia& img) {
   if (IsImageEqual(img))
@@ -84,10 +79,6 @@
   image_size_set_ = false;
 }
 
-void ImageView::SetFocusPainter(std::unique_ptr<Painter> focus_painter) {
-  focus_painter_ = std::move(focus_painter);
-}
-
 gfx::Size ImageView::GetPreferredSize() const {
   gfx::Size size = GetImageSize();
   size.Enlarge(GetInsets().width(), GetInsets().height());
@@ -138,22 +129,9 @@
   return gfx::Point(x, y);
 }
 
-void ImageView::OnFocus() {
-  View::OnFocus();
-  if (focus_painter_.get())
-    SchedulePaint();
-}
-
-void ImageView::OnBlur() {
-  View::OnBlur();
-  if (focus_painter_.get())
-    SchedulePaint();
-}
-
 void ImageView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
   OnPaintImage(canvas);
-  Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 void ImageView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
@@ -204,10 +182,6 @@
   return true;
 }
 
-bool ImageView::CanProcessEventsWithinSubtree() const {
-  return interactive_;
-}
-
 void ImageView::OnPaintImage(gfx::Canvas* canvas) {
   last_paint_scale_ = canvas->image_scale();
   last_painted_bitmap_pixels_ = NULL;

diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
index f94b333d..ca103c2 100644
--- a/ui/views/controls/image_view.h
+++ b/ui/views/controls/image_view.h

@@ -6,7 +6,6 @@
 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
 
 #include "base/macros.h"
-#include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/view.h"
 
@@ -16,8 +15,6 @@
 
 namespace views {
 
-class Painter;
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // ImageView class.
@@ -75,20 +72,13 @@
   void SetTooltipText(const base::string16& tooltip);
   base::string16 GetTooltipText() const;
 
-  void set_interactive(bool interactive) { interactive_ = interactive; }
-
-  void SetFocusPainter(std::unique_ptr<Painter> focus_painter);
-
   // Overriden from View:
   gfx::Size GetPreferredSize() const override;
-  void OnFocus() override;
-  void OnBlur() override;
   void OnPaint(gfx::Canvas* canvas) override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   const char* GetClassName() const override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
-  bool CanProcessEventsWithinSubtree() const override;
 
  private:
   void OnPaintImage(gfx::Canvas* canvas);
@@ -123,9 +113,6 @@
   // The current tooltip text.
   base::string16 tooltip_text_;
 
-  // A flag controlling hit test handling for interactivity.
-  bool interactive_;
-
   // Scale last painted at.
   float last_paint_scale_;
 
@@ -133,8 +120,6 @@
   // safe to cache.
   void* last_painted_bitmap_pixels_;
 
-  std::unique_ptr<views::Painter> focus_painter_;
-
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 

diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index f457cb7c..74cefcc 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc

@@ -7,6 +7,7 @@
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
@@ -31,23 +32,7 @@
 #endif
 };
 
-// Subclass of ScrollView that resets the border when the theme changes.
-class ScrollViewWithBorder : public views::ScrollView {
- public:
-  ScrollViewWithBorder() {}
-
-  // View overrides;
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override {
-    SetBorder(CreateSolidBorder(
-        1,
-        theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor)));
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScrollViewWithBorder);
-};
-
-class ScrollCornerView : public views::View {
+class ScrollCornerView : public View {
  public:
   ScrollCornerView() {}
 
@@ -196,7 +181,21 @@
 
 // static
 ScrollView* ScrollView::CreateScrollViewWithBorder() {
-  return new ScrollViewWithBorder();
+  auto* scroll_view = new ScrollView();
+  scroll_view->AddBorder();
+  return scroll_view;
+}
+
+// static
+ScrollView* ScrollView::GetScrollViewForContents(View* contents) {
+  View* grandparent =
+      contents->parent() ? contents->parent()->parent() : nullptr;
+  if (!grandparent || grandparent->GetClassName() != ScrollView::kViewClassName)
+    return nullptr;
+
+  auto* scroll_view = static_cast<ScrollView*>(grandparent);
+  DCHECK_EQ(contents, scroll_view->contents());
+  return scroll_view;
 }
 
 void ScrollView::SetContents(View* a_view) {
@@ -269,14 +268,21 @@
   vert_sb_ = vert_sb;
 }
 
-void ScrollView::SetHasFocusRing(bool has_focus_ring) {
-  if (has_focus_ring == (focus_ring_ != nullptr))
+void ScrollView::SetHasFocusIndicator(bool has_focus_indicator) {
+  if (has_focus_indicator == draw_focus_indicator_)
     return;
-  if (has_focus_ring) {
-    focus_ring_ = FocusRing::Install(this);
+  draw_focus_indicator_ = has_focus_indicator;
+
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    DCHECK_EQ(draw_focus_indicator_, !focus_ring_);
+    if (has_focus_indicator) {
+      focus_ring_ = FocusRing::Install(this);
+    } else {
+      FocusRing::Uninstall(this);
+      focus_ring_ = nullptr;
+    }
   } else {
-    FocusRing::Uninstall(this);
-    focus_ring_ = nullptr;
+    UpdateBorder();
   }
   SchedulePaint();
 }
@@ -517,6 +523,10 @@
   return kViewClassName;
 }
 
+void ScrollView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  UpdateBorder();
+}
+
 void ScrollView::ScrollToPosition(ScrollBar* source, int position) {
   if (!contents_)
     return;
@@ -736,6 +746,23 @@
   }
 }
 
+void ScrollView::AddBorder() {
+  draw_border_ = true;
+  UpdateBorder();
+}
+
+void ScrollView::UpdateBorder() {
+  if (!draw_border_ || !GetWidget())
+    return;
+
+  SetBorder(CreateSolidBorder(
+      1,
+      GetNativeTheme()->GetSystemColor(
+          draw_focus_indicator_
+              ? ui::NativeTheme::kColorId_FocusedBorderColor
+              : ui::NativeTheme::kColorId_UnfocusedBorderColor)));
+}
+
 // VariableRowHeightScrollHelper ----------------------------------------------
 
 VariableRowHeightScrollHelper::VariableRowHeightScrollHelper(

diff --git a/ui/views/controls/scroll_view.h b/ui/views/controls/scroll_view.h
index db38b2c8..af9111a 100644
--- a/ui/views/controls/scroll_view.h
+++ b/ui/views/controls/scroll_view.h

@@ -46,6 +46,10 @@
   // Creates a ScrollView with a theme specific border.
   static ScrollView* CreateScrollViewWithBorder();
 
+  // Returns the ScrollView for which |contents| is its contents, or null if
+  // |contents| is not in a ScrollView.
+  static ScrollView* GetScrollViewForContents(View* contents);
+
   // Set the contents. Any previous contents will be deleted. The contents
   // is the view that needs to scroll.
   void SetContents(View* a_view);
@@ -88,8 +92,8 @@
   void SetHorizontalScrollBar(ScrollBar* horiz_sb);
   void SetVerticalScrollBar(ScrollBar* vert_sb);
 
-  // Sets whether this ScrollView has a focus ring or not.
-  void SetHasFocusRing(bool has_focus_ring);
+  // Sets whether this ScrollView has a focus indicator or not.
+  void SetHasFocusIndicator(bool has_focus_indicator);
 
   // View overrides:
   gfx::Size GetPreferredSize() const override;
@@ -100,6 +104,7 @@
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   const char* GetClassName() const override;
+  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // ScrollBarController overrides:
   void ScrollToPosition(ScrollBar* source, int position) override;
@@ -154,6 +159,9 @@
   // Horizontally scrolls the header (if any) to match the contents.
   void ScrollHeader();
 
+  void AddBorder();
+  void UpdateBorder();
+
   // The current contents and its viewport. |contents_| is contained in
   // |contents_viewport_|.
   View* contents_;
@@ -186,6 +194,13 @@
   // than the viewport).
   bool hide_horizontal_scrollbar_;
 
+  // In Harmony, the indicator is a focus ring. Pre-Harmony, the indicator is a
+  // different border painter.
+  bool draw_focus_indicator_ = false;
+
+  // Only needed for pre-Harmony. Remove when Harmony is default.
+  bool draw_border_ = false;
+
   // Focus ring, if one is installed.
   View* focus_ring_ = nullptr;
 

diff --git a/ui/views/controls/table/table_view.cc b/ui/views/controls/table/table_view.cc
index 94fe60c..ab17e37 100644
--- a/ui/views/controls/table/table_view.cc
+++ b/ui/views/controls/table/table_view.cc

@@ -546,8 +546,6 @@
     const bool is_selected = selection_model_.IsSelected(model_index);
     if (is_selected)
       canvas->FillRect(GetRowBounds(i), selected_bg_color);
-    if (selection_model_.active() == model_index && HasFocus())
-      canvas->DrawFocusRect(GetRowBounds(i));
     for (int j = region.min_column; j < region.max_column; ++j) {
       const gfx::Rect cell_bounds(GetCellBounds(i, j));
       int text_x = kTextHorizontalPadding + cell_bounds.x();
@@ -625,11 +623,18 @@
 }
 
 void TableView::OnFocus() {
+  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
+  if (scroll_view)
+    scroll_view->SetHasFocusIndicator(true);
   SchedulePaintForSelection();
+
   NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
 }
 
 void TableView::OnBlur() {
+  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
+  if (scroll_view)
+    scroll_view->SetHasFocusIndicator(false);
   SchedulePaintForSelection();
 }
 

diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc
index 7e964f9..fc75419 100644
--- a/ui/views/controls/tree/tree_view.cc
+++ b/ui/views/controls/tree/tree_view.cc

@@ -638,7 +638,7 @@
   if (GetInputMethod())
     GetInputMethod()->OnCaretBoundsChanged(GetPrefixSelector());
 
-  SetHasFocusRing(true);
+  SetHasFocusIndicator(true);
 }
 
 void TreeView::OnBlur() {
@@ -647,7 +647,7 @@
   SchedulePaintForNode(selected_node_);
   if (selector_)
     selector_->OnViewBlur();
-  SetHasFocusRing(false);
+  SetHasFocusIndicator(false);
 }
 
 bool TreeView::OnClickOrTap(const ui::LocatedEvent& event) {
@@ -807,8 +807,6 @@
   if (!PlatformStyle::kTreeViewSelectionPaintsEntireRow &&
       node == selected_node_) {
     canvas->FillRect(text_bounds, selected_row_bg_color);
-    if (HasFocus())
-      canvas->DrawFocusRect(text_bounds);
   }
 
   // Paint the text.
@@ -1057,20 +1055,13 @@
   return arrow_bounds.Contains(point);
 }
 
-void TreeView::SetHasFocusRing(bool shows) {
-  if (!ui::MaterialDesignController::IsSecondaryUiMaterial() ||
-      !PlatformStyle::kTreeViewHasFocusRing) {
-    return;
-  }
+void TreeView::SetHasFocusIndicator(bool shows) {
   // If this View is the grandchild of a ScrollView, use the grandparent
   // ScrollView for the focus ring instead of this View so that the focus ring
-  // won't be scrolled. Since ScrollViews have a single content view, which they
-  // wrap in a ScrollView::Viewport, being the grandchild of a ScrollView
-  // implies being the sole grandchild, which means it's fine to wrap the focus
-  // ring around the grandparent here.
-  View* grandparent = parent() ? parent()->parent() : nullptr;
-  if (grandparent && grandparent->GetClassName() == ScrollView::kViewClassName)
-    static_cast<ScrollView*>(grandparent)->SetHasFocusRing(shows);
+  // won't be scrolled.
+  ScrollView* scroll_view = ScrollView::GetScrollViewForContents(this);
+  if (scroll_view)
+    scroll_view->SetHasFocusIndicator(shows);
 }
 
 // InternalNode ----------------------------------------------------------------

diff --git a/ui/views/controls/tree/tree_view.h b/ui/views/controls/tree/tree_view.h
index 63ea2ed..5de65d3 100644
--- a/ui/views/controls/tree/tree_view.h
+++ b/ui/views/controls/tree/tree_view.h

@@ -349,10 +349,8 @@
   // control.
   bool IsPointInExpandControl(InternalNode* node, const gfx::Point& point);
 
-  // Sets whether a focus ring is visible on this control or not. This function
-  // does nothing if focus rings aren't enabled in general or if the platform's
-  // style does not use focus rings on TreeViews.
-  void SetHasFocusRing(bool);
+  // Sets whether a focus indicator is visible on this control or not.
+  void SetHasFocusIndicator(bool);
 
   // The model, may be null.
   ui::TreeModel* model_;

diff --git a/ui/views/layout/layout_constants.h b/ui/views/layout/layout_constants.h
index e375ad7..620a28d 100644
--- a/ui/views/layout/layout_constants.h
+++ b/ui/views/layout/layout_constants.h

@@ -83,6 +83,12 @@
 // and the start of its corresponding text.
 constexpr int kItemLabelSpacing = 10;
 
+// Padding on the left and right of a button's contents.
+const int kButtonHorizontalPadding = 16;
+
+// Default minimum width of buttons.
+const int kMinimumButtonWidth = 48;
+
 // Minimum width of dialog buttons.
 const int kDialogMinimumButtonWidth = 75;
 

diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 15ce36bf..cc3624b 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc

@@ -81,7 +81,8 @@
   property_converter_ = base::MakeUnique<aura::PropertyConverter>();
   property_converter_->RegisterProperty(
       wm::kShadowElevationKey,
-      ui::mojom::WindowManager::kShadowElevation_Property);
+      ui::mojom::WindowManager::kShadowElevation_Property,
+      base::Bind(&wm::IsValidShadowElevation));
 
   if (create_wm_state)
     wm_state_ = base::MakeUnique<wm::WMState>();

diff --git a/ui/views/painter.cc b/ui/views/painter.cc
index 655abd82..ffb4bbb 100644
--- a/ui/views/painter.cc
+++ b/ui/views/painter.cc

@@ -217,9 +217,8 @@
       p, colors_.get(), pos_.get(), count_, SkShader::kClamp_TileMode)));
   flags.setStyle(cc::PaintFlags::kFill_Style);
 
-  canvas->sk_canvas()->drawRectCoords(SkIntToScalar(0), SkIntToScalar(0),
-                                      SkIntToScalar(size.width()),
-                                      SkIntToScalar(size.height()), flags);
+  canvas->sk_canvas()->drawRect(SkRect::MakeIWH(size.width(), size.height()),
+                                flags);
 }
 
 // ImagePainter ---------------------------------------------------------------

diff --git a/ui/views/style/platform_style.cc b/ui/views/style/platform_style.cc
index b744302..0dff5cb 100644
--- a/ui/views/style/platform_style.cc
+++ b/ui/views/style/platform_style.cc

@@ -48,7 +48,6 @@
 const CustomButton::KeyClickAction PlatformStyle::kKeyClickActionOnSpace =
     CustomButton::CLICK_ON_KEY_RELEASE;
 const bool PlatformStyle::kReturnClicksFocusedControl = true;
-const bool PlatformStyle::kTreeViewHasFocusRing = false;
 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = false;
 const bool PlatformStyle::kUseRipples = true;
 const bool PlatformStyle::kMirrorBubbleArrowInRTLByDefault = true;

diff --git a/ui/views/style/platform_style.h b/ui/views/style/platform_style.h
index 93b8c84..5e31fa2 100644
--- a/ui/views/style/platform_style.h
+++ b/ui/views/style/platform_style.h

@@ -56,9 +56,6 @@
   // Otherwise, Return does nothing unless it is handled by an accelerator.
   static const bool kReturnClicksFocusedControl;
 
-  // Whether TreeViews get a focus ring on the entire TreeView when focused.
-  static const bool kTreeViewHasFocusRing;
-
   // Whether selecting a row in a TreeView selects the entire row or only the
   // label for that row.
   static const bool kTreeViewSelectionPaintsEntireRow;

diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
index a335d99..e1d396e 100644
--- a/ui/views/style/platform_style_mac.mm
+++ b/ui/views/style/platform_style_mac.mm

@@ -25,7 +25,6 @@
 const bool PlatformStyle::kDialogDefaultButtonCanBeCancel = false;
 const bool PlatformStyle::kSelectWordOnRightClick = true;
 const bool PlatformStyle::kSelectAllOnRightClickWhenUnfocused = true;
-const bool PlatformStyle::kTreeViewHasFocusRing = true;
 const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
 const bool PlatformStyle::kUseRipples = false;
 

diff --git a/ui/views/views_delegate.cc b/ui/views/views_delegate.cc
index 8856e7e..8a78a96 100644
--- a/ui/views/views_delegate.cc
+++ b/ui/views/views_delegate.cc

@@ -152,12 +152,16 @@
   return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
 }
 
+int ViewsDelegate::GetButtonMinimumWidth() const {
+  return kMinimumButtonWidth;
+}
+
 int ViewsDelegate::GetDialogButtonMinimumWidth() const {
   return kDialogMinimumButtonWidth;
 }
 
 int ViewsDelegate::GetButtonHorizontalPadding() const {
-  return 0;
+  return kButtonHorizontalPadding;
 }
 
 ViewsDelegate::ViewsDelegate()

diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h
index b354330..7b3960f 100644
--- a/ui/views/views_delegate.h
+++ b/ui/views/views_delegate.h

@@ -219,7 +219,10 @@
   // Returns the margins that should be applied around a bubble dialog.
   virtual gfx::Insets GetBubbleDialogMargins() const;
 
-  // Returns the default minimum width of a dialog button.
+  // Returns the default minimum width of a button.
+  virtual int GetButtonMinimumWidth() const;
+
+  // Returns the minimum width of a dialog button.
   virtual int GetDialogButtonMinimumWidth() const;
 
   // Returns the default padding to add on each side of a button's label.

diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index deff7dc..f646639 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc

@@ -296,8 +296,6 @@
     button = MdTextButton::CreateSecondaryUiButton(this, title);
   }
 
-  // TODO(bsep): Setting the minimum size is redundant with MdTextButton, so
-  // this can be deleted when harmony is always on.
   const int minimum_width =
       ViewsDelegate::GetInstance()->GetDialogButtonMinimumWidth();
   button->SetMinSize(gfx::Size(minimum_width, 0));

diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.html b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.html
index 3d4ce17..c793f8d 100644
--- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.html
+++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.html

@@ -37,6 +37,7 @@
 
       :host ::content .title {
         font-size: 123.07%; /* (16px / 13px) * 100 */
+        outline: none;
       }
 
       #close {

diff --git a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js
index d15ed9b..3e29f9f 100644
--- a/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js
+++ b/ui/webui/resources/cr_elements/cr_dialog/cr_dialog.js

@@ -41,6 +41,13 @@
     }.bind(this));
   },
 
+  /** @override */
+  attached: function() {
+    var title = this.getContentChildren('[select=".title"]');
+    if (title.length)
+      title[0].tabIndex = -1;
+  },
+
   cancel: function() {
     this.fire('cancel');
     HTMLDialogElement.prototype.close.call(this, '');

diff --git a/ui/wm/core/shadow_types.cc b/ui/wm/core/shadow_types.cc
index bf08bbe..3f53d1b4 100644
--- a/ui/wm/core/shadow_types.cc
+++ b/ui/wm/core/shadow_types.cc

@@ -18,4 +18,12 @@
   window->SetProperty(kShadowElevationKey, elevation);
 }
 
+bool IsValidShadowElevation(int64_t value) {
+  return value == int64_t(ShadowElevation::DEFAULT) ||
+         value == int64_t(ShadowElevation::NONE) ||
+         value == int64_t(ShadowElevation::SMALL) ||
+         value == int64_t(ShadowElevation::MEDIUM) ||
+         value == int64_t(ShadowElevation::LARGE);
+}
+
 }  // namespace wm

diff --git a/ui/wm/core/shadow_types.h b/ui/wm/core/shadow_types.h
index ef22af7..48aec22 100644
--- a/ui/wm/core/shadow_types.h
+++ b/ui/wm/core/shadow_types.h

@@ -30,6 +30,9 @@
 WM_EXPORT void SetShadowElevation(aura::Window* window,
                                   ShadowElevation elevation);
 
+// Returns true if |value| is a valid element of ShadowElevation elements.
+WM_EXPORT bool IsValidShadowElevation(int64_t value);
+
 // A property key describing the drop shadow that should be displayed under the
 // window. A null value is interpreted as using the default.
 WM_EXPORT extern const aura::WindowProperty<ShadowElevation>* const